3 @@ -1959,7 +1959,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
4 AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
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}"
12 + ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
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
22 APR_CONFIG_NICE(config.nice)
24 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
25 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
26 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
29 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
30 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
31 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
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)
43 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
44 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
45 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
48 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
49 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
50 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
54 dnl Hard-coded inclusion at the tail end of apr_private.h:
56 --- a/libs/broadvoice/configure.ac
57 +++ b/libs/broadvoice/configure.ac
60 AC_INIT([broadvoice],[0.1.0])
62 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
63 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
64 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
67 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
68 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
69 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
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])
79 AC_CONFIG_HEADERS(include/config.h)
81 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
82 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
83 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
86 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
87 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
88 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
94 --- a/libs/ilbc/configure.ac
95 +++ b/libs/ilbc/configure.ac
98 AC_INIT([ilbc], [0.0.1])
100 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
101 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
102 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
105 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
106 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
107 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
111 AC_DEFUN([AX_COMPILER_VENDOR],
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])
119 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
120 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
121 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
124 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
125 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
126 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
130 #Set default language
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])
138 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
139 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
140 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
143 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
144 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
145 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
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])
157 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
158 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
159 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
162 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
163 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
164 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
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
174 AC_INIT([spandsp], [1.99.0])
176 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
177 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
178 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
181 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
182 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
183 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
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)
195 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
196 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
197 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
200 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
201 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
202 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
206 #Set default language
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)
212 m4_include(m4/acinclude.m4)
214 -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
215 -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
216 -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
219 + CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
220 + CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
221 + LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
225 dnl Compute the canonical host (run-time) system type variable