Diff
Modified: freeswitch/trunk/configure.in (15867 => 15868)
--- freeswitch/trunk/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -865,15 +865,8 @@
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)
AC_CONFIG_SUBDIRS(libs/sqlite)
Modified: freeswitch/trunk/libs/apr/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/apr/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/apr/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -20,6 +20,10 @@
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 */
Modified: freeswitch/trunk/libs/apr-util/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/apr-util/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/apr-util/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -20,6 +20,10 @@
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.
Modified: freeswitch/trunk/libs/broadvoice/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/broadvoice/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/broadvoice/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -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)
Modified: freeswitch/trunk/libs/curl/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/curl/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/curl/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -27,6 +27,10 @@
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
Modified: freeswitch/trunk/libs/iksemel/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/iksemel/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/iksemel/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -6,6 +6,10 @@
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
Modified: freeswitch/trunk/libs/ilbc/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/ilbc/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/ilbc/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -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,
Modified: freeswitch/trunk/libs/js/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/js/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/js/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -33,6 +33,10 @@
"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
Modified: freeswitch/trunk/libs/js/nsprpub/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/js/nsprpub/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/js/nsprpub/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -38,6 +38,10 @@
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
Modified: freeswitch/trunk/libs/libdingaling/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/libdingaling/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/libdingaling/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -8,6 +8,10 @@
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.
Modified: freeswitch/trunk/libs/libedit/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/libedit/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/libedit/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -5,6 +5,10 @@
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
Modified: freeswitch/trunk/libs/libg722_1/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/libg722_1/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/libg722_1/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -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)
Modified: freeswitch/trunk/libs/libsndfile/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/libsndfile/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/libsndfile/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -8,6 +8,10 @@
# 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([])
Modified: freeswitch/trunk/libs/pcre/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/pcre/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/pcre/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -22,6 +22,10 @@
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
Modified: freeswitch/trunk/libs/portaudio/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/portaudio/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/portaudio/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -11,6 +11,10 @@
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,
Modified: freeswitch/trunk/libs/sofia-sip/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/sofia-sip/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/sofia-sip/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -12,6 +12,11 @@
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])
Modified: freeswitch/trunk/libs/spandsp/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/spandsp/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/spandsp/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -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)
Modified: freeswitch/trunk/libs/speex/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/speex/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/speex/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -29,6 +29,10 @@
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
Modified: freeswitch/trunk/libs/sqlite/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/sqlite/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/sqlite/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -145,6 +145,10 @@
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
Modified: freeswitch/trunk/libs/srtp/configure.in (15867 => 15868)
--- freeswitch/trunk/libs/srtp/configure.in 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/srtp/configure.in 2009-12-10 04:19:49 UTC (rev 15868)
@@ -3,6 +3,10 @@
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.
Modified: freeswitch/trunk/libs/tiff-3.8.2/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/tiff-3.8.2/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/tiff-3.8.2/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -29,6 +29,9 @@
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
Modified: freeswitch/trunk/libs/unimrcp/configure.ac (15867 => 15868)
--- freeswitch/trunk/libs/unimrcp/configure.ac 2009-12-10 04:18:18 UTC (rev 15867)
+++ freeswitch/trunk/libs/unimrcp/configure.ac 2009-12-10 04:19:49 UTC (rev 15868)
@@ -8,6 +8,9 @@
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'