net/freeswitch-stable/patches/120-fix-copts.diff

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -1995,7 +1995,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-util/configure.ac
  18 +++ b/libs/apr-util/configure.ac
  19 @@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci
  20  dnl
  21  APR_CONFIG_NICE(config.nice)
  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 # Some initial steps for configuration.  We setup the default directory
  32  dnl # and which files are to be configured.
  33 --- a/libs/apr/configure.ac
  34 +++ b/libs/apr/configure.ac
  35 @@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4)
  36  sinclude(build/libtool.m4)
  37  sinclude(build/ltsugar.m4)
  38
  39 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  40 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  41 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  42 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  43 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  44 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  45 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  46
  47  dnl Hard-coded inclusion at the tail end of apr_private.h:
  48  AH_BOTTOM([
  49 --- a/libs/iksemel/configure.ac
  50 +++ b/libs/iksemel/configure.ac
  51 @@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac])
  52  AM_INIT_AUTOMAKE
  53  AC_CONFIG_HEADERS(include/config.h)
  54
  55 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  56 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  57 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  58 +m4_include(../apr/build/apr_common.m4)
  59 +
  60 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  61 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  62 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  63 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  64
  65  AC_CANONICAL_HOST
  66
  67 --- a/libs/libdingaling/configure.ac
  68 +++ b/libs/libdingaling/configure.ac
  69 @@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE
  70  AC_CONFIG_SRCDIR([src])
  71  AC_CONFIG_HEADERS([src/config.h])
  72
  73 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  74 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  75 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  76 +m4_include(../apr/build/apr_common.m4)
  77 +
  78 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  79 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  80 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  81 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
  82
  83  #Set default language
  84  AC_LANG_C
  85 --- a/libs/sofia-sip/configure.ac
  86 +++ b/libs/sofia-sip/configure.ac
  87 @@ -13,9 +13,12 @@ dnl ---------------------------
  88  dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
  89  AC_INIT([sofia-sip], [1.12.10devel])
  90
  91 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  92 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  93 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  94 +m4_include(../apr/build/apr_common.m4)
  95 +
  96 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
  97 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
  98 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
  99 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
 100
 101  AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h])
 102  AC_CONFIG_MACRO_DIR([m4])
 103 --- a/libs/spandsp/configure.ac
 104 +++ b/libs/spandsp/configure.ac
 105 @@ -21,9 +21,12 @@
 106  AC_PREREQ([2.59])
 107  AC_INIT([spandsp], [1.99.0])
 108
 109 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 110 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 111 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 112 +m4_include(../apr/build/apr_common.m4)
 113 +
 114 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
 115 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
 116 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
 117 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
 118
 119  SPANDSP_LT_CURRENT=3
 120  SPANDSP_LT_REVISION=0
 121 --- a/libs/srtp/configure.ac
 122 +++ b/libs/srtp/configure.ac
 123 @@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
 124  AC_CONFIG_AUX_DIR(build)
 125  AM_INIT_AUTOMAKE
 126
 127 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 128 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 129 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 130 +m4_include(../apr/build/apr_common.m4)
 131 +
 132 +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
 133 +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
 134 +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
 135 +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
 136
 137  #Set default language
 138  AC_LANG_C