1 --- icedove-3.1/mozilla/configure.in 2010-06-23 20:43:07.000000000 +0300
2 +++ icedove-3.1/mozilla/configure.in 2010-07-23 12:00:43.318986326 +0300
6 AC_INIT(config/config.mk)
7 +dnl MOZ_READ_MOZCONFIG([.])
8 +_AUTOCONF_TOOLS_DIR="`dirname [$]0`/mozilla/build/autoconf"
9 +. `dirname [$]0`/mozilla/build/autoconf/mozconfig2configure
10 MOZILLA_SRCDIR=$topsrcdir/mozilla
11 AC_CONFIG_AUX_DIR(${MOZILLA_SRCDIR}/build/autoconf)
15 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
16 AC_TRY_COMPILE([], [return(0);],
17 - [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
18 + [ac_cv_prog_hostcc_works=1
19 + AC_MSG_RESULT([yes])],
20 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
25 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
26 AC_TRY_COMPILE([], [return(0);],
27 - [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
28 + [ac_cv_prog_hostcxx_works=1
29 + AC_MSG_RESULT([yes])],
30 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
34 # Make sure compilers are valid
35 CFLAGS="$CFLAGS -TC -nologo"
36 CXXFLAGS="$CXXFLAGS -TP -nologo"
40 AC_TRY_COMPILE([#include <stdio.h>],
41 [ printf("Hello World\n"); ],,
42 AC_MSG_ERROR([\$(CC) test failed. You must have MS VC++ in your path to build.]) )
47 AC_TRY_COMPILE([#include <new.h>],
48 [ unsigned *test = new unsigned(42); ],,
49 AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
54 _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
55 @@ -1051,14 +1056,13 @@
60 AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination])
63 AC_TRY_COMPILE([#include <new>
64 int main() { return 0; }],
69 AC_MSG_RESULT($result)
71 if test "$result" = "no" ; then
73 dnl ========================================================
74 dnl set the defaults first
75 dnl ========================================================
76 +m4_pattern_allow([AS_BIN])
77 +m4_pattern_allow([AS_DASH_C_FLAG])
78 +m4_pattern_allow([AS_PERL])
83 AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof,
84 ac_has_wno_invalid_offsetof,
89 _SAVE_CXXFLAGS="$CXXFLAGS"
90 CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
93 ac_has_wno_invalid_offsetof="yes",
94 ac_has_wno_invalid_offsetof="no")
95 CXXFLAGS="$_SAVE_CXXFLAGS"
99 if test "$ac_has_wno_invalid_offsetof" = "yes"; then
100 _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
101 @@ -1565,8 +1571,7 @@
102 AC_CACHE_CHECK(whether the compiler supports -Wno-variadic-macros,
103 ac_has_wno_variadic_macros,
107 + AC_LANG_PUSH([C++])
108 _SAVE_CXXFLAGS="$CXXFLAGS"
109 CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-variadic-macros"
111 @@ -1574,7 +1579,7 @@
112 ac_has_wno_variadic_macros="yes",
113 ac_has_wno_variadic_macros="no")
114 CXXFLAGS="$_SAVE_CXXFLAGS"
118 if test "$ac_has_wno_variadic_macros" = "yes"; then
119 _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-variadic-macros"
120 @@ -1583,8 +1588,7 @@
121 AC_CACHE_CHECK(whether the compiler supports -Werror=return-type,
122 ac_has_werror_return_type,
126 + AC_LANG_PUSH([C++])
127 _SAVE_CXXFLAGS="$CXXFLAGS"
128 CXXFLAGS="$CXXFLAGS -Werror=return-type"
130 @@ -1592,7 +1596,7 @@
131 ac_has_werror_return_type="yes",
132 ac_has_werror_return_type="no")
133 CXXFLAGS="$_SAVE_CXXFLAGS"
137 if test "$ac_has_werror_return_type" = "yes"; then
138 _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=return-type"
139 @@ -1656,8 +1660,8 @@
140 dnl test that the macros actually work:
141 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
142 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
147 ac_cv_static_assertion_macros_work="yes"
148 AC_TRY_COMPILE([$configure_static_assert_macros],
149 [CONFIGURE_STATIC_ASSERT(1)],
150 @@ -1667,7 +1671,8 @@
151 [CONFIGURE_STATIC_ASSERT(0)],
152 ac_cv_static_assertion_macros_work="no",
156 + AC_LANG_PUSH([C++])
157 AC_TRY_COMPILE([$configure_static_assert_macros],
158 [CONFIGURE_STATIC_ASSERT(1)],
160 @@ -1676,7 +1681,7 @@
161 [CONFIGURE_STATIC_ASSERT(0)],
162 ac_cv_static_assertion_macros_work="no",
167 AC_MSG_RESULT("$ac_cv_static_assertion_macros_work")
168 if test "$ac_cv_static_assertion_macros_work" = "no"; then
169 @@ -1688,8 +1693,7 @@
170 dnl Checking for 64-bit OS
171 dnl ========================================================
172 if test "$COMPILE_ENVIRONMENT"; then
176 AC_MSG_CHECKING(for 64-bit OS)
177 AC_TRY_COMPILE([$configure_static_assert_macros],
178 [CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8)],
179 @@ -1700,7 +1704,7 @@
182 AC_SUBST(HAVE_64BIT_OS)
185 fi # COMPILE_ENVIRONMENT
187 dnl ========================================================
188 @@ -1830,8 +1834,7 @@
189 MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
190 MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
191 if test "$COMPILE_ENVIRONMENT"; then
194 + AC_LANG_PUSH([C++])
195 AC_MSG_CHECKING([for VisualAge C++ compiler version >= 6.0.0.3])
197 [#if (__IBMCPP__ < 600)
198 @@ -1844,7 +1847,7 @@
204 TARGET_COMPILER_ABI="ibmc"
205 CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
206 CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
207 @@ -2682,8 +2685,7 @@
208 CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
209 CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
210 AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
213 + AC_LANG_PUSH([C++])
215 [#if (__SUNPRO_CC < 0x590)
217 @@ -2696,7 +2698,7 @@
220 AC_MSG_RESULT([$_res])
224 ASFLAGS="$ASFLAGS -fPIC"
226 @@ -2808,7 +2810,7 @@
227 if test -z "$SKIP_COMPILER_CHECKS"; then
228 dnl Checks for typedefs, structures, and compiler characteristics.
229 dnl ========================================================
235 @@ -2923,11 +2925,12 @@
241 dnl On the gcc trunk (as of 2001-02-09) _GNU_SOURCE, and thus __USE_GNU,
242 dnl are defined when compiling C++ but not C. Since the result of this
243 dnl test is used only in C++, do it in C++.
247 AC_MSG_CHECKING(for uname.domainname)
248 AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
249 @@ -3019,8 +3022,7 @@
250 CXXFLAGS=$_SAVE_CXXFLAGS
257 dnl Check for .hidden assembler directive and visibility attribute.
258 dnl Borrowed from glibc configure.in
259 @@ -3168,11 +3170,11 @@
261 dnl Check whether the compiler supports the new-style C++ standard
262 dnl library headers (i.e. <new>) or needs the old "new.h"
266 AC_CHECK_HEADER(new, [NEW_H=new])
267 AC_DEFINE_UNQUOTED(NEW_H, <$NEW_H>)
271 AC_ARG_ENABLE(dtrace,
272 [ --enable-dtrace build with dtrace support if available (default=no)],
273 @@ -3220,10 +3222,11 @@
276 AC_CHECK_LIB(m, atan)
277 - AC_CHECK_LIB(dl, dlopen,
278 - AC_CHECK_HEADER(dlfcn.h,
279 + AC_CHECK_LIB(dl, dlopen, [
280 + AC_CHECK_HEADER(dlfcn.h, [
288 @@ -3490,8 +3493,7 @@
289 dnl check for wcrtomb/mbrtowc
290 dnl =======================================================================
291 if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
295 AC_CACHE_CHECK(for wcrtomb,
297 [AC_TRY_LINK([#include <wchar.h>],
298 @@ -3510,7 +3512,7 @@
299 if test "$ac_cv_have_mbrtowc" = "yes"; then
300 AC_DEFINE(HAVE_MBRTOWC)
307 @@ -3535,7 +3537,7 @@
308 dnl AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
314 [for gnu_get_libc_version()],
315 ac_cv_func_gnu_get_libc_version,
316 @@ -3613,7 +3615,7 @@
323 dnl **********************
324 dnl *** va_copy checks ***
325 @@ -3776,7 +3778,7 @@
326 dnl ========================================================
327 dnl Put your C++ language/feature checks below
328 dnl ========================================================
333 if test "$GNU_CC"; then
334 @@ -4150,7 +4152,7 @@
335 ac_cv_attribute_noreturn=no)])
337 dnl End of C++ language/feature checks
341 dnl ========================================================
342 dnl = Internationalization checks
343 @@ -6300,10 +6302,9 @@
344 MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
345 if test "$COMPILE_ENVIRONMENT"; then
346 if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
349 + AC_LANG_PUSH([C++])
350 AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual)
353 AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
355 fi # COMPILE_ENVIRONMENT
356 @@ -6397,10 +6398,9 @@
357 dnl = Support for demangling undefined symbols
358 dnl ========================================================
359 if test -z "$SKIP_LIBRARY_CHECKS"; then
362 + AC_LANG_PUSH([C++])
363 AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=)
368 # Demangle only for debug or trace-malloc builds
369 @@ -6640,7 +6640,7 @@
370 AC_SUBST(PROFILE_USE_CFLAGS)
371 AC_SUBST(PROFILE_USE_LDFLAGS)
376 dnl ========================================================
377 dnl Test for -pedantic bustage
378 @@ -6784,7 +6784,7 @@
380 AC_DEFINE(CPP_THROW_NEW, [throw()])
385 dnl ========================================================
387 @@ -7606,7 +7606,7 @@
388 if test -n "$MOZ_CURRENT_PROJECT"; then
389 export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
391 -AC_OUTPUT_SUBDIRS(mozilla)
392 +AC_CONFIG_SUBDIRS(mozilla)
393 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
394 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
396 @@ -7630,6 +7630,6 @@
397 dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
398 ac_configure_args="$ac_configure_args --enable-64bit"
400 - AC_OUTPUT_SUBDIRS(directory/c-sdk)
401 + AC_CONFIG_SUBDIRS(directory/c-sdk)
402 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
403 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM