SOURCES: mozilla-firefox-ac.patch (NEW) - if ac rebuild is needed...
qboosh
qboosh at pld-linux.org
Thu Nov 2 15:39:15 CET 2006
Author: qboosh Date: Thu Nov 2 14:39:15 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- if ac rebuild is needed...
---- Files affected:
SOURCES:
mozilla-firefox-ac.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/mozilla-firefox-ac.patch
diff -u /dev/null SOURCES/mozilla-firefox-ac.patch:1.1
--- /dev/null Thu Nov 2 15:39:15 2006
+++ SOURCES/mozilla-firefox-ac.patch Thu Nov 2 15:39:10 2006
@@ -0,0 +1,281 @@
+--- mozilla/configure.in.orig 2006-11-02 14:42:28.649505000 +0100
++++ mozilla/configure.in 2006-11-02 15:29:44.879505000 +0100
+@@ -61,6 +61,9 @@
+
+ AC_PREREQ(2.13)
+ AC_INIT(config/config.mk)
++dnl MOZ_READ_MOZCONFIG([.])
++_AUTOCONF_TOOLS_DIR="`dirname [$]0`/build/autoconf"
++. `dirname [$]0`/build/autoconf/mozconfig2configure
+ AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+ AC_CANONICAL_SYSTEM
+ TARGET_CPU="${target_cpu}"
+@@ -388,17 +391,17 @@
+ # Make sure compilers are valid
+ CFLAGS="$CFLAGS -TC -nologo"
+ CXXFLAGS="$CXXFLAGS -TP -nologo"
+- AC_LANG_SAVE
+- AC_LANG_C
++ AC_LANG_PUSH([C])
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [ printf("Hello World\n"); ],,
+ AC_MSG_ERROR([\$(CC) test failed. You must have MS VC++ in your path to build.]) )
++ AC_LANG_POP
+
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([#include <new.h>],
+ [ unsigned *test = new unsigned(42); ],,
+ AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
+- AC_LANG_RESTORE
++ AC_LANG_POP
+
+ _MSVC_VER_FILTER='s|.* \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*|\1|p'
+
+@@ -705,12 +708,12 @@
+ fi
+
+ AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination])
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([#include <new>
+ int main() { return 0; }],
+ result=yes,
+ result=no)
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ AC_MSG_RESULT($result)
+
+ if test "$result" = "no" ; then
+@@ -770,6 +773,9 @@
+ dnl ========================================================
+ dnl set the defaults first
+ dnl ========================================================
++m4_pattern_allow([AS_BIN])
++m4_pattern_allow([AS_DASH_C_FLAG])
++m4_pattern_allow([AS_PERL])
+ AS_BIN=$AS
+ AR_FLAGS='cr $@'
+ AR_LIST='$(AR) t'
+@@ -1217,8 +1223,7 @@
+ dnl Checking for 64-bit OS
+ dnl ========================================================
+ if test "$COMPILE_ENVIRONMENT"; then
+-AC_LANG_SAVE
+-AC_LANG_C
++AC_LANG_PUSH([C])
+ AC_MSG_CHECKING(for 64-bit OS)
+ AC_TRY_RUN([ int main () {
+ if (sizeof(long) == 8) { return 0; } return 1; } ],
+@@ -1235,7 +1240,7 @@
+ solaris*) TARGET_NSPR_MDCPUCFG='\"md/_solaris64.cfg\"' ;;
+ esac
+ fi
+-AC_LANG_RESTORE
++AC_LANG_POP
+ fi # COMPILE_ENVIRONMENT
+
+ dnl ========================================================
+@@ -1353,8 +1358,7 @@
+ MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ if test "$COMPILE_ENVIRONMENT"; then
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_MSG_CHECKING([for VisualAge C++ compiler version >= 5.0.2.0])
+ AC_TRY_COMPILE([],
+ [#if (__IBMCPP__ < 502)
+@@ -1367,7 +1371,7 @@
+ else
+ AC_MSG_RESULT([yes])
+ fi
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ 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 @@
+ 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_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([],
+ [#if (__SUNPRO_CC < 0x530)
+ #error "Denied"
+@@ -2163,7 +2166,7 @@
+ _res="yes"
+ fi
+ AC_MSG_RESULT([$_res])
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ else
+ ASFLAGS="$ASFLAGS -fPIC"
+ DSO_LDOPTS='-G'
+@@ -2483,8 +2486,7 @@
+ dnl only have short-wchar support for c++.
+ dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
+
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ _SAVE_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS -fshort-wchar"
+
+@@ -2504,7 +2506,7 @@
+ else
+ CXXFLAGS=$_SAVE_CXXFLAGS
+ fi
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ fi
+
+ dnl Check for .hidden assembler directive and visibility attribute.
+@@ -2652,10 +2654,10 @@
+ *-darwin*)
+ ;;
+ *)
+- AC_CHECK_LIB(dl, dlopen,
+- AC_CHECK_HEADER(dlfcn.h,
++ AC_CHECK_LIB(dl, dlopen,[
++ AC_CHECK_HEADER(dlfcn.h,[
+ LIBS="-ldl $LIBS"
+- AC_DEFINE(HAVE_LIBDL)))
++ AC_DEFINE(HAVE_LIBDL)])])
+ ;;
+ esac
+ if test ! "$GNU_CXX"; then
+@@ -2984,8 +2986,7 @@
+ dnl check for wcrtomb/mbrtowc
+ dnl =======================================================================
+ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
+-AC_LANG_SAVE
+-AC_LANG_CPLUSPLUS
++AC_LANG_PUSH([C++])
+ AC_CACHE_CHECK(for wcrtomb,
+ ac_cv_have_wcrtomb,
+ [AC_TRY_LINK([#include <wchar.h>],
+@@ -3004,7 +3005,7 @@
+ if test "$ac_cv_have_mbrtowc" = "yes"; then
+ AC_DEFINE(HAVE_MBRTOWC)
+ fi
+-AC_LANG_RESTORE
++AC_LANG_POP
+ fi
+
+ AC_CACHE_CHECK(
+@@ -4050,8 +4051,7 @@
+ _SAVE_LDFLAGS=$LDFLAGS
+ QT_LDFLAGS=-L${QTDIR}/lib
+ LDFLAGS="$LDFLAGS $QT_LDFLAGS"
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ 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 +4082,7 @@
+ CXXFLAGS=$_SAVE_CXXFLAGS
+ LIBS=$_SAVE_LIBS
+
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ fi
+ fi # COMPILE_ENVIRONMENT
+
+@@ -5275,13 +5275,12 @@
+ dnl AC_MSG_ERROR([Gdiplus.h not found!]))
+ dnl So do this instead:
+ AC_MSG_CHECKING(for Gdiplus.h)
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([#include <windows.h>
+ #include <unknwn.h>
+ #include <Gdiplus.h>],,AC_MSG_RESULT(yes),
+ AC_MSG_ERROR([Building the SVG GDI+ renderer requires an appropriate Microsoft SDK.]))
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ AC_DEFINE(MOZ_SVG_RENDERER_GDIPLUS)
+ ;;
+
+@@ -5868,10 +5867,9 @@
+ MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual)
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
+ fi
+ fi # COMPILE_ENVIRONMENT
+@@ -6012,10 +6010,9 @@
+ dnl = Support for demangling undefined symbols
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
++ AC_LANG_PUSH([C++])
+ AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=)
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ fi
+
+ # Demangle only for debug or trace-malloc builds
+@@ -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"
+- AC_LANG_SAVE
+- AC_LANG_C
++ AC_LANG_PUSH([C])
+ AC_TRY_COMPILE([#include <gmodule.h>],
+ [ int x = 1; x++; ],,
+ [AC_MSG_ERROR([Cannot build ctl without gmodule support in glib.])])
+- AC_LANG_RESTORE
++ AC_LANG_POP
+ CFLAGS=$_SAVE_CFLAGS
+ AC_DEFINE(SUNCTL)
+ fi
+@@ -7523,7 +7519,7 @@
+ if test -n "$HAVE_64BIT_OS"; then
+ ac_configure_args="$ac_configure_args --enable-64bit"
+ fi
+- AC_OUTPUT_SUBDIRS(nsprpub)
++ AC_CONFIG_SUBDIRS(nsprpub)
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+
+@@ -7569,7 +7565,7 @@
+ if test -n "$HAVE_64BIT_OS"; then
+ ac_configure_args="$ac_configure_args --enable-64bit"
+ fi
+- AC_OUTPUT_SUBDIRS(directory/c-sdk)
++ AC_CONFIG_SUBDIRS(directory/c-sdk)
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+ fi # COMPILE_ENVIRONMENT
+--- mozilla/build/autoconf/altoptions.m4.orig 2006-11-02 15:09:27.229505000 +0100
++++ mozilla/build/autoconf/altoptions.m4 2006-11-02 15:13:14.929505000 +0100
+@@ -145,12 +145,13 @@
+ ])
+
+ dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+-AC_DEFUN(MOZ_READ_MOZCONFIG,
++AC_DEFUN([MOZ_READ_MOZCONFIG],
+ [AC_REQUIRE([AC_INIT_BINSH])dnl
+ # Read in '.mozconfig' script to set the initial options.
+ # See the mozconfig2configure script for more details.
+ _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
+-. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
++. $_AUTOCONF_TOOLS_DIR/mozconfig2configure
++])
+
+ dnl This gets inserted at the top of the configure script
+-MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)
++dnl MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)
================================================================
More information about the pld-cvs-commit
mailing list