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

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -1958,7 +1958,13 @@ 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 +ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir}"
   9 +
  10 +case $host in
  11 +   *-darwin*)
  12 +        ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
  13 +       ;;
  14 +esac
  15
  16  #      --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
  17  #      --localstatedir='$localstatedir' --datadir='$datadir'"
  18 --- a/libs/apr-util/configure.ac
  19 +++ b/libs/apr-util/configure.ac
  20 @@ -20,9 +20,13 @@ dnl Generate ./config.nice for reproduci
  21  dnl
  22  APR_CONFIG_NICE(config.nice)
  23
  24 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  25 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  26 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  27 +case $host in
  28 +   *-darwin*)
  29 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  30 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  31 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  32 +       ;;
  33 +esac
  34
  35  dnl # Some initial steps for configuration.  We setup the default directory
  36  dnl # and which files are to be configured.
  37 --- a/libs/apr/configure.ac
  38 +++ b/libs/apr/configure.ac
  39 @@ -20,9 +20,13 @@ sinclude(build/apr_hints.m4)
  40  sinclude(build/libtool.m4)
  41  sinclude(build/ltsugar.m4)
  42
  43 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  44 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  45 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  46 +case $host in
  47 +   *-darwin*)
  48 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  49 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  50 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  51 +       ;;
  52 +esac
  53
  54  dnl Hard-coded inclusion at the tail end of apr_private.h:
  55  AH_BOTTOM([
  56 --- a/libs/broadvoice/configure.ac
  57 +++ b/libs/broadvoice/configure.ac
  58 @@ -22,9 +22,13 @@
  59
  60  AC_INIT([broadvoice],[0.1.0])
  61
  62 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  63 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  64 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  65 +case $host in
  66 +   *-darwin*)
  67 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  68 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  69 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  70 +       ;;
  71 +esac
  72
  73  m4_include(config/ax_compiler_vendor.m4)
  74  m4_include(config/ax_check_real_file.m4)
  75 --- a/libs/iksemel/configure.ac
  76 +++ b/libs/iksemel/configure.ac
  77 @@ -6,9 +6,13 @@ AC_CONFIG_SRCDIR([configure.ac])
  78  AM_INIT_AUTOMAKE
  79  AC_CONFIG_HEADERS(include/config.h)
  80
  81 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  82 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  83 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  84 +case $host in
  85 +   *-darwin*)
  86 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
  87 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
  88 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
  89 +       ;;
  90 +esac
  91
  92  AC_CANONICAL_HOST
  93
  94 --- a/libs/ilbc/configure.ac
  95 +++ b/libs/ilbc/configure.ac
  96 @@ -22,9 +22,13 @@
  97
  98  AC_INIT([ilbc], [0.0.1])
  99
 100 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 101 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 102 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 103 +case $host in
 104 +   *-darwin*)
 105 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 106 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 107 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 108 +       ;;
 109 +esac
 110
 111  AC_DEFUN([AX_COMPILER_VENDOR],
 112  [
 113 --- a/libs/libdingaling/configure.ac
 114 +++ b/libs/libdingaling/configure.ac
 115 @@ -8,9 +8,13 @@ AM_INIT_AUTOMAKE
 116  AC_CONFIG_SRCDIR([src])
 117  AC_CONFIG_HEADERS([src/config.h])
 118
 119 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 120 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 121 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 122 +case $host in
 123 +   *-darwin*)
 124 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 125 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 126 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 127 +       ;;
 128 +esac
 129
 130  #Set default language
 131  AC_LANG_C
 132 --- a/libs/libsndfile/configure.ac
 133 +++ b/libs/libsndfile/configure.ac
 134 @@ -15,9 +15,13 @@ AC_CANONICAL_TARGET([])
 135  AC_CONFIG_MACRO_DIR([M4])
 136  AC_CONFIG_HEADERS([src/config.h])
 137
 138 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 139 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 140 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 141 +case $host in
 142 +   *-darwin*)
 143 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 144 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 145 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 146 +       ;;
 147 +esac
 148
 149  AM_INIT_AUTOMAKE
 150  AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
 151 --- a/libs/sofia-sip/configure.ac
 152 +++ b/libs/sofia-sip/configure.ac
 153 @@ -13,9 +13,13 @@ dnl ---------------------------
 154  dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
 155  AC_INIT([sofia-sip], [1.12.10devel])
 156
 157 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 158 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 159 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 160 +case $host in
 161 +   *-darwin*)
 162 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 163 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 164 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 165 +       ;;
 166 +esac
 167
 168  AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h])
 169  AC_CONFIG_MACRO_DIR([m4])
 170 --- a/libs/spandsp/configure.ac
 171 +++ b/libs/spandsp/configure.ac
 172 @@ -21,9 +21,13 @@
 173  AC_PREREQ([2.59])
 174  AC_INIT([spandsp], [1.99.0])
 175
 176 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 177 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 178 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 179 +case $host in
 180 +   *-darwin*)
 181 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 182 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 183 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 184 +       ;;
 185 +esac
 186
 187  SPANDSP_LT_CURRENT=3
 188  SPANDSP_LT_REVISION=0
 189 --- a/libs/srtp/configure.ac
 190 +++ b/libs/srtp/configure.ac
 191 @@ -3,9 +3,13 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
 192  AC_CONFIG_AUX_DIR(build)
 193  AM_INIT_AUTOMAKE
 194
 195 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 196 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 197 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 198 +case $host in
 199 +   *-darwin*)
 200 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 201 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 202 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 203 +       ;;
 204 +esac
 205
 206  #Set default language
 207  AC_LANG_C
 208 --- a/libs/tiff-4.0.2/configure.ac
 209 +++ b/libs/tiff-4.0.2/configure.ac
 210 @@ -32,9 +32,13 @@ AC_LANG(C)
 211  AC_PROG_LIBTOOL
 212  m4_include(m4/acinclude.m4)
 213
 214 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 215 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 216 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 217 +case $host in
 218 +   *-darwin*)
 219 +        CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
 220 +        CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
 221 +        LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 222 +       ;;
 223 +esac
 224
 225  dnl Compute the canonical host (run-time) system type variable
 226  AC_CANONICAL_HOST