net/freeswitch/patches/120-fix-copts.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -2280,7 +2280,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
   4  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
   5  AC_SUBST(AM_MAKEFLAGS)
   6
   7 -ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
   8 +APR_ADDTO(CONFIGURE_CFLAGS, [$CFLAGS])
   9 +APR_ADDTO(CONFIGURE_CPPFLAGS, [$CPPFLAGS])
  10 +APR_ADDTO(CONFIGURE_CXXFLAGS, [$CXXFLAGS])
  11 +APR_ADDTO(CONFIGURE_LDFLAGS, [$LDFLAGS])
  12 +
  13 +ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CONFIGURE_CFLAGS' CONFIGURE_CPPFLAGS='$CONFIGURE_CPPFLAGS' CONFIGURE_CXXFLAGS='$CONFIGURE_CXXFLAGS' CONFIGURE_LDFLAGS='$CONFIGURE_LDFLAGS' "
  14
  15  #      --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
  16  #      --localstatedir='$localstatedir' --datadir='$datadir'"
  17 --- a/libs/apr/configure.ac
  18 +++ b/libs/apr/configure.ac
  19 @@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4)
  20  sinclude(build/libtool.m4)
  21  sinclude(build/ltsugar.m4)
  22
  23 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  24 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  25 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  26 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  27 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  28 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  29 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  30
  31  dnl Hard-coded inclusion at the tail end of fspr_private.h:
  32  AH_BOTTOM([
  33 --- a/libs/iksemel/configure.ac
  34 +++ b/libs/iksemel/configure.ac
  35 @@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac])
  36  AM_INIT_AUTOMAKE
  37  AC_CONFIG_HEADERS(include/config.h)
  38
  39 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  40 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  41 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  42 +m4_include(../apr/build/apr_common.m4)
  43 +
  44 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  45 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  46 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  47 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  48
  49  AC_CANONICAL_HOST
  50
  51 --- a/libs/srtp/configure.ac
  52 +++ b/libs/srtp/configure.ac
  53 @@ -3,9 +3,12 @@ AC_INIT(srtp, 2.4.0, mcgrew@cisco.com)
  54  AC_CONFIG_AUX_DIR(build)
  55  AM_INIT_AUTOMAKE
  56
  57 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  58 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  59 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  60 +m4_include(../apr/build/apr_common.m4)
  61 +
  62 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  63 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  64 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  65 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  66
  67  #Set default language
  68  AC_LANG_C