diff --git a/configure.in b/configure.in index 027648776a..2091472bd6 100644 --- 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 cb2ff3f43d..c0b4a3bfad 100644 --- 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 59fa7b9c7c..04f6e8f506 100644 --- 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 7abfc32b22..96d58ffc3a 100644 --- 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 980cba2606..204bf1fd99 100644 --- 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, This configure script may be copied, distributed and modified under the diff --git a/libs/iksemel/configure.ac b/libs/iksemel/configure.ac index ca4bb9d438..f7687922c2 100644 --- 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 1966788226..b3fda17c66 100644 --- 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 f4e0954d04..7ee5089008 100644 --- 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 470564aadf..93d3bd9f85 100644 --- 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 cc98231c8a..241fb103bd 100755 --- 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 5335ba5fe0..5bf51d28cf 100644 --- 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 b87b989f04..a60a69bc93 100644 --- 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 5d8ce43560..4bdbfd0969 100644 --- 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 02a73f3f26..b6f79f98cf 100644 --- 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 366131d71e..f4ef9abbee 100644 --- 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 fef489e9a6..e5045435e4 100644 --- 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 58b7af50d0..06eaf6ee88 100644 --- 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 3a9b58bfcc..12dcc6d6e0 100644 --- 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 cf84cef0f8..fc21161fda 100644 --- 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 edf8462a8a..2495a55f95 100644 --- 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 e5406cda2d..dc4676f4e6 100644 --- 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 ac8174e752..4a819402c4 100644 --- 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'