a slightly more annoying yet more sane way to fix snow cat

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15868 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/configure.in b/configure.in
index 027648776a95fc923d23f37fdc4b3702b915cb3d..2091472bd6a26d03c7ef37ab5281af1e3d959895 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -865,14 +865,7 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
 AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
 AC_SUBST(AM_MAKEFLAGS)
 
-ac_configure_args="$ac_configure_args \"CFLAGS=$CFLAGS\" \"CXXFLAGS=$CXXFLAGS\" \"LDFLAGS=$LDFLAGS\""
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_cv_env_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_CXXFLAGS_set=set
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-
+ac_configure_args="$ac_configure_args \"CONFIGURE_CFLAGS=$CFLAGS\" \"CONFIGURE_CXXFLAGS=$CXXFLAGS\" \"CONFIGURE_LDFLAGS=$LDFLAGS\""
 
 # Run configure in all the subdirs
 AC_CONFIG_SUBDIRS(libs/srtp)

diff --git a/libs/apr-util/configure.in b/libs/apr-util/configure.in
index cb2ff3f43d16ab7e5cbb5683c2cd5056d7cfe89b..c0b4a3bfad8d4948352e9d9dc941be24ec436bb0 100644 (file)
--- a/libs/apr-util/configure.in
+++ b/libs/apr-util/configure.in
@@ -20,6 +20,10 @@ dnl Generate ./config.nice for reproducing runs of configure
 dnl 
 APR_CONFIG_NICE(config.nice)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 dnl # Some initial steps for configuration.  We setup the default directory
 dnl # and which files are to be configured.
 

diff --git a/libs/apr/configure.in b/libs/apr/configure.in
index 59fa7b9c7c2c3caa5e89349178b69a40922e1b62..04f6e8f506e4c7e9228030fe43d0ef24d3b35b39 100644 (file)
--- a/libs/apr/configure.in
+++ b/libs/apr/configure.in
@@ -20,6 +20,10 @@ sinclude(build/apr_hints.m4)
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 dnl Hard-coded inclusion at the tail end of apr_private.h:
 AH_BOTTOM([
 /* switch this on if we have a BeOS version below BONE */

diff --git a/libs/broadvoice/configure.ac b/libs/broadvoice/configure.ac
index 7abfc32b2258bf086b7226cbe4005b96461974f9..96d58ffc3aebdc2c45cc108c36b247ce3972cf8a 100644 (file)
--- a/libs/broadvoice/configure.ac
+++ b/libs/broadvoice/configure.ac
@@ -22,6 +22,10 @@
 
 AC_INIT
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 m4_include(config/ax_compiler_vendor.m4)
 m4_include(config/ax_check_real_file.m4)
 m4_include(config/ax_fixed_point_machine.m4)

diff --git a/libs/curl/configure.ac b/libs/curl/configure.ac
index 980cba2606d577e9f47884d170a29f2c3dded485..204bf1fd9953f5f8914de985edd00635266041fc 100644 (file)
--- a/libs/curl/configure.ac
+++ b/libs/curl/configure.ac
@@ -27,6 +27,10 @@ AC_PREREQ(2.57)
 dnl We don't know the version number "staticly" so we use a dash here
 AC_INIT(curl, [-], [a suitable curl mailing list => http://curl.haxx.se/mail/])
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 dnl configure script copyright
 AC_COPYRIGHT([Copyright (c) 1998 - 2006 Daniel Stenberg, <daniel@haxx.se>
 This configure script may be copied, distributed and modified under the 

diff --git a/libs/iksemel/configure.ac b/libs/iksemel/configure.ac
index ca4bb9d438a2c9a7e70b5f6c5a5b20842bd1ad11..f7687922c2be6fd3c15d60542fc89b19b22fb5cb 100644 (file)
--- a/libs/iksemel/configure.ac
+++ b/libs/iksemel/configure.ac
@@ -6,6 +6,10 @@ AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE(iksemel,1.3)
 AC_CONFIG_HEADERS(include/config.h)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CANONICAL_HOST
 
 dnl Checks for programs

diff --git a/libs/ilbc/configure.ac b/libs/ilbc/configure.ac
index 196678822641c1a337b3d39973a9914da71bd3f7..b3fda17c6620c6cbe9aa006950d7ea01330eebd9 100644 (file)
--- a/libs/ilbc/configure.ac
+++ b/libs/ilbc/configure.ac
@@ -22,6 +22,10 @@
 
 AC_INIT
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_DEFUN([AX_COMPILER_VENDOR],
 [
 AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,

diff --git a/libs/js/configure.ac b/libs/js/configure.ac
index f4e0954d04c7afc4e87c6100511e062568072ecc..7ee50890086f30f77bf349bc7e12ebe795a71fad 100644 (file)
--- a/libs/js/configure.ac
+++ b/libs/js/configure.ac
@@ -33,6 +33,10 @@ $ac_confdir/shtool echo -e \
     "Configuring %BOSSP js%b (Mozilla JavaScript Engine), version %B${JS_VERSION}%b"
 AC_SUBST(JS_VERSION)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 

diff --git a/libs/js/nsprpub/configure.in b/libs/js/nsprpub/configure.in
index 470564aadfe38564a22ec21446b5383b90c181b1..93d3bd9f85d42a279a818a9d9c5d118d90df6c5f 100644 (file)
--- a/libs/js/nsprpub/configure.in
+++ b/libs/js/nsprpub/configure.in
@@ -38,6 +38,10 @@ dnl
 AC_PREREQ(2.59)
 AC_INIT(config/libc_r.h)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CONFIG_AUX_DIR(build/autoconf)
 AC_CANONICAL_SYSTEM
 

diff --git a/libs/libdingaling/configure.in b/libs/libdingaling/configure.in
index cc98231c8a4b5165e9eb4e7bbcdf46bb731cd756..241fb103bd52932fff44576d7ae86a310e9e2276 100755 (executable)
--- a/libs/libdingaling/configure.in
+++ b/libs/libdingaling/configure.in
@@ -8,6 +8,10 @@ AM_INIT_AUTOMAKE(libdingaling,0.1)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([src/config.h])
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 #Set default language
 AC_LANG_C
 # Checks for programs.

diff --git a/libs/libedit/configure.ac b/libs/libedit/configure.ac
index 5335ba5fe012a09e73d3f23896d78921d766532e..5bf51d28cfaea4b9cd19b8006cf5e1ccfbeaf712 100644 (file)
--- a/libs/libedit/configure.ac
+++ b/libs/libedit/configure.ac
@@ -5,6 +5,10 @@ AC_INIT(libedit, [EL_RELEASE],, libedit-[EL_TIMESTAMP_CVSEXPORT])
 AC_CONFIG_SRCDIR([src/strlcat.c])
 AC_CONFIG_HEADERS([config.h])
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AM_INIT_AUTOMAKE
 AC_PROG_LIBTOOL
 

diff --git a/libs/libg722_1/configure.ac b/libs/libg722_1/configure.ac
index b87b989f046a7fda3fd46ba6d24910ee66e9d80e..a60a69bc93f0b28b688b0c59b22cc8c3720c4af2 100644 (file)
--- a/libs/libg722_1/configure.ac
+++ b/libs/libg722_1/configure.ac
@@ -22,6 +22,10 @@
 
 AC_INIT
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 m4_include(config/ax_compiler_vendor.m4)
 m4_include(config/ax_check_real_file.m4)
 m4_include(config/ax_fixed_point_machine.m4)

diff --git a/libs/libsndfile/configure.ac b/libs/libsndfile/configure.ac
index 5d8ce43560a4836b218902d4c28bc4a2c5161241..4bdbfd0969600281a1d245b54400790962db683f 100644 (file)
--- a/libs/libsndfile/configure.ac
+++ b/libs/libsndfile/configure.ac
@@ -8,6 +8,10 @@ AC_INIT([libsndfile],[1.0.19],[erikd@mega-nerd.com])
 # Put config stuff in Cfg.
 AC_CONFIG_AUX_DIR(Cfg)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CONFIG_SRCDIR([src/sndfile.c])
 AC_CANONICAL_TARGET([])
 

diff --git a/libs/pcre/configure.ac b/libs/pcre/configure.ac
index 02a73f3f26124e5fff69aaf06f8ad64ce3bc93fe..b6f79f98cf299aab27459a342053ce725995c4eb 100644 (file)
--- a/libs/pcre/configure.ac
+++ b/libs/pcre/configure.ac
@@ -22,6 +22,10 @@ AC_CONFIG_SRCDIR([pcre.h.in])
 AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
 AC_CONFIG_HEADERS(config.h)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
 # "-g" for any other compiler. There doesn't seem to be a standard way of
 # getting rid of the -g (which I don't think is needed for a production

diff --git a/libs/portaudio/configure.in b/libs/portaudio/configure.in
index 366131d71ebc9c312a26f815ec47127108585cd2..f4ef9abbeee09b5bb439ead6c9d3d62e8d0304a4 100644 (file)
--- a/libs/portaudio/configure.in
+++ b/libs/portaudio/configure.in
@@ -11,6 +11,10 @@ dnl Init autoconf and make sure configure is being called
 dnl from the right directory
 AC_INIT([include/portaudio.h])
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 dnl Specify options
 
 AC_ARG_WITH(alsa, 

diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac
index fef489e9a6be66849ba35c16e9d5a9c9ac34ccf4..e5045435e412d1a80ac0f92faf43902c63dfbed3 100644 (file)
--- a/libs/sofia-sip/configure.ac
+++ b/libs/sofia-sip/configure.ac
@@ -12,6 +12,11 @@ dnl ---------------------------
 
 dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
 AC_INIT([sofia-sip], [1.12.10devel])
+
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST(VER_LIBSOFIA_SIP_UA_MAJOR_MINOR, [1.12])

diff --git a/libs/spandsp/configure.ac b/libs/spandsp/configure.ac
index 58b7af50d0a6007c13fadeb6414a97473d611e3b..06eaf6ee887085443870571f19179ffee036a788 100644 (file)
--- a/libs/spandsp/configure.ac
+++ b/libs/spandsp/configure.ac
@@ -22,6 +22,10 @@
 
 AC_INIT
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 m4_include(config/ax_compiler_vendor.m4)
 m4_include(config/ax_check_real_file.m4)
 m4_include(config/ax_fixed_point_machine.m4)

diff --git a/libs/speex/configure.ac b/libs/speex/configure.ac
index 3a9b58bfcc100caddc882ffb291f570bc9a9cde7..12dcc6d6e0b6e579b639e3a52cbeac4b050ac50b 100644 (file)
--- a/libs/speex/configure.ac
+++ b/libs/speex/configure.ac
@@ -29,6 +29,10 @@ AC_SUBST(SPEEX_VERSION)
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AM_MAINTAINER_MODE
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 AC_CANONICAL_HOST
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL

diff --git a/libs/sqlite/configure.ac b/libs/sqlite/configure.ac
index cf84cef0f837f61d70a013af5cbcbaee5e08f1e2..fc21161fda449e63ed994bb8fde65c0d2813a4a8 100644 (file)
--- a/libs/sqlite/configure.ac
+++ b/libs/sqlite/configure.ac
@@ -145,6 +145,10 @@ VERSION_NUMBER=[`cat $srcdir/VERSION  \
 echo "Version number set to $VERSION_NUMBER"
 AC_SUBST(VERSION_NUMBER)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 #########
 # Check to see if the --with-hints=FILE option is used.  If there is none,
 # then check for a files named "$host.hints" and ../$hosts.hints where

diff --git a/libs/srtp/configure.in b/libs/srtp/configure.in
index edf8462a8a5492efe780a53011e6e811c0163c9e..2495a55f9553ab064782830342923bef614530c1 100644 (file)
--- a/libs/srtp/configure.in
+++ b/libs/srtp/configure.in
@@ -3,6 +3,10 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
 AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE(libsrtp,1.4.2)
 
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+
 #Set default language
 AC_LANG_C
 # Checks for programs.

diff --git a/libs/tiff-3.8.2/configure.ac b/libs/tiff-3.8.2/configure.ac
index e5406cda2dc31f638f5166c704a72da2192a9759..dc4676f4e6e40127b909e25e26918000eb27188e 100644 (file)
--- a/libs/tiff-3.8.2/configure.ac
+++ b/libs/tiff-3.8.2/configure.ac
@@ -29,6 +29,9 @@ AC_INIT([LibTIFF Software], 3.8.2, [tiff@lists.maptools.org], tiff)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(m4)
 AC_LANG(C)
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 
 dnl Compute the canonical target-system type variable
 AC_CANONICAL_TARGET

diff --git a/libs/unimrcp/configure.ac b/libs/unimrcp/configure.ac
index ac8174e7521b11fc93bb06343cd206d35bbe0cca..4a819402c4b09663a2591aab282e6bfaed1f9206 100644 (file)
--- a/libs/unimrcp/configure.ac
+++ b/libs/unimrcp/configure.ac
@@ -8,6 +8,9 @@ AC_INIT([unimrcp],[0.8.0])
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build/acmacros])
 AC_PREFIX_DEFAULT(/usr/local/unimrcp)
+CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
 
 plugindir='${prefix}/plugin'
 confdir='${prefix}/conf'