---- mozilla/configure.in.orig 2006-11-02 14:42:28.649505000 +0100
-+++ mozilla/configure.in 2006-11-02 15:29:44.879505000 +0100
+--- mozilla/configure.in 2008-03-31 15:00:07.275311356 +0300
++++ mozilla/configure.in 2008-03-31 15:25:03.241264725 +0300
@@ -61,6 +61,9 @@
AC_PREREQ(2.13)
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
-@@ -388,17 +391,17 @@
+@@ -270,7 +273,8 @@
+
+ AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+ AC_TRY_COMPILE([], [return(0);],
+- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
++ [ac_cv_prog_hostcc_works=1
++ AC_MSG_RESULT([yes])],
+ AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
+
+ CC="$HOST_CXX"
+@@ -278,7 +282,8 @@
+
+ AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
+ AC_TRY_COMPILE([], [return(0);],
+- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
++ [ac_cv_prog_hostcxx_works=1
++ AC_MSG_RESULT([yes])],
+ AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
+
+ CC=$_SAVE_CC
+@@ -388,17 +393,17 @@
# Make sure compilers are valid
CFLAGS="$CFLAGS -TC -nologo"
CXXFLAGS="$CXXFLAGS -TP -nologo"
_MSVC_VER_FILTER='s|.* \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*|\1|p'
-@@ -705,12 +708,12 @@
+@@ -705,12 +710,12 @@
fi
AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination])
AC_MSG_RESULT($result)
if test "$result" = "no" ; then
-@@ -770,6 +773,9 @@
+@@ -770,6 +775,9 @@
dnl ========================================================
dnl set the defaults first
dnl ========================================================
AS_BIN=$AS
AR_FLAGS='cr $@'
AR_LIST='$(AR) t'
-@@ -1217,8 +1223,7 @@
+@@ -1217,8 +1225,7 @@
dnl Checking for 64-bit OS
dnl ========================================================
if test "$COMPILE_ENVIRONMENT"; then
AC_MSG_CHECKING(for 64-bit OS)
AC_TRY_RUN([ int main () {
if (sizeof(long) == 8) { return 0; } return 1; } ],
-@@ -1235,7 +1240,7 @@
+@@ -1235,7 +1242,7 @@
solaris*) TARGET_NSPR_MDCPUCFG='\"md/_solaris64.cfg\"' ;;
esac
fi
fi # COMPILE_ENVIRONMENT
dnl ========================================================
-@@ -1353,8 +1358,7 @@
+@@ -1281,8 +1288,7 @@
+ dnl test that the macros actually work:
+ AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
+ AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
+- [AC_LANG_SAVE
+- AC_LANG_C
++ [AC_LANG_PUSH([C])
+ ac_cv_static_assertion_macros_work="yes"
+ AC_TRY_COMPILE([$configure_static_assert_macros],
+ [CONFIGURE_STATIC_ASSERT(1)],
+@@ -1292,7 +1298,9 @@
+ [CONFIGURE_STATIC_ASSERT(0)],
+ ac_cv_static_assertion_macros_work="no",
+ )
+- AC_LANG_CPLUSPLUS
++ AC_LANG_POP
++
++ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([$configure_static_assert_macros],
+ [CONFIGURE_STATIC_ASSERT(1)],
+ ,
+@@ -1301,7 +1309,7 @@
+ [CONFIGURE_STATIC_ASSERT(0)],
+ ac_cv_static_assertion_macros_work="no",
+ )
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ ])
+ AC_MSG_RESULT("$ac_cv_static_assertion_macros_work")
+ if test "$ac_cv_static_assertion_macros_work" = "no"; then
+@@ -1353,8 +1361,7 @@
MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
if test "$COMPILE_ENVIRONMENT"; then
AC_MSG_CHECKING([for VisualAge C++ compiler version >= 5.0.2.0])
AC_TRY_COMPILE([],
[#if (__IBMCPP__ < 502)
-@@ -1367,7 +1371,7 @@
+@@ -1367,7 +1374,7 @@
else
AC_MSG_RESULT([yes])
fi
TARGET_COMPILER_ABI="ibmc"
CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-@@ -2149,8 +2153,7 @@
+@@ -2149,8 +2156,7 @@
CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
AC_MSG_CHECKING([for Forte compiler version >= WS6U2])
AC_TRY_COMPILE([],
[#if (__SUNPRO_CC < 0x530)
#error "Denied"
-@@ -2163,7 +2166,7 @@
+@@ -2163,7 +2169,7 @@
_res="yes"
fi
AC_MSG_RESULT([$_res])
else
ASFLAGS="$ASFLAGS -fPIC"
DSO_LDOPTS='-G'
-@@ -2483,8 +2486,7 @@
+@@ -2247,8 +2253,7 @@
+ CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
+ CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
+ AC_MSG_CHECKING([for Forte compiler version >= WS6U2])
+- AC_LANG_PUSH([C++])
+- AC_TRY_COMPILE([],
++ AC_LANG_PUSH([C++]) AC_TRY_COMPILE([],
+ [#if (__SUNPRO_CC < 0x530)
+ #error "Denied"
+ #endif],
+@@ -2382,7 +2387,7 @@
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ dnl ========================================================
+-AC_LANG_C
++AC_LANG_PUSH([C])
+ AC_HEADER_STDC
+ AC_C_CONST
+ AC_TYPE_MODE_T
+@@ -2483,8 +2488,7 @@
dnl only have short-wchar support for c++.
dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS -fshort-wchar"
-@@ -2504,7 +2506,7 @@
+@@ -2504,13 +2508,13 @@
else
CXXFLAGS=$_SAVE_CXXFLAGS
fi
+ AC_LANG_POP
fi
- dnl Check for .hidden assembler directive and visibility attribute.
-@@ -2652,10 +2654,10 @@
+ dnl On the gcc trunk (as of 2001-02-09) _GNU_SOURCE, and thus __USE_GNU,
+ dnl are defined when compiling C++ but not C. Since the result of this
+ dnl test is used only in C++, do it in C++.
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+
+ AC_MSG_CHECKING(for uname.domainname)
+ AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
+@@ -2542,7 +2546,7 @@
+ AC_MSG_RESULT(no)
+ fi
+
+-AC_LANG_C
++AC_LANG_POP
+
+ dnl Check for usable wchar_t (2 bytes, unsigned)
+ dnl (we really don't need the unsignedness check anymore)
+@@ -2652,10 +2656,10 @@
*-darwin*)
;;
*)
;;
esac
if test ! "$GNU_CXX"; then
-@@ -2984,8 +2986,7 @@
+@@ -2728,11 +2732,11 @@
+
+ dnl Check whether the compiler supports the new-style C++ standard
+ dnl library headers (i.e. <new>) or needs the old "new.h"
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+ NEW_H=new.h
+ AC_CHECK_HEADER(new, [NEW_H=new])
+ AC_DEFINE_UNQUOTED(NEW_H, <$NEW_H>)
+-AC_LANG_C
++AC_LANG_POP
+
+ case $target in
+ *-aix4.3*|*-aix5*)
+@@ -2984,8 +2988,7 @@
dnl check for wcrtomb/mbrtowc
dnl =======================================================================
if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
AC_CACHE_CHECK(for wcrtomb,
ac_cv_have_wcrtomb,
[AC_TRY_LINK([#include <wchar.h>],
-@@ -3004,7 +3005,7 @@
+@@ -3004,7 +3007,7 @@
if test "$ac_cv_have_mbrtowc" = "yes"; then
AC_DEFINE(HAVE_MBRTOWC)
fi
fi
AC_CACHE_CHECK(
+@@ -3103,7 +3106,7 @@
+ dnl AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
+ fi
+
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+ AC_CACHE_CHECK(
+ [for gnu_get_libc_version()],
+ ac_cv_func_gnu_get_libc_version,
+@@ -3181,8 +3184,6 @@
+
+ AM_LANGINFO_CODESET
+
+-AC_LANG_C
+-
+ dnl **********************
+ dnl *** va_copy checks ***
+ dnl **********************
+@@ -3344,7 +3345,7 @@
+ dnl ========================================================
+ dnl Put your C++ language/feature checks below
+ dnl ========================================================
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+
+ HAVE_GCC3_ABI=
+ if test "$GNU_CC"; then
+@@ -3659,7 +3660,7 @@
+
+
+ dnl End of C++ language/feature checks
+-AC_LANG_C
++AC_LANG_POP
+
+ dnl ========================================================
+ dnl = Internationalization checks
@@ -4050,8 +4051,7 @@
_SAVE_LDFLAGS=$LDFLAGS
QT_LDFLAGS=-L${QTDIR}/lib
fi
# Demangle only for debug or trace-malloc builds
+@@ -6279,7 +6276,7 @@
+ AC_SUBST(PROFILE_GEN_CFLAGS)
+ AC_SUBST(PROFILE_USE_CFLAGS)
+
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+
+ dnl ========================================================
+ dnl Test for -pedantic bustage
+@@ -6418,7 +6415,7 @@
+ else
+ AC_DEFINE(CPP_THROW_NEW, [throw()])
+ fi
+-AC_LANG_C
++AC_LANG_POP
+
+ dnl ========================================================
+ dnl =
@@ -6966,12 +6963,11 @@
dnl older versions of glib do not seem to have gmodule which ctl needs
_SAVE_CFLAGS=$CFLAGS
projects / packages / thunderbird.git / blobdiff