SOURCES: mozilla-firefox-ac.patch - more AC_LANG_PUSH/POP
glen
glen at pld-linux.org
Mon Mar 31 14:37:56 CEST 2008
Author: glen Date: Mon Mar 31 12:37:56 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- more AC_LANG_PUSH/POP
---- Files affected:
SOURCES:
mozilla-firefox-ac.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/mozilla-firefox-ac.patch
diff -u SOURCES/mozilla-firefox-ac.patch:1.2 SOURCES/mozilla-firefox-ac.patch:1.3
--- SOURCES/mozilla-firefox-ac.patch:1.2 Mon Mar 31 14:11:26 2008
+++ SOURCES/mozilla-firefox-ac.patch Mon Mar 31 14:37:51 2008
@@ -1,5 +1,5 @@
---- 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:00:07.275311356 +0300
++++ mozilla/configure.in 2008-03-31 15:25:03.241264725 +0300
@@ -61,6 +61,9 @@
AC_PREREQ(2.13)
@@ -96,7 +96,37 @@
fi # COMPILE_ENVIRONMENT
dnl ========================================================
-@@ -1353,8 +1360,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
@@ -106,7 +136,7 @@
AC_MSG_CHECKING([for VisualAge C++ compiler version >= 5.0.2.0])
AC_TRY_COMPILE([],
[#if (__IBMCPP__ < 502)
-@@ -1367,7 +1373,7 @@
+@@ -1367,7 +1374,7 @@
else
AC_MSG_RESULT([yes])
fi
@@ -115,7 +145,7 @@
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 +2155,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])
@@ -125,7 +155,7 @@
AC_TRY_COMPILE([],
[#if (__SUNPRO_CC < 0x530)
#error "Denied"
-@@ -2163,7 +2168,7 @@
+@@ -2163,7 +2169,7 @@
_res="yes"
fi
AC_MSG_RESULT([$_res])
@@ -134,6 +164,25 @@
else
ASFLAGS="$ASFLAGS -fPIC"
DSO_LDOPTS='-G'
+@@ -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)
@@ -144,7 +193,7 @@
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS -fshort-wchar"
-@@ -2504,7 +2508,7 @@
+@@ -2504,13 +2508,13 @@
else
CXXFLAGS=$_SAVE_CXXFLAGS
fi
@@ -152,7 +201,23 @@
+ AC_LANG_POP
fi
- dnl Check for .hidden assembler directive and visibility attribute.
+ 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*)
;;
@@ -167,6 +232,20 @@
;;
esac
if test ! "$GNU_CXX"; then
+@@ -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 =======================================================================
@@ -186,7 +265,43 @@
fi
AC_CACHE_CHECK(
-@@ -4050,8 +4053,7 @@
+@@ -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
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
@@ -196,7 +311,7 @@
AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
AC_MSG_ERROR([Cannot find QT libraries.])))
-@@ -4082,7 +4084,7 @@
+@@ -4082,7 +4082,7 @@
CXXFLAGS=$_SAVE_CXXFLAGS
LIBS=$_SAVE_LIBS
@@ -205,7 +320,7 @@
fi
fi # COMPILE_ENVIRONMENT
-@@ -5275,13 +5277,12 @@
+@@ -5275,13 +5275,12 @@
dnl AC_MSG_ERROR([Gdiplus.h not found!]))
dnl So do this instead:
AC_MSG_CHECKING(for Gdiplus.h)
@@ -221,7 +336,7 @@
AC_DEFINE(MOZ_SVG_RENDERER_GDIPLUS)
;;
-@@ -5868,10 +5869,9 @@
+@@ -5868,10 +5867,9 @@
MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
if test "$COMPILE_ENVIRONMENT"; then
if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
@@ -234,7 +349,7 @@
AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
fi
fi # COMPILE_ENVIRONMENT
-@@ -6012,10 +6012,9 @@
+@@ -6012,10 +6010,9 @@
dnl = Support for demangling undefined symbols
dnl ========================================================
if test -z "$SKIP_LIBRARY_CHECKS"; then
@@ -247,7 +362,25 @@
fi
# Demangle only for debug or trace-malloc builds
-@@ -6966,12 +6965,11 @@
+@@ -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
CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -262,7 +395,7 @@
CFLAGS=$_SAVE_CFLAGS
AC_DEFINE(SUNCTL)
fi
-@@ -7523,7 +7521,7 @@
+@@ -7523,7 +7519,7 @@
if test -n "$HAVE_64BIT_OS"; then
ac_configure_args="$ac_configure_args --enable-64bit"
fi
@@ -271,7 +404,7 @@
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
-@@ -7569,7 +7567,7 @@
+@@ -7569,7 +7565,7 @@
if test -n "$HAVE_64BIT_OS"; then
ac_configure_args="$ac_configure_args --enable-64bit"
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mozilla-firefox-ac.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list