1 --- mozilla/configure.in 2010-03-17 19:02:26.000000000 +0200
2 +++ mozilla/configure.in 2010-04-09 15:34:47.102899038 +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 @@ -1070,14 +1072,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 @@ -1680,8 +1683,8 @@
102 dnl test that the macros actually work:
103 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
104 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
109 ac_cv_static_assertion_macros_work="yes"
110 AC_TRY_COMPILE([$configure_static_assert_macros],
111 [CONFIGURE_STATIC_ASSERT(1)],
112 @@ -1691,7 +1694,8 @@
113 [CONFIGURE_STATIC_ASSERT(0)],
114 ac_cv_static_assertion_macros_work="no",
118 + AC_LANG_PUSH([C++])
119 AC_TRY_COMPILE([$configure_static_assert_macros],
120 [CONFIGURE_STATIC_ASSERT(1)],
122 @@ -1700,7 +1704,7 @@
123 [CONFIGURE_STATIC_ASSERT(0)],
124 ac_cv_static_assertion_macros_work="no",
129 AC_MSG_RESULT("$ac_cv_static_assertion_macros_work")
130 if test "$ac_cv_static_assertion_macros_work" = "no"; then
131 @@ -1712,8 +1716,7 @@
132 dnl Checking for 64-bit OS
133 dnl ========================================================
134 if test "$COMPILE_ENVIRONMENT"; then
138 AC_MSG_CHECKING(for 64-bit OS)
139 AC_TRY_COMPILE([$configure_static_assert_macros],
140 [CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)],
141 @@ -1724,7 +1727,7 @@
144 AC_SUBST(HAVE_64BIT_OS)
147 fi # COMPILE_ENVIRONMENT
149 dnl ========================================================
150 @@ -1853,8 +1856,7 @@
151 MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
152 MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
153 if test "$COMPILE_ENVIRONMENT"; then
156 + AC_LANG_PUSH([C++])
157 AC_MSG_CHECKING([for VisualAge C++ compiler version >= 6.0.0.3])
159 [#if (__IBMCPP__ < 600)
160 @@ -1867,7 +1869,7 @@
166 TARGET_COMPILER_ABI="ibmc"
167 CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
168 CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
169 @@ -2391,10 +2393,9 @@
171 AC_CHECK_HEADERS(mmintrin.h oleacc.idl)
175 + AC_LANG_PUSH([C++])
176 AC_CHECK_HEADERS(atlbase.h wpcapi.h)
182 @@ -2657,8 +2658,7 @@
183 CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
184 CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
185 AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
188 + AC_LANG_PUSH([C++])
190 [#if (__SUNPRO_CC < 0x590)
192 @@ -2671,7 +2671,7 @@
195 AC_MSG_RESULT([$_res])
199 ASFLAGS="$ASFLAGS -fPIC"
201 @@ -2796,7 +2796,7 @@
202 if test -z "$SKIP_COMPILER_CHECKS"; then
203 dnl Checks for typedefs, structures, and compiler characteristics.
204 dnl ========================================================
210 @@ -2911,11 +2911,12 @@
216 dnl On the gcc trunk (as of 2001-02-09) _GNU_SOURCE, and thus __USE_GNU,
217 dnl are defined when compiling C++ but not C. Since the result of this
218 dnl test is used only in C++, do it in C++.
222 AC_MSG_CHECKING(for uname.domainname)
223 AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
224 @@ -2946,8 +2947,7 @@
232 dnl Check for usable wchar_t (2 bytes, unsigned)
233 dnl (we really don't need the unsignedness check anymore)
234 @@ -2971,8 +2971,7 @@
235 dnl only have short-wchar support for c++.
236 dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
240 + AC_LANG_PUSH([C++])
241 _SAVE_CXXFLAGS=$CXXFLAGS
242 CXXFLAGS="$CXXFLAGS -fshort-wchar"
244 @@ -2991,7 +2990,7 @@
246 CXXFLAGS=$_SAVE_CXXFLAGS
252 dnl Check for .hidden assembler directive and visibility attribute.
253 @@ -3141,11 +3140,11 @@
255 dnl Check whether the compiler supports the new-style C++ standard
256 dnl library headers (i.e. <new>) or needs the old "new.h"
260 AC_CHECK_HEADER(new, [NEW_H=new])
261 AC_DEFINE_UNQUOTED(NEW_H, <$NEW_H>)
265 AC_ARG_ENABLE(dtrace,
266 [ --enable-dtrace build with dtrace support if available (default=no)],
267 @@ -3191,10 +3190,12 @@
270 AC_CHECK_LIB(m, atan)
271 - AC_CHECK_LIB(dl, dlopen,
272 - AC_CHECK_HEADER(dlfcn.h,
274 - AC_DEFINE(HAVE_LIBDL)))
275 + AC_CHECK_LIB(dl, dlopen, [
276 + AC_CHECK_HEADER(dlfcn.h, [
278 + AC_DEFINE(HAVE_LIBDL)
284 @@ -3488,8 +3489,7 @@
285 dnl check for wcrtomb/mbrtowc
286 dnl =======================================================================
287 if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
291 AC_CACHE_CHECK(for wcrtomb,
293 [AC_TRY_LINK([#include <wchar.h>],
294 @@ -3508,7 +3508,7 @@
295 if test "$ac_cv_have_mbrtowc" = "yes"; then
296 AC_DEFINE(HAVE_MBRTOWC)
303 @@ -3533,7 +3533,7 @@
304 dnl AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
310 [for gnu_get_libc_version()],
311 ac_cv_func_gnu_get_libc_version,
312 @@ -3611,7 +3611,7 @@
319 dnl **********************
320 dnl *** va_copy checks ***
321 @@ -3774,7 +3774,7 @@
322 dnl ========================================================
323 dnl Put your C++ language/feature checks below
324 dnl ========================================================
329 if test "$GNU_CC"; then
330 @@ -4101,7 +4101,7 @@
333 dnl End of C++ language/feature checks
337 dnl ========================================================
338 dnl = Internationalization checks
339 @@ -6289,10 +6296,9 @@
340 MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
341 if test "$COMPILE_ENVIRONMENT"; then
342 if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
345 + AC_LANG_PUSH([C++])
346 AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual)
349 AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
351 fi # COMPILE_ENVIRONMENT
352 @@ -6409,10 +6415,9 @@
353 dnl = Support for demangling undefined symbols
354 dnl ========================================================
355 if test -z "$SKIP_LIBRARY_CHECKS"; then
358 + AC_LANG_PUSH([C++])
359 AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=)
364 # Demangle only for debug or trace-malloc builds
365 @@ -6647,7 +6652,7 @@
366 AC_SUBST(PROFILE_USE_CFLAGS)
367 AC_SUBST(PROFILE_USE_LDFLAGS)
372 dnl ========================================================
373 dnl Test for -pedantic bustage
374 @@ -6788,7 +6793,7 @@
376 AC_DEFINE(CPP_THROW_NEW, [throw()])
381 dnl ========================================================
383 @@ -7617,7 +7622,7 @@
384 if test -n "$MOZ_CURRENT_PROJECT"; then
385 export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
387 -AC_OUTPUT_SUBDIRS(mozilla)
388 +AC_CONFIG_SUBDIRS(mozilla)
389 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
390 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
392 @@ -7650,7 +7655,7 @@
393 if test -n "$HAVE_64BIT_OS"; then
394 ac_configure_args="$ac_configure_args --enable-64bit"
396 - AC_OUTPUT_SUBDIRS(directory/c-sdk)
397 + AC_CONFIG_SUBDIRS(directory/c-sdk)
398 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
400 fi # COMPILE_ENVIRONMENT
401 --- mozilla/mozilla/build/autoconf/altoptions.m4~ 2009-03-26 22:38:57.000000000 +0200
402 +++ mozilla/mozilla/build/autoconf/altoptions.m4 2009-07-29 01:34:11.680668351 +0300
406 dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
407 -AC_DEFUN([MOZ_READ_MOZCONFIG],
408 +AC_DEFUN([[MOZ_READ_MOZCONFIG]],
409 [AC_REQUIRE([AC_INIT_BINSH])dnl
410 # Read in '.mozconfig' script to set the initial options.
411 # See the mozconfig2configure script for more details.
412 _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
413 -. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
414 +. $_AUTOCONF_TOOLS_DIR/mozconfig2configure
416 --- mozilla/mozilla/build/autoconf/nss.m4~ 2009-03-26 22:38:57.000000000 +0200
417 +++ mozilla/mozilla/build/autoconf/nss.m4 2009-07-29 01:57:50.473936834 +0300
420 dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
421 dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
422 -AC_DEFUN(AM_PATH_NSS,
423 +AC_DEFUN([AM_PATH_NSS],
426 AC_ARG_WITH(nss-prefix,