diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 15:41:14 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 15:41:14 +0200 |
| commit | bce2194900623248aa9e61af0355ca1e845b7efd (patch) | |
| tree | c5cbbd91eedc644d4403eb6837b66d5b030ff282 | |
| parent | 234edf53cf06ec9f663338695f4d29a1bbdd360c (diff) | |
firefox: removed 3.0.* versions
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
49 files changed, 0 insertions, 7899 deletions
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig deleted file mode 100644 index 094a0ff642..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 -ac_add_options --with-arm-kuser - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig deleted file mode 100644 index f7ab5dd3a3..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig +++ /dev/null @@ -1,66 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -#ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig deleted file mode 100644 index 094a0ff642..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 -ac_add_options --with-arm-kuser - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig deleted file mode 100644 index f7ab5dd3a3..0000000000 --- a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig +++ /dev/null @@ -1,66 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -#ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Thu, 24 Jul 2008 16:05:09 -0400 -Subject: [PATCH 1/1] Remove -Werror from build - -Remove -Werror from build - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - configure | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,7 @@ if test "$GNU_CC"; then - # Don't allow undefined symbols in libraries - DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,7 @@ EOF - IMPLIB='emximp -o' - FILTER='emxexp -o' - LDFLAGS='-Zmap' -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_DEBUG_FLAGS="-g -fno-inline" - MOZ_OPTIMIZE_FLAGS="-O2" - MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" -@@ -7048,7 +7048,7 @@ else - fi - rm -f conftest* - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_OPTIMIZE_FLAGS="-xO4" - MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Fri, 25 Jul 2008 11:20:02 -0400 -Subject: [PATCH 1/1] Fix security cross compile cpu detection error - -Fix security cross compile cpu detection error. -Reference to bug 376279. - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - security/coreconf/arch.mk | 2 ++ - security/manager/Makefile.in | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk -index fba38ff..28da32e 100644 ---- a/security/coreconf/arch.mk -+++ b/security/coreconf/arch.mk -@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) - # Attempt to differentiate between sparc and x86 Solaris - # - -+ifndef OE_TEST - OS_TEST := $(shell uname -m) -+endif - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in -index 86119f7..86c09ca 100644 ---- a/security/manager/Makefile.in -+++ b/security/manager/Makefile.in -@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ - RC="$(RC) $(RCFLAGS)" \ - OS_ARCH="$(OS_ARCH)" \ - CPU_ARCH="$(TARGET_CPU)" \ -+ OS_TEST="$(TARGET_CPU)" \ - $(NULL) - SKIP_CHK=1 - endif --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler -# ---- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 -+++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 -@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask - /** - * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: - * ARM is a little endian architecture but 64 bit double words are stored - * differently: the 32 bit words are in little endian byte order, the two words - * are stored in big endian`s way. - */ - - #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) --#define CPU_IS_ARM -+#if !defined(__VFP_FP__) -+#define FPU_IS_ARM_FPA -+#endif - #endif - - #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 - /** - * This version of the macros is safe for the alias optimizations - * that gcc does, but uses gcc-specific extensions. - */ - - typedef union txdpun { - PRFloat64 d; - struct { --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - PRUint32 lo, hi; - #else - PRUint32 hi, lo; - #endif - } s; - } txdpun; - - #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) - #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) - - #else // __GNUC__ - - /* We don't know of any non-gcc compilers that perform alias optimization, - * so this code should work. - */ - --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) - #else - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) - #endif - - #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# XPTC_InvokeByIndex crashes -# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) -Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -=================================================================== ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -51,22 +51,32 @@ - #ifdef __ARM_EABI__ - #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) - #define VAR_STACK_SIZE_64 3 - #else - #define DOUBLEWORD_ALIGN(p) (p) - #define VAR_STACK_SIZE_64 2 - #endif - -+#ifdef __ARM_EABI__ -+#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) -+#else -+#define DOUBLEWORD_ALIGN(p) (p) -+#endif -+ - // Remember that these 'words' are 32bit DWORDS - - static PRUint32 - invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) - { - PRUint32 result = 0; -+ -+ /* Note that we give a "worst case" estimate of how much stack _might_ be -+ * needed, rather than the real count - this should be safe */ -+ - for(PRUint32 i = 0; i < paramCount; i++, s++) - { - if(s->IsPtrData()) - { - result++; - continue; - } - switch(s->type) diff --git a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 -@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); - #error "Linux/MIPS pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - --#elif defined(__arm__) --/* ARM/Linux */ -+#elif defined(__arm__) && !defined(__ARM_EABI__) -+/* ARM/Linux (old-ABI) */ - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] - #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) -@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); - #error "ARM/Linux pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - -+#elif defined(__arm__) && defined(__ARM_EABI__) -+/* ARM/Linux (EABI) */ -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] -+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) -+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) -+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) -+#define _MD_SP_TYPE __ptr_t -+#else -+#error "ARM/Linux pre-glibc2 not supported yet" -+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ -+ - #else - - #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.0.1/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.0.1/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.0.1/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# Add atomic operations for ARM. -diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h -index 5b794c5..cb8d58e 100644 ---- a/nsprpub/pr/include/md/_linux.h -+++ b/nsprpub/pr/include/md/_linux.h -@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); - }) - #endif - -+#if defined(__arm__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+ -+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); -+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) -+ -+#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) -+#define _MD_ATOMIC_ADD(ptr, n) \ -+ ({ \ -+ PRInt32 ov, nv; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ nv = ov + (n); \ -+ } \ -+ while (__kernel_cmpxchg(ov, nv, vp)); \ -+ \ -+ nv; \ -+ }) -+#define _MD_ATOMIC_SET(ptr, nv) \ -+ ({ \ -+ PRInt32 ov; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ } \ -+ while (__kernel_cmpxchg(ov, (nv), vp)); \ -+ \ -+ ov; \ -+ }) -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.0.1/configure-wchart.patch b/recipes/mozilla/firefox-3.0.1/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.0.1/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in 2008-04-15 12:56:35.000000000 +0300 -+++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 -@@ -2743,7 +2743,7 @@ - - AC_CACHE_CHECK(for compiler -fshort-wchar option, - ac_cv_have_usable_wchar_option_v2, -- [AC_TRY_LINK([#include <stddef.h> -+ [AC_TRY_COMPILE([#include <stddef.h> - $configure_static_assert_macros], - [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.0.1/jemalloc-tls.patch b/recipes/mozilla/firefox-3.0.1/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.0.1/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 -+++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 -@@ -386,7 +386,7 @@ - #else - # define NO_TLS - #endif --#if 0 -+ - #ifdef __i386__ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 -@@ -420,7 +420,6 @@ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 - #endif --#endif - - #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) - -@@ -2582,7 +2581,7 @@ - * knowledge of how _pthread_self() calculates values, we can't - * easily do much better than this. - */ -- ind = (unsigned long) _pthread_self() % narenas; -+ ind = 255255 % narenas; - - /* - * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.1/linkage-problem.patch b/recipes/mozilla/firefox-3.0.1/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.1/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 -+++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 -@@ -229,6 +229,11 @@ - $(NULL) - endif - -+ifdef MOZ_ENABLE_XFT -+EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ -+ $(NULL) -+endif -+ - ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) - EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ - $(NULL) diff --git a/recipes/mozilla/firefox-3.0.1/mozconfig b/recipes/mozilla/firefox-3.0.1/mozconfig deleted file mode 100644 index 652c780bbd..0000000000 --- a/recipes/mozilla/firefox-3.0.1/mozconfig +++ /dev/null @@ -1,67 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-bz2 -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -#ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul diff --git a/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.1/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.1/security-cross.patch b/recipes/mozilla/firefox-3.0.1/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/recipes/mozilla/firefox-3.0.1/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/recipes/mozilla/firefox-3.0.1/wchart.diff b/recipes/mozilla/firefox-3.0.1/wchart.diff deleted file mode 100644 index 61ef5928d2..0000000000 --- a/recipes/mozilla/firefox-3.0.1/wchart.diff +++ /dev/null @@ -1,5850 +0,0 @@ ---- iceweasel-3.0.1.orig/configure -+++ iceweasel-3.0.1/configure -@@ -1110,7 +1110,7 @@ - MSMANIFEST_TOOL= - - MISSING_X= --for ac_prog in gawk mawk nawk awk -+for ac_prog in mawk gawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -1897,57 +1897,6 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext <<EOF --#line 1911 "configure" --#include "confdefs.h" --#include <stdlib.h> --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#line 1929 "configure" --#include "confdefs.h" --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - - case "$build:$target" in - powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -1961,7 +1910,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1965: checking for $ac_word" >&5 -+echo "configure:1914: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1996,7 +1945,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2000: checking for $ac_word" >&5 -+echo "configure:1949: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2031,7 +1980,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2035: checking for $ac_word" >&5 -+echo "configure:1984: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2072,7 +2021,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2076: checking for $ac_word" >&5 -+echo "configure:2025: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2107,7 +2056,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2111: checking for $ac_word" >&5 -+echo "configure:2060: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2142,7 +2091,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2146: checking for $ac_word" >&5 -+echo "configure:2095: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2180,7 +2129,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2184: checking for $ac_word" >&5 -+echo "configure:2133: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2210,7 +2159,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2214: checking for $ac_word" >&5 -+echo "configure:2163: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2261,7 +2210,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2265: checking for $ac_word" >&5 -+echo "configure:2214: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2293,7 +2242,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2304,12 +2253,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2308 "configure" -+#line 2257 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2335,12 +2284,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2339: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:2344: checking whether we are using GNU C" >&5 -+echo "configure:2293: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2349,7 +2298,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -2368,7 +2317,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2372: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2404,7 +2353,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2408: checking for $ac_word" >&5 -+echo "configure:2357: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2436,7 +2385,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2389: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2447,12 +2396,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2451 "configure" -+#line 2400 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2478,12 +2427,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2482: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:2487: checking whether we are using GNU C++" >&5 -+echo "configure:2436: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2492,7 +2441,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -2511,7 +2460,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2515: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2464: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2542,61 +2491,10 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext <<EOF --#line 2556 "configure" --#include "confdefs.h" --#include <stdlib.h> --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#line 2574 "configure" --#include "confdefs.h" --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2600: checking for $ac_word" >&5 -+echo "configure:2498: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2628,7 +2526,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2632: checking for $ac_word" >&5 -+echo "configure:2530: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2669,7 +2567,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2673: checking for $ac_word" >&5 -+echo "configure:2571: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2704,7 +2602,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2708: checking for $ac_word" >&5 -+echo "configure:2606: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2739,7 +2637,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2743: checking for $ac_word" >&5 -+echo "configure:2641: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2774,7 +2672,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2778: checking for $ac_word" >&5 -+echo "configure:2676: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2907,7 +2805,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2911: checking for $ac_word" >&5 -+echo "configure:2809: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2949,14 +2847,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF --#line 2953 "configure" -+#line 2851 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2974,14 +2872,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 2978 "configure" -+#line 2876 "configure" - #include "confdefs.h" - #include <new.h> - int main() { - unsigned *test = new unsigned(42); - ; return 0; } - EOF --if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -3096,7 +2994,7 @@ - _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` - # Add flags if necessary - echo $ac_n "checking for midl flags""... $ac_c" 1>&6 --echo "configure:3100: checking for midl flags" >&5 -+echo "configure:2998: checking for midl flags" >&5 - if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then - # Starting with MIDL version 6.0.359, the MIDL compiler - # generates /Oicf /robust stubs by default, which is not -@@ -3118,9 +3016,9 @@ - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` - _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` - echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 --echo "configure:3122: checking for w32api version >= $W32API_VERSION" >&5 -+echo "configure:3020: checking for w32api version >= $W32API_VERSION" >&5 - cat > conftest.$ac_ext <<EOF --#line 3124 "configure" -+#line 3022 "configure" - #include "confdefs.h" - #include <w32api.h> - int main() { -@@ -3132,7 +3030,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - res=yes - else -@@ -3148,7 +3046,7 @@ - fi - # Check windres version - echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 --echo "configure:3152: checking for windres version >= $WINDRES_VERSION" >&5 -+echo "configure:3050: checking for windres version >= $WINDRES_VERSION" >&5 - _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` - echo "$ac_t""$_WINDRES_VERSION" 1>&6 - _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` -@@ -3187,10 +3085,10 @@ - if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then - if test "x$CC" != xcc; then - echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 --echo "configure:3191: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:3089: checking whether $CC and cc understand -c and -o together" >&5 - else - echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 --echo "configure:3194: checking whether cc understands -c and -o together" >&5 -+echo "configure:3092: checking whether cc understands -c and -o together" >&5 - fi - set dummy $CC; ac_cc="`echo $2 | - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -3202,16 +3100,16 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' --if { (eval echo configure:3206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:3104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. -- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - ac_try='cc -c conftest.c -o conftest.o 1>&5' -- if { (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - # cc works too. - : -@@ -3247,7 +3145,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3251: checking how to run the C preprocessor" >&5 -+echo "configure:3149: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3262,13 +3160,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 3266 "configure" -+#line 3164 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3279,13 +3177,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 3283 "configure" -+#line 3181 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3296,13 +3194,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 3300 "configure" -+#line 3198 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3327,7 +3225,7 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:3331: checking how to run the C++ preprocessor" >&5 -+echo "configure:3229: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3340,12 +3238,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext <<EOF --#line 3344 "configure" -+#line 3242 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3400,7 +3298,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3404: checking for a BSD compatible install" >&5 -+echo "configure:3302: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3453,7 +3351,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3457: checking whether ln -s works" >&5 -+echo "configure:3355: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3478,7 +3376,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3482: checking for $ac_word" >&5 -+echo "configure:3380: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3519,7 +3417,7 @@ - - if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then - echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 --echo "configure:3523: checking for minimum required perl version >= $PERL_VERSION" >&5 -+echo "configure:3421: checking for minimum required perl version >= $PERL_VERSION" >&5 - _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - echo "$ac_t""$_perl_version" 1>&6 -@@ -3530,7 +3428,7 @@ - fi - - echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 --echo "configure:3534: checking for full perl installation" >&5 -+echo "configure:3432: checking for full perl installation" >&5 - _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - if test "$_perl_res" != 0; then -@@ -3545,7 +3443,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3549: checking for $ac_word" >&5 -+echo "configure:3447: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3590,7 +3488,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3594: checking for $ac_word" >&5 -+echo "configure:3492: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3635,7 +3533,7 @@ - # Extract the first word of "doxygen", so it can be a program name with args. - set dummy doxygen; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3639: checking for $ac_word" >&5 -+echo "configure:3537: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3671,7 +3569,7 @@ - # Extract the first word of "whoami", so it can be a program name with args. - set dummy whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3675: checking for $ac_word" >&5 -+echo "configure:3573: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3707,7 +3605,7 @@ - # Extract the first word of "autoconf", so it can be a program name with args. - set dummy autoconf; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3711: checking for $ac_word" >&5 -+echo "configure:3609: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3743,7 +3641,7 @@ - # Extract the first word of "unzip", so it can be a program name with args. - set dummy unzip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3747: checking for $ac_word" >&5 -+echo "configure:3645: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3781,7 +3679,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3785: checking for $ac_word" >&5 -+echo "configure:3683: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3822,7 +3720,7 @@ - # Extract the first word of "makedepend", so it can be a program name with args. - set dummy makedepend; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3826: checking for $ac_word" >&5 -+echo "configure:3724: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3857,7 +3755,7 @@ - # Extract the first word of "xargs", so it can be a program name with args. - set dummy xargs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3861: checking for $ac_word" >&5 -+echo "configure:3759: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3918,7 +3816,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3922: checking for $ac_word" >&5 -+echo "configure:3820: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3968,7 +3866,7 @@ - # Extract the first word of "sdp", so it can be a program name with args. - set dummy sdp; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3972: checking for $ac_word" >&5 -+echo "configure:3870: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4089,7 +3987,7 @@ - - - echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 --echo "configure:4093: checking for valid compiler/Mac OS X SDK combination" >&5 -+echo "configure:3991: checking for valid compiler/Mac OS X SDK combination" >&5 - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -4098,7 +3996,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 4102 "configure" -+#line 4000 "configure" - #include "confdefs.h" - #include <new> - int main() { return 0; } -@@ -4106,7 +4004,7 @@ - result=yes - ; return 0; } - EOF --if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result=no - else -@@ -4137,7 +4035,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4141: checking for $ac_word" >&5 -+echo "configure:4039: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4180,7 +4078,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4184: checking for $ac_word" >&5 -+echo "configure:4082: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4248,7 +4146,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:4252: checking for X" >&5 -+echo "configure:4150: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -4310,12 +4208,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext <<EOF --#line 4314 "configure" -+#line 4212 "configure" - #include "confdefs.h" - #include <$x_direct_test_include> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4384,14 +4282,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4388 "configure" -+#line 4286 "configure" - #include "confdefs.h" - - int main() { - ${x_direct_test_function}() - ; return 0; } - EOF --if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -4497,17 +4395,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:4501: checking whether -R must be followed by a space" >&5 -+echo "configure:4399: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <<EOF --#line 4504 "configure" -+#line 4402 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -4523,14 +4421,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <<EOF --#line 4527 "configure" -+#line 4425 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -4562,7 +4460,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:4566: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:4464: checking for dnet_ntoa in -ldnet" >&5 - ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4570,7 +4468,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4574 "configure" -+#line 4472 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4581,7 +4479,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4603,7 +4501,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:4607: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:4505: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4611,7 +4509,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4615 "configure" -+#line 4513 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4622,7 +4520,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4651,12 +4549,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4655: checking for gethostbyname" >&5 -+echo "configure:4553: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4660 "configure" -+#line 4558 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ -@@ -4679,7 +4577,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -4700,7 +4598,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4704: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4602: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4708,7 +4606,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4712 "configure" -+#line 4610 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4719,7 +4617,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4749,12 +4647,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4753: checking for connect" >&5 -+echo "configure:4651: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4758 "configure" -+#line 4656 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ -@@ -4777,7 +4675,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -4798,7 +4696,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4802: checking for connect in -lsocket" >&5 -+echo "configure:4700: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4806,7 +4704,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4810 "configure" -+#line 4708 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4817,7 +4715,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4841,12 +4739,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:4845: checking for remove" >&5 -+echo "configure:4743: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4850 "configure" -+#line 4748 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ -@@ -4869,7 +4767,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" - else -@@ -4890,7 +4788,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:4894: checking for remove in -lposix" >&5 -+echo "configure:4792: checking for remove in -lposix" >&5 - ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4898,7 +4796,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4902 "configure" -+#line 4800 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4909,7 +4807,7 @@ - remove() - ; return 0; } - EOF --if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4933,12 +4831,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:4937: checking for shmat" >&5 -+echo "configure:4835: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4942 "configure" -+#line 4840 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ -@@ -4961,7 +4859,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" - else -@@ -4982,7 +4880,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:4986: checking for shmat in -lipc" >&5 -+echo "configure:4884: checking for shmat in -lipc" >&5 - ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4990,7 +4888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4994 "configure" -+#line 4892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5001,7 +4899,7 @@ - shmat() - ; return 0; } - EOF --if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5034,7 +4932,7 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:5038: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:4936: checking for IceConnectionNumber in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5042,7 +4940,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5046 "configure" -+#line 4944 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5053,7 +4951,7 @@ - IceConnectionNumber() - ; return 0; } - EOF --if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5521,7 +5419,7 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:5525: checking whether ld has archive extraction flags" >&5 -+echo "configure:5423: checking whether ld has archive extraction flags" >&5 - if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5538,14 +5436,14 @@ - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <<EOF --#line 5542 "configure" -+#line 5440 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_mkshlib_force_and_unforce=$line; break - else -@@ -5578,7 +5476,7 @@ - ' - - echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:5582: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:5480: checking that static assertion macros used in autoconf tests work" >&5 - if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5592,14 +5490,14 @@ - - ac_cv_static_assertion_macros_work="yes" - cat > conftest.$ac_ext <<EOF --#line 5596 "configure" -+#line 5494 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:5603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5609,14 +5507,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 5613 "configure" -+#line 5511 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5632,14 +5530,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 5636 "configure" -+#line 5534 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:5643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5649,14 +5547,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 5653 "configure" -+#line 5551 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5691,16 +5589,16 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5695: checking for 64-bit OS" >&5 -+echo "configure:5593: checking for 64-bit OS" >&5 - cat > conftest.$ac_ext <<EOF --#line 5697 "configure" -+#line 5595 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(long) == 8) - ; return 0; } - EOF --if { (eval echo configure:5704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -5873,9 +5771,9 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 --echo "configure:5877: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5775: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 - cat > conftest.$ac_ext <<EOF --#line 5879 "configure" -+#line 5777 "configure" - #include "confdefs.h" - - int main() { -@@ -5884,7 +5782,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:5888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -5922,17 +5820,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5926: checking for $ac_hdr" >&5 -+echo "configure:5824: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5931 "configure" -+#line 5829 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5974,7 +5872,7 @@ - LIBS="$LIBS -lbe" - if test "$COMPILE_ENVIRONMENT"; then - echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5978: checking for main in -lbind" >&5 -+echo "configure:5876: checking for main in -lbind" >&5 - ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5982,14 +5880,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5986 "configure" -+#line 5884 "configure" - #include "confdefs.h" - - int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6010,7 +5908,7 @@ - fi - - echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:6014: checking for main in -lzeta" >&5 -+echo "configure:5912: checking for main in -lzeta" >&5 - ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6018,14 +5916,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lzeta $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6022 "configure" -+#line 5920 "configure" - #include "confdefs.h" - - int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6094,18 +5992,18 @@ - MACOSX=1 - - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:6098: checking for -dead_strip option to ld" >&5 -+echo "configure:5996: checking for -dead_strip option to ld" >&5 - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-dead_strip" - cat > conftest.$ac_ext <<EOF --#line 6102 "configure" -+#line 6000 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -6630,17 +6528,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6634: checking for $ac_hdr" >&5 -+echo "configure:6532: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6639 "configure" -+#line 6537 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6679,17 +6577,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6683: checking for $ac_hdr" >&5 -+echo "configure:6581: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6688 "configure" -+#line 6586 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6935,19 +6833,19 @@ - _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" - - echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 --echo "configure:6939: checking for __declspec(dllexport)" >&5 -+echo "configure:6837: checking for __declspec(dllexport)" >&5 - if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6944 "configure" -+#line 6842 "configure" - #include "confdefs.h" - __declspec(dllexport) void ac_os2_declspec(void) {} - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_os2_declspec="yes" - else -@@ -7133,14 +7031,14 @@ - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" - cat > conftest.$ac_ext <<EOF --#line 7137 "configure" -+#line 7035 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -7169,7 +7067,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 }'` - echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 --echo "configure:7173: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:7071: checking for Forte compiler version >= WS6U2" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -7179,7 +7077,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 7183 "configure" -+#line 7081 "configure" - #include "confdefs.h" - - int main() { -@@ -7188,7 +7086,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:7192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -7339,12 +7237,12 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:7343: checking for ANSI C header files" >&5 -+echo "configure:7241: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7348 "configure" -+#line 7246 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -7352,7 +7250,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7369,7 +7267,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 7373 "configure" -+#line 7271 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -7387,7 +7285,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 7391 "configure" -+#line 7289 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -7408,7 +7306,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 7412 "configure" -+#line 7310 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7419,7 +7317,7 @@ - exit (0); } - - EOF --if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -7443,12 +7341,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:7447: checking for working const" >&5 -+echo "configure:7345: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7452 "configure" -+#line 7350 "configure" - #include "confdefs.h" - - int main() { -@@ -7497,7 +7395,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -7518,12 +7416,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7522: checking for mode_t" >&5 -+echo "configure:7420: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7527 "configure" -+#line 7425 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7551,12 +7449,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7555: checking for off_t" >&5 -+echo "configure:7453: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7560 "configure" -+#line 7458 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7584,12 +7482,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7588: checking for pid_t" >&5 -+echo "configure:7486: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7593 "configure" -+#line 7491 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7617,12 +7515,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7621: checking for size_t" >&5 -+echo "configure:7519: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7626 "configure" -+#line 7524 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7650,12 +7548,12 @@ - fi - - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7654: checking for st_blksize in struct stat" >&5 -+echo "configure:7552: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7659 "configure" -+#line 7557 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -7663,7 +7561,7 @@ - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -7684,12 +7582,12 @@ - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7688: checking for siginfo_t" >&5 -+echo "configure:7586: checking for siginfo_t" >&5 - if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7693 "configure" -+#line 7591 "configure" - #include "confdefs.h" - #define _POSIX_C_SOURCE 199506L - #include <signal.h> -@@ -7697,7 +7595,7 @@ - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -7731,12 +7629,12 @@ - fi - - echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7735: checking for int16_t" >&5 -+echo "configure:7633: checking for int16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7740 "configure" -+#line 7638 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7744,7 +7642,7 @@ - int16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int16_t=true - else -@@ -7766,12 +7664,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7770: checking for int32_t" >&5 -+echo "configure:7668: checking for int32_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7775 "configure" -+#line 7673 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7779,7 +7677,7 @@ - int32_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int32_t=true - else -@@ -7801,12 +7699,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7805: checking for int64_t" >&5 -+echo "configure:7703: checking for int64_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7810 "configure" -+#line 7708 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7814,7 +7712,7 @@ - int64_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64_t=true - else -@@ -7836,12 +7734,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7840: checking for int64" >&5 -+echo "configure:7738: checking for int64" >&5 - if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7845 "configure" -+#line 7743 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7849,7 +7747,7 @@ - int64 foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64=true - else -@@ -7871,12 +7769,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7875: checking for uint" >&5 -+echo "configure:7773: checking for uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7880 "configure" -+#line 7778 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7884,7 +7782,7 @@ - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -7906,12 +7804,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7910: checking for uint_t" >&5 -+echo "configure:7808: checking for uint_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7915 "configure" -+#line 7813 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7919,7 +7817,7 @@ - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -7941,12 +7839,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7945: checking for uint16_t" >&5 -+echo "configure:7843: checking for uint16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7950 "configure" -+#line 7848 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -7954,7 +7852,7 @@ - uint16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint16_t=true - else -@@ -7985,12 +7883,12 @@ - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7989: checking for uname.domainname" >&5 -+echo "configure:7887: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7994 "configure" -+#line 7892 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -7998,7 +7896,7 @@ - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:8002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -8022,12 +7920,12 @@ - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:8026: checking for uname.__domainname" >&5 -+echo "configure:7924: checking for uname.__domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8031 "configure" -+#line 7929 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -8035,7 +7933,7 @@ - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:8039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -8068,12 +7966,12 @@ - - - echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:8072: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7970: checking for usable wchar_t (2 bytes, unsigned)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8077 "configure" -+#line 7975 "configure" - #include "confdefs.h" - #include <stddef.h> - $configure_static_assert_macros -@@ -8082,7 +7980,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:8086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_v2="yes" - else -@@ -8101,7 +7999,7 @@ - EOF - - HAVE_CPP_2BYTE_WCHAR_T=1 --else -+elif false; then - - - ac_ext=C -@@ -8115,12 +8013,12 @@ - CXXFLAGS="$CXXFLAGS -fshort-wchar" - - echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:8119: checking for compiler -fshort-wchar option" >&5 -+echo "configure:8017: checking for compiler -fshort-wchar option" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8124 "configure" -+#line 8022 "configure" - #include "confdefs.h" - #include <stddef.h> - $configure_static_assert_macros -@@ -8129,7 +8027,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:8133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_option_v2="yes" - else -@@ -8163,7 +8061,7 @@ - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:8167: checking for visibility(hidden) attribute" >&5 -+echo "configure:8065: checking for visibility(hidden) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8188,7 +8086,7 @@ - - - echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:8192: checking for visibility(default) attribute" >&5 -+echo "configure:8090: checking for visibility(default) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8213,7 +8111,7 @@ - - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:8217: checking for visibility pragma support" >&5 -+echo "configure:8115: checking for visibility pragma support" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8238,7 +8136,7 @@ - echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 - if test "$ac_cv_visibility_pragma" = "yes"; then - echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 --echo "configure:8242: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:8140: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8266,7 +8164,7 @@ - echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 - - echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 --echo "configure:8270: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:8168: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8314,12 +8212,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:8318: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:8216: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8323 "configure" -+#line 8221 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -8327,7 +8225,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:8331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -8352,7 +8250,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:8356: checking for opendir in -ldir" >&5 -+echo "configure:8254: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8360,7 +8258,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8364 "configure" -+#line 8262 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8371,7 +8269,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:8375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8393,7 +8291,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:8397: checking for opendir in -lx" >&5 -+echo "configure:8295: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8401,7 +8299,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8405 "configure" -+#line 8303 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8412,7 +8310,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:8416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8444,17 +8342,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8448: checking for $ac_hdr" >&5 -+echo "configure:8346: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8453 "configure" -+#line 8351 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8484,17 +8382,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8488: checking for $ac_hdr" >&5 -+echo "configure:8386: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8493 "configure" -+#line 8391 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8524,17 +8422,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8528: checking for $ac_hdr" >&5 -+echo "configure:8426: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8533 "configure" -+#line 8431 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8564,17 +8462,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8568: checking for $ac_hdr" >&5 -+echo "configure:8466: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8573 "configure" -+#line 8471 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8604,17 +8502,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8608: checking for $ac_hdr" >&5 -+echo "configure:8506: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8613 "configure" -+#line 8511 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8645,17 +8543,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8649: checking for $ac_hdr" >&5 -+echo "configure:8547: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8654 "configure" -+#line 8552 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8686,17 +8584,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8690: checking for $ac_hdr" >&5 -+echo "configure:8588: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8695 "configure" -+#line 8593 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8733,17 +8631,17 @@ - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8737: checking for new" >&5 -+echo "configure:8635: checking for new" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8742 "configure" -+#line 8640 "configure" - #include "confdefs.h" - #include <new> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8785,17 +8683,17 @@ - if test "x$enable_dtrace" = "xyes"; then - ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 --echo "configure:8789: checking for sys/sdt.h" >&5 -+echo "configure:8687: checking for sys/sdt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8794 "configure" -+#line 8692 "configure" - #include "confdefs.h" - #include <sys/sdt.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8835,17 +8733,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8839: checking for $ac_hdr" >&5 -+echo "configure:8737: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8844 "configure" -+#line 8742 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8879,7 +8777,7 @@ - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8883: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8781: checking for gethostbyname_r in -lc_r" >&5 - ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8887,7 +8785,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8891 "configure" -+#line 8789 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8898,7 +8796,7 @@ - gethostbyname_r() - ; return 0; } - EOF --if { (eval echo configure:8902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8935,7 +8833,7 @@ - ;; - *) - echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8939: checking for atan in -lm" >&5 -+echo "configure:8837: checking for atan in -lm" >&5 - ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8943,7 +8841,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8947 "configure" -+#line 8845 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8954,7 +8852,7 @@ - atan() - ; return 0; } - EOF --if { (eval echo configure:8958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8982,7 +8880,7 @@ - fi - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8986: checking for dlopen in -ldl" >&5 -+echo "configure:8884: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8990,7 +8888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8994 "configure" -+#line 8892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9001,7 +8899,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9018,17 +8916,17 @@ - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:9022: checking for dlfcn.h" >&5 -+echo "configure:8920: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9027 "configure" -+#line 8925 "configure" - #include "confdefs.h" - #include <dlfcn.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9065,12 +8963,12 @@ - for ac_func in dladdr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9069: checking for $ac_func" >&5 -+echo "configure:8967: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9074 "configure" -+#line 8972 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -9093,7 +8991,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -9124,7 +9022,7 @@ - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:9128: checking for demangle in -lC_r" >&5 -+echo "configure:9026: checking for demangle in -lC_r" >&5 - ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9132,7 +9030,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9136 "configure" -+#line 9034 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9143,7 +9041,7 @@ - demangle() - ; return 0; } - EOF --if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9173,7 +9071,7 @@ - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:9177: checking for demangle in -lC" >&5 -+echo "configure:9075: checking for demangle in -lC" >&5 - ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9181,7 +9079,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9185 "configure" -+#line 9083 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9192,7 +9090,7 @@ - demangle() - ; return 0; } - EOF --if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9223,7 +9121,7 @@ - esac - fi - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:9227: checking for socket in -lsocket" >&5 -+echo "configure:9125: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9231,7 +9129,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9235 "configure" -+#line 9133 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9242,7 +9140,7 @@ - socket() - ; return 0; } - EOF --if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9287,7 +9185,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:9291: checking for XDrawLines in -lX11" >&5 -+echo "configure:9189: checking for XDrawLines in -lX11" >&5 - ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9295,7 +9193,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9299 "configure" -+#line 9197 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9306,7 +9204,7 @@ - XDrawLines() - ; return 0; } - EOF --if { (eval echo configure:9310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9328,7 +9226,7 @@ - fi - - echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:9332: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:9230: checking for XextAddDisplay in -lXext" >&5 - ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9336,7 +9234,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9340 "configure" -+#line 9238 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9347,7 +9245,7 @@ - XextAddDisplay() - ; return 0; } - EOF --if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9371,7 +9269,7 @@ - - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9375: checking for XtFree in -lXt" >&5 -+echo "configure:9273: checking for XtFree in -lXt" >&5 - ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9379,7 +9277,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9383 "configure" -+#line 9281 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9390,7 +9288,7 @@ - XtFree() - ; return 0; } - EOF --if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9411,7 +9309,7 @@ - - unset ac_cv_lib_Xt_XtFree - echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:9415: checking for IceFlush in -lICE" >&5 -+echo "configure:9313: checking for IceFlush in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9419,7 +9317,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9423 "configure" -+#line 9321 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9430,7 +9328,7 @@ - IceFlush() - ; return 0; } - EOF --if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9451,7 +9349,7 @@ - fi - - echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:9455: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:9353: checking for SmcCloseConnection in -lSM" >&5 - ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9459,7 +9357,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lSM $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9463 "configure" -+#line 9361 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9470,7 +9368,7 @@ - SmcCloseConnection() - ; return 0; } - EOF --if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9491,7 +9389,7 @@ - fi - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9495: checking for XtFree in -lXt" >&5 -+echo "configure:9393: checking for XtFree in -lXt" >&5 - ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9499,7 +9397,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9503 "configure" -+#line 9401 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9510,7 +9408,7 @@ - XtFree() - ; return 0; } - EOF --if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9544,7 +9442,7 @@ - esac - - echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:9548: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9446: checking for XShmCreateImage in -lXext" >&5 - ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9552,7 +9450,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9556 "configure" -+#line 9454 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9563,7 +9461,7 @@ - XShmCreateImage() - ; return 0; } - EOF --if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9585,17 +9483,17 @@ - - ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 --echo "configure:9589: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9487: checking for X11/extensions/XShm.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9594 "configure" -+#line 9492 "configure" - #include "confdefs.h" - #include <X11/extensions/XShm.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9625,7 +9523,7 @@ - fi - - echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9629: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9527: checking for XieFloGeometry in -lXIE" >&5 - ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9633,7 +9531,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9637 "configure" -+#line 9535 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9644,7 +9542,7 @@ - XieFloGeometry() - ; return 0; } - EOF --if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9666,17 +9564,17 @@ - - ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 --echo "configure:9670: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9568: checking for X11/extensions/XIElib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9675 "configure" -+#line 9573 "configure" - #include "confdefs.h" - #include <X11/extensions/XIElib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -9750,7 +9648,7 @@ - # Extract the first word of "freetype-config", so it can be a program name with args. - set dummy freetype-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9754: checking for $ac_word" >&5 -+echo "configure:9652: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9786,7 +9684,7 @@ - - min_ft_version=6.1.0 - echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9790: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9688: checking for FreeType - version >= $min_ft_version" >&5 - no_ft="" - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes -@@ -9834,7 +9732,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 9838 "configure" -+#line 9736 "configure" - #include "confdefs.h" - - #include <ft2build.h> -@@ -9860,7 +9758,7 @@ - } - - EOF --if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -9910,12 +9808,12 @@ - CFLAGS="$CFLAGS $FT2_CFLAGS" - - echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6 --echo "configure:9914: checking for FT_Bitmap_Size.y_ppem" >&5 -+echo "configure:9812: checking for FT_Bitmap_Size.y_ppem" >&5 - if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9919 "configure" -+#line 9817 "configure" - #include "confdefs.h" - #include <ft2build.h> - #include FT_FREETYPE_H -@@ -9925,7 +9823,7 @@ - return 1 - ; return 0; } - EOF --if { (eval echo configure:9929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_member_FT_Bitmap_Size_y_ppem=yes - else -@@ -9951,12 +9849,12 @@ - for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9955: checking for $ac_func" >&5 -+echo "configure:9853: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9960 "configure" -+#line 9858 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -9979,7 +9877,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10022,7 +9920,7 @@ - *) - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:10026: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9924: checking for pthread_create in -lpthreads" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10045,7 +9943,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:10049: checking for pthread_create in -lpthread" >&5 -+echo "configure:9947: checking for pthread_create in -lpthread" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10068,7 +9966,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:10072: checking for pthread_create in -lc_r" >&5 -+echo "configure:9970: checking for pthread_create in -lc_r" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10091,7 +9989,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:10095: checking for pthread_create in -lc" >&5 -+echo "configure:9993: checking for pthread_create in -lc" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10150,7 +10048,7 @@ - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:10154: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:10052: checking whether ${CC-cc} accepts -pthread" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -10173,7 +10071,7 @@ - ac_cv_have_dash_pthreads=no - if test "$ac_cv_have_dash_pthread" = "no"; then - echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 --echo "configure:10177: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:10075: checking whether ${CC-cc} accepts -pthreads" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -10268,7 +10166,7 @@ - fi - - echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:10272: checking whether mmap() sees write()s" >&5 -+echo "configure:10170: checking whether mmap() sees write()s" >&5 - - - mmap_test_prog=' -@@ -10307,11 +10205,11 @@ - result="yes" - else - cat > conftest.$ac_ext <<EOF --#line 10311 "configure" -+#line 10209 "configure" - #include "confdefs.h" - $mmap_test_prog - EOF --if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -10336,13 +10234,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:10340: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:10238: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF --#line 10346 "configure" -+#line 10244 "configure" - #include "confdefs.h" - #include <sgtty.h> - Autoconf TIOCGETP -@@ -10360,7 +10258,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF --#line 10364 "configure" -+#line 10262 "configure" - #include "confdefs.h" - #include <termio.h> - Autoconf TCGETA -@@ -10382,7 +10280,7 @@ - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:10386: checking for 8-bit clean memcmp" >&5 -+echo "configure:10284: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10390,7 +10288,7 @@ - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <<EOF --#line 10394 "configure" -+#line 10292 "configure" - #include "confdefs.h" - - main() -@@ -10400,7 +10298,7 @@ - } - - EOF --if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -10420,12 +10318,12 @@ - for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10424: checking for $ac_func" >&5 -+echo "configure:10322: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10429 "configure" -+#line 10327 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10448,7 +10346,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10475,12 +10373,12 @@ - for ac_func in flockfile getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10479: checking for $ac_func" >&5 -+echo "configure:10377: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10484 "configure" -+#line 10382 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10503,7 +10401,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10532,12 +10430,12 @@ - for ac_func in localtime_r strtok_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10536: checking for $ac_func" >&5 -+echo "configure:10434: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10541 "configure" -+#line 10439 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10560,7 +10458,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10596,19 +10494,19 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:10600: checking for wcrtomb" >&5 -+echo "configure:10498: checking for wcrtomb" >&5 - if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10605 "configure" -+#line 10503 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};wcrtomb(0,'f',&ps); - ; return 0; } - EOF --if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -10628,19 +10526,19 @@ - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:10632: checking for mbrtowc" >&5 -+echo "configure:10530: checking for mbrtowc" >&5 - if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10637 "configure" -+#line 10535 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};mbrtowc(0,0,0,&ps); - ; return 0; } - EOF --if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -10669,12 +10567,12 @@ - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:10673: checking for res_ninit()" >&5 -+echo "configure:10571: checking for res_ninit()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10678 "configure" -+#line 10576 "configure" - #include "confdefs.h" - - #ifdef linux -@@ -10686,7 +10584,7 @@ - int foo = res_ninit(&_res); - ; return 0; } - EOF --if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_res_ninit=yes - else -@@ -10716,12 +10614,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10720: checking for gnu_get_libc_version()" >&5 -+echo "configure:10618: checking for gnu_get_libc_version()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10725 "configure" -+#line 10623 "configure" - #include "confdefs.h" - - #ifdef HAVE_GNU_LIBC_VERSION_H -@@ -10732,7 +10630,7 @@ - const char *glibc_version = gnu_get_libc_version(); - ; return 0; } - EOF --if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_gnu_get_libc_version=yes - else -@@ -10761,7 +10659,7 @@ - *) - - echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10765: checking for iconv in -lc" >&5 -+echo "configure:10663: checking for iconv in -lc" >&5 - ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10769,7 +10667,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10773 "configure" -+#line 10671 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10783,7 +10681,7 @@ - iconv() - ; return 0; } - EOF --if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10802,7 +10700,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10806: checking for iconv in -liconv" >&5 -+echo "configure:10704: checking for iconv in -liconv" >&5 - ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10810,7 +10708,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10814 "configure" -+#line 10712 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10824,7 +10722,7 @@ - iconv() - ; return 0; } - EOF --if { (eval echo configure:10828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10843,7 +10741,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10847: checking for libiconv in -liconv" >&5 -+echo "configure:10745: checking for libiconv in -liconv" >&5 - ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10851,7 +10749,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10855 "configure" -+#line 10753 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -10865,7 +10763,7 @@ - libiconv() - ; return 0; } - EOF --if { (eval echo configure:10869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10892,12 +10790,12 @@ - _SAVE_LIBS=$LIBS - LIBS="$LIBS $_ICONV_LIBS" - echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10896: checking for iconv()" >&5 -+echo "configure:10794: checking for iconv()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10901 "configure" -+#line 10799 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -10911,7 +10809,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_iconv=yes - else -@@ -10935,12 +10833,12 @@ - LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" - LIBICONV="$_ICONV_LIBS" - echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 --echo "configure:10939: checking for iconv() with const input" >&5 -+echo "configure:10837: checking for iconv() with const input" >&5 - if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10944 "configure" -+#line 10842 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -10955,7 +10853,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_const_iconv=yes - else -@@ -10984,19 +10882,19 @@ - - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10988: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10886: checking for nl_langinfo and CODESET" >&5 - if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10993 "configure" -+#line 10891 "configure" - #include "confdefs.h" - #include <langinfo.h> - int main() { - char* cs = nl_langinfo(CODESET); - ; return 0; } - EOF --if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes - else -@@ -11028,7 +10926,7 @@ - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:11032: checking for an implementation of va_copy()" >&5 -+echo "configure:10930: checking for an implementation of va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11038,7 +10936,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11042 "configure" -+#line 10940 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11052,7 +10950,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_copy=yes - else -@@ -11069,7 +10967,7 @@ - - echo "$ac_t""$ac_cv_va_copy" 1>&6 - echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 --echo "configure:11073: checking for an implementation of __va_copy()" >&5 -+echo "configure:10971: checking for an implementation of __va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11079,7 +10977,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11083 "configure" -+#line 10981 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11093,7 +10991,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv___va_copy=yes - else -@@ -11110,7 +11008,7 @@ - - echo "$ac_t""$ac_cv___va_copy" 1>&6 - echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 --echo "configure:11114: checking whether va_lists can be copied by value" >&5 -+echo "configure:11012: checking whether va_lists can be copied by value" >&5 - if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11120,7 +11018,7 @@ - - else - cat > conftest.$ac_ext <<EOF --#line 11124 "configure" -+#line 11022 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11134,7 +11032,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_val_copy=yes - else -@@ -11233,7 +11131,7 @@ - if test "$GNU_CXX"; then - - echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:11237: checking for C++ exceptions flag" >&5 -+echo "configure:11135: checking for C++ exceptions flag" >&5 - - if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -11268,12 +11166,12 @@ - HAVE_GCC3_ABI= - if test "$GNU_CC"; then - echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:11272: checking for gcc 3.0 ABI" >&5 -+echo "configure:11170: checking for gcc 3.0 ABI" >&5 - if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11277 "configure" -+#line 11175 "configure" - #include "confdefs.h" - - int main() { -@@ -11286,7 +11184,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_three_abi="yes" - else -@@ -11310,12 +11208,12 @@ - - - echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:11314: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:11212: checking for C++ \"explicit\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11319 "configure" -+#line 11217 "configure" - #include "confdefs.h" - class X { - public: explicit X(int i) : i_(i) {} -@@ -11325,7 +11223,7 @@ - X x(3); - ; return 0; } - EOF --if { (eval echo configure:11329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_explicit=yes - else -@@ -11346,12 +11244,12 @@ - fi - - echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:11350: checking for C++ \"typename\" keyword" >&5 -+echo "configure:11248: checking for C++ \"typename\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11355 "configure" -+#line 11253 "configure" - #include "confdefs.h" - class param { - public: -@@ -11370,7 +11268,7 @@ - A.foo(0); - ; return 0; } - EOF --if { (eval echo configure:11374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_typename=yes - else -@@ -11391,12 +11289,12 @@ - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:11395: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:11293: checking for modern C++ template specialization syntax support" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11400 "configure" -+#line 11298 "configure" - #include "confdefs.h" - template <class T> struct X { int a; }; - class Y {}; -@@ -11406,7 +11304,7 @@ - X<Y> y_x; - ; return 0; } - EOF --if { (eval echo configure:11410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -11428,12 +11326,12 @@ - - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11432: checking whether partial template specialization works" >&5 -+echo "configure:11330: checking whether partial template specialization works" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11437 "configure" -+#line 11335 "configure" - #include "confdefs.h" - template <class T> class Foo {}; - template <class T> class Foo<T*> {}; -@@ -11441,7 +11339,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -11462,12 +11360,12 @@ - fi - - echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:11466: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:11364: checking whether operators must be re-defined for templates derived from templates" >&5 - if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11471 "configure" -+#line 11369 "configure" - #include "confdefs.h" - template <class T> class Base { }; - template <class T> -@@ -11479,7 +11377,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_derived_template_operators=no - else -@@ -11501,12 +11399,12 @@ - - - echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 --echo "configure:11505: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11403: checking whether we need to cast a derived template to pass as its base class" >&5 - if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11510 "configure" -+#line 11408 "configure" - #include "confdefs.h" - template <class T> class Base { }; - template <class T> class Derived : public Base<T> { }; -@@ -11515,7 +11413,7 @@ - Derived<char> bar; return foo(bar); - ; return 0; } - EOF --if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_cpp_template_cast_to_base=no - else -@@ -11536,12 +11434,12 @@ - fi - - echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:11540: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11438: checking whether the compiler can resolve const ambiguities for templates" >&5 - if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11545 "configure" -+#line 11443 "configure" - #include "confdefs.h" - - template <class T> class ptrClass { -@@ -11562,7 +11460,7 @@ - a(&i); - ; return 0; } - EOF --if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_can_resolve_const_ambiguity=yes - else -@@ -11584,12 +11482,12 @@ - - - echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:11588: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11486: checking whether the C++ \"using\" keyword can change access" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11593 "configure" -+#line 11491 "configure" - #include "confdefs.h" - class A { protected: int foo() { return 0; } }; - class B : public A { public: using A::foo; }; -@@ -11597,10 +11495,10 @@ - B b; return b.foo(); - ; return 0; } - EOF --if { (eval echo configure:11601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat > conftest.$ac_ext <<EOF --#line 11604 "configure" -+#line 11502 "configure" - #include "confdefs.h" - class A { public: int foo() { return 1; } }; - class B : public A { private: using A::foo; }; -@@ -11608,7 +11506,7 @@ - B b; return b.foo(); - ; return 0; } - EOF --if { (eval echo configure:11612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_access_changing_using2=no - else -@@ -11636,12 +11534,12 @@ - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11640: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11538: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11645 "configure" -+#line 11543 "configure" - #include "confdefs.h" - class X { - public: int go(const X&) {return 3;} -@@ -11657,7 +11555,7 @@ - X x; Y y; y.jo(x); - ; return 0; } - EOF --if { (eval echo configure:11661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -11678,19 +11576,19 @@ - fi - - echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:11682: checking for \"std::\" namespace" >&5 -+echo "configure:11580: checking for \"std::\" namespace" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11687 "configure" -+#line 11585 "configure" - #include "confdefs.h" - #include <algorithm> - int main() { - return std::min(0, 1); - ; return 0; } - EOF --if { (eval echo configure:11694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_namespace_std=yes - else -@@ -11711,12 +11609,12 @@ - fi - - echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11715: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11613: checking whether standard template operator!=() is ambiguous" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11720 "configure" -+#line 11618 "configure" - #include "confdefs.h" - #include <algorithm> - struct T1 {}; -@@ -11726,7 +11624,7 @@ - T1 a,b; return a != b; - ; return 0; } - EOF --if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_unambiguous_std_notequal=unambiguous - else -@@ -11748,12 +11646,12 @@ - - - echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11752: checking for C++ reinterpret_cast" >&5 -+echo "configure:11650: checking for C++ reinterpret_cast" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11757 "configure" -+#line 11655 "configure" - #include "confdefs.h" - struct X { int i; }; - struct Y { int i; }; -@@ -11761,7 +11659,7 @@ - X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z); - ; return 0; } - EOF --if { (eval echo configure:11765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_reinterpret_cast=yes - else -@@ -11782,7 +11680,7 @@ - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11786: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11684: checking for C++ dynamic_cast to void*" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11790,8 +11688,11 @@ - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <<EOF --#line 11794 "configure" -+#line 11692 "configure" - #include "confdefs.h" -+#ifdef __cplusplus -+extern "C" void exit(int); -+#endif - class X { int i; public: virtual ~X() { } }; - class Y { int j; public: virtual ~Y() { } }; - class Z : public X, public Y { int k; }; -@@ -11806,7 +11707,7 @@ - ((void*)&mdo == dynamic_cast<void*>(suby)))); - } - EOF --if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_cpp_dynamic_cast_void_ptr=yes - else -@@ -11830,19 +11731,19 @@ - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11834: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11735: checking whether C++ requires implementation of unused virtual methods" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11839 "configure" -+#line 11740 "configure" - #include "confdefs.h" - class X {private: virtual void never_called();}; - int main() { - X x; - ; return 0; } - EOF --if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_cpp_unused_required=no - else -@@ -11865,12 +11766,12 @@ - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11869: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11770: checking for trouble comparing to zero near std::operator!=()" >&5 - if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11874 "configure" -+#line 11775 "configure" - #include "confdefs.h" - #include <algorithm> - template <class T> class Foo {}; -@@ -11881,7 +11782,7 @@ - Foo<int> f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -11913,19 +11814,19 @@ - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11917: checking for LC_MESSAGES" >&5 -+echo "configure:11818: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11922 "configure" -+#line 11823 "configure" - #include "confdefs.h" - #include <locale.h> - int main() { - int category = LC_MESSAGES; - ; return 0; } - EOF --if { (eval echo configure:11929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -12028,7 +11929,7 @@ - # Extract the first word of "nspr-config", so it can be a program name with args. - set dummy nspr-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12032: checking for $ac_word" >&5 -+echo "configure:11933: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12063,7 +11964,7 @@ - - min_nspr_version=4.7.0 - echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 --echo "configure:12067: checking for NSPR - version >= $min_nspr_version" >&5 -+echo "configure:11968: checking for NSPR - version >= $min_nspr_version" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" = "no"; then -@@ -12114,7 +12015,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $NSPR_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 12118 "configure" -+#line 12019 "configure" - #include "confdefs.h" - #include "prlog.h" - int main() { -@@ -12123,7 +12024,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_NSPR=1 - else -@@ -12135,6 +12036,10 @@ - rm -f conftest* - CFLAGS=$_SAVE_CFLAGS - else -+ if test -n "$LIBXUL_SDK"; then -+ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" -+ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" -+ else - NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' - # explicitly set libs for Visual Age C++ for OS/2 - if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then -@@ -12152,6 +12057,7 @@ - else - NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' - fi -+ fi - fi - - -@@ -12205,7 +12111,7 @@ - # Extract the first word of "nss-config", so it can be a program name with args. - set dummy nss-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12209: checking for $ac_word" >&5 -+echo "configure:12115: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12240,7 +12146,7 @@ - - min_nss_version=3.12.0 - echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 --echo "configure:12244: checking for NSS - version >= $min_nss_version" >&5 -+echo "configure:12150: checking for NSS - version >= $min_nss_version" >&5 - - no_nss="" - if test "$NSS_CONFIG" = "no"; then -@@ -12331,7 +12237,7 @@ - SYSTEM_JPEG= - else - echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:12335: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:12241: checking for jpeg_destroy_compress in -ljpeg" >&5 - ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12339,7 +12245,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ljpeg $JPEG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12343 "configure" -+#line 12249 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12350,7 +12256,7 @@ - jpeg_destroy_compress() - ; return 0; } - EOF --if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12376,7 +12282,7 @@ - if test "$SYSTEM_JPEG" = 1; then - LIBS="$JPEG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12380 "configure" -+#line 12286 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -12387,7 +12293,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_JPEG=1 - else -@@ -12425,7 +12331,7 @@ - SYSTEM_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:12429: checking for gzread in -lz" >&5 -+echo "configure:12335: checking for gzread in -lz" >&5 - ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12433,7 +12339,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lz $ZLIB_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12437 "configure" -+#line 12343 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12444,7 +12350,7 @@ - gzread() - ; return 0; } - EOF --if { (eval echo configure:12448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12469,7 +12375,7 @@ - if test "$SYSTEM_ZLIB" = 1; then - LIBS="$ZLIB_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12473 "configure" -+#line 12379 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <string.h> -@@ -12480,7 +12386,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_ZLIB=1 - else -@@ -12518,7 +12424,7 @@ - SYSTEM_BZ2= - else - echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 --echo "configure:12522: checking for BZ2_bzread in -lbz2" >&5 -+echo "configure:12428: checking for BZ2_bzread in -lbz2" >&5 - ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12526,7 +12432,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbz2 $BZ2_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12530 "configure" -+#line 12436 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12537,7 +12443,7 @@ - BZ2_bzread() - ; return 0; } - EOF --if { (eval echo configure:12541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12589,7 +12495,7 @@ - else - _SAVE_PNG_LIBS=$PNG_LIBS - echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:12593: checking for png_get_valid in -lpng" >&5 -+echo "configure:12499: checking for png_get_valid in -lpng" >&5 - ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12597,7 +12503,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12601 "configure" -+#line 12507 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12608,7 +12514,7 @@ - png_get_valid() - ; return 0; } - EOF --if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12630,7 +12536,7 @@ - fi - - echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6 --echo "configure:12634: checking for png_get_acTL in -lpng" >&5 -+echo "configure:12540: checking for png_get_acTL in -lpng" >&5 - ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12638,7 +12544,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12642 "configure" -+#line 12548 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12649,7 +12555,7 @@ - png_get_acTL() - ; return 0; } - EOF --if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12681,7 +12587,7 @@ - if test "$SYSTEM_PNG" = 1; then - LIBS="$PNG_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12685 "configure" -+#line 12591 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -12695,7 +12601,7 @@ - #endif - ; return 0; } - EOF --if { (eval echo configure:12699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SYSTEM_PNG=1 - else -@@ -12737,7 +12643,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12741: checking for $ac_word" >&5 -+echo "configure:12647: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12781,19 +12687,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for hunspell""... $ac_c" 1>&6 --echo "configure:12785: checking for hunspell" >&5 -+echo "configure:12691: checking for hunspell" >&5 - - if $PKG_CONFIG --exists "hunspell" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 --echo "configure:12792: checking MOZ_HUNSPELL_CFLAGS" >&5 -+echo "configure:12698: checking MOZ_HUNSPELL_CFLAGS" >&5 - MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 --echo "configure:12797: checking MOZ_HUNSPELL_LIBS" >&5 -+echo "configure:12703: checking MOZ_HUNSPELL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 -@@ -13161,7 +13067,7 @@ - # Allow the application to influence configure with a confvars.sh script. - - echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6 --echo "configure:13165: checking if app-specific confvars.sh exists" >&5 -+echo "configure:13071: checking if app-specific confvars.sh exists" >&5 - if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then - echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6 - . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" -@@ -13284,6 +13190,10 @@ - - # Toolkit Options - -+if test -n "$LIBXUL_SDK"; then -+ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` -+else -+ - # Check whether --enable-default-toolkit or --disable-default-toolkit was given. - if test "${enable_default_toolkit+set}" = set; then - enableval="$enable_default_toolkit" -@@ -13309,6 +13219,7 @@ - { echo "configure: error: Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported)." 1>&2; exit 1; } - fi - fi -+fi # LIBXUL_SDK - - cat >> confdefs.h <<EOF - #define MOZ_DEFAULT_TOOLKIT "$MOZ_WIDGET_TOOLKIT" -@@ -13404,7 +13315,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13408: checking for $ac_word" >&5 -+echo "configure:13319: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13448,19 +13359,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 --echo "configure:13452: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 -+echo "configure:13363: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 --echo "configure:13459: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:13370: checking MOZ_GTK2_CFLAGS" >&5 - MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0"` - echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 --echo "configure:13464: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:13375: checking MOZ_GTK2_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 -@@ -13495,6 +13406,7 @@ - - - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_ENABLE_GTK2" - then - MOZ_ENABLE_STARTUP_NOTIFICATION= -@@ -13519,7 +13431,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13523: checking for $ac_word" >&5 -+echo "configure:13435: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13563,19 +13475,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 --echo "configure:13567: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 -+echo "configure:13479: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 - - if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 --echo "configure:13574: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 -+echo "configure:13486: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 - MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` - echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 --echo "configure:13579: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 -+echo "configure:13491: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 -@@ -13621,6 +13533,7 @@ - - TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" - fi -+fi - - - -@@ -13639,7 +13552,7 @@ - - - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - cat >> confdefs.h <<\EOF - #define MOZ_X11 1 -@@ -13779,7 +13692,7 @@ - - - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - succeeded=no - -@@ -13787,7 +13700,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13791: checking for $ac_word" >&5 -+echo "configure:13704: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13831,19 +13744,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for xft""... $ac_c" 1>&6 --echo "configure:13835: checking for xft" >&5 -+echo "configure:13748: checking for xft" >&5 - - if $PKG_CONFIG --exists "xft" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 --echo "configure:13842: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13755: checking MOZ_XFT_CFLAGS" >&5 - MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` - echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 --echo "configure:13847: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13760: checking MOZ_XFT_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 -@@ -13881,7 +13794,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13885: checking for $ac_word" >&5 -+echo "configure:13798: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13925,19 +13838,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6 --echo "configure:13929: checking for pango >= $PANGO_VERSION" >&5 -+echo "configure:13842: checking for pango >= $PANGO_VERSION" >&5 - - if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13936: checking _PANGOCHK_CFLAGS" >&5 -+echo "configure:13849: checking _PANGOCHK_CFLAGS" >&5 - _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"` - echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 - - echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 --echo "configure:13941: checking _PANGOCHK_LIBS" >&5 -+echo "configure:13854: checking _PANGOCHK_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 -@@ -13972,7 +13885,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13976: checking for $ac_word" >&5 -+echo "configure:13889: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14016,19 +13929,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION""... $ac_c" 1>&6 --echo "configure:14020: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 -+echo "configure:13933: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 - - if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 --echo "configure:14027: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13940: checking MOZ_PANGO_CFLAGS" >&5 - MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"` - echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 --echo "configure:14032: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13945: checking MOZ_PANGO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 -@@ -14075,6 +13988,7 @@ - - - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11" - then - if test "$MOZ_ENABLE_GTK2" -@@ -14105,7 +14019,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14109: checking for $ac_word" >&5 -+echo "configure:14023: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14149,19 +14063,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 --echo "configure:14153: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14067: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 - - if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 --echo "configure:14160: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14074: checking MOZ_GNOMEVFS_CFLAGS" >&5 - MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` - echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 --echo "configure:14165: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14079: checking MOZ_GNOMEVFS_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 -@@ -14212,7 +14126,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14216: checking for $ac_word" >&5 -+echo "configure:14130: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14256,19 +14170,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 --echo "configure:14260: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14174: checking for gconf-2.0 >= $GCONF_VERSION" >&5 - - if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 --echo "configure:14267: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14181: checking MOZ_GCONF_CFLAGS" >&5 - MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` - echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 --echo "configure:14272: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14186: checking MOZ_GCONF_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 -@@ -14323,7 +14237,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14327: checking for $ac_word" >&5 -+echo "configure:14241: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14367,19 +14281,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 --echo "configure:14371: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14285: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 - - if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 --echo "configure:14378: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14292: checking MOZ_LIBGNOME_CFLAGS" >&5 - MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` - echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 --echo "configure:14383: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14297: checking MOZ_LIBGNOME_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 -@@ -14457,7 +14371,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14461: checking for $ac_word" >&5 -+echo "configure:14375: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14501,19 +14415,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 --echo "configure:14505: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14419: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 - - if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 --echo "configure:14512: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14426: checking MOZ_GNOMEUI_CFLAGS" >&5 - MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` - echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 --echo "configure:14517: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14431: checking MOZ_GNOMEUI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 -@@ -14590,7 +14504,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14594: checking for $ac_word" >&5 -+echo "configure:14508: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14634,19 +14548,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6 --echo "configure:14638: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 -+echo "configure:14552: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 - - if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 --echo "configure:14645: checking MOZ_DBUS_GLIB_CFLAGS" >&5 -+echo "configure:14559: checking MOZ_DBUS_GLIB_CFLAGS" >&5 - MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"` - echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 --echo "configure:14650: checking MOZ_DBUS_GLIB_LIBS" >&5 -+echo "configure:14564: checking MOZ_DBUS_GLIB_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 -@@ -14685,6 +14599,9 @@ - - - -+fi # LIBXUL_SDK -+ -+ - # Check whether --enable-crypto or --disable-crypto was given. - if test "${enable_crypto+set}" = set; then - enableval="$enable_crypto" -@@ -15149,7 +15066,7 @@ - # Extract the first word of "java", so it can be a program name with args. - set dummy java; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15153: checking for $ac_word" >&5 -+echo "configure:15070: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15185,7 +15102,7 @@ - # Extract the first word of "javac", so it can be a program name with args. - set dummy javac; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15189: checking for $ac_word" >&5 -+echo "configure:15106: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15221,7 +15138,7 @@ - # Extract the first word of "jar", so it can be a program name with args. - set dummy jar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15225: checking for $ac_word" >&5 -+echo "configure:15142: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15295,7 +15212,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15299: checking for $ac_word" >&5 -+echo "configure:15216: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15339,19 +15256,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 --echo "configure:15343: checking for gthread-2.0" >&5 -+echo "configure:15260: checking for gthread-2.0" >&5 - - if $PKG_CONFIG --exists "gthread-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 --echo "configure:15350: checking MOZ_GTHREAD_CFLAGS" >&5 -+echo "configure:15267: checking MOZ_GTHREAD_CFLAGS" >&5 - MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` - echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 --echo "configure:15355: checking MOZ_GTHREAD_LIBS" >&5 -+echo "configure:15272: checking MOZ_GTHREAD_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 -@@ -15387,17 +15304,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:15391: checking for $ac_hdr" >&5 -+echo "configure:15308: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 15396 "configure" -+#line 15313 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:15401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:15318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -15747,7 +15664,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15751: checking for $ac_word" >&5 -+echo "configure:15668: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15792,7 +15709,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15796: checking for $ac_word" >&5 -+echo "configure:15713: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15840,13 +15757,13 @@ - - - echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 --echo "configure:15844: checking for tar archiver" >&5 -+echo "configure:15761: checking for tar archiver" >&5 - for ac_prog in gnutar gtar tar - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15850: checking for $ac_word" >&5 -+echo "configure:15767: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -15901,13 +15818,13 @@ - msvc*|mks*|cygwin*|mingw*|wince*) - if test -n "$MOZ_UPDATER"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:15905: checking for iconv" >&5 -+echo "configure:15822: checking for iconv" >&5 - for ac_prog in $HOST_ICONV "iconv" - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:15911: checking for $ac_word" >&5 -+echo "configure:15828: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16247,7 +16164,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:16251: checking for $ac_word" >&5 -+echo "configure:16168: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16291,19 +16208,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6 --echo "configure:16295: checking for sqlite3 >= $SQLITE_VERSION" >&5 -+echo "configure:16212: checking for sqlite3 >= $SQLITE_VERSION" >&5 - - if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6 --echo "configure:16302: checking SQLITE_CFLAGS" >&5 -+echo "configure:16219: checking SQLITE_CFLAGS" >&5 - SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"` - echo "$ac_t""$SQLITE_CFLAGS" 1>&6 - - echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6 --echo "configure:16307: checking SQLITE_LIBS" >&5 -+echo "configure:16224: checking SQLITE_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$SQLITE_LIBS" 1>&6 -@@ -16493,18 +16410,18 @@ - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:16497: checking for valid debug flags" >&5 -+echo "configure:16414: checking for valid debug flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 16501 "configure" -+#line 16418 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -16545,18 +16462,18 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test -n "$MOZ_OPTIMIZE"; then - echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 --echo "configure:16549: checking for valid optimization flags" >&5 -+echo "configure:16466: checking for valid optimization flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 16553 "configure" -+#line 16470 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:16560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -16706,7 +16623,7 @@ - fi - - --if test "$NS_TRACE_MALLOC"; then -+if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then - MOZ_MEMORY= - fi - -@@ -16726,7 +16643,7 @@ - fi - else - echo $ac_n "checking size of int *""... $ac_c" 1>&6 --echo "configure:16730: checking size of int *" >&5 -+echo "configure:16647: checking size of int *" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -16734,18 +16651,19 @@ - ac_cv_sizeof_int_p=4 - else - cat > conftest.$ac_ext <<EOF --#line 16738 "configure" -+#line 16655 "configure" - #include "confdefs.h" - #include <stdio.h> --int main() -+#include <sys/types.h> -+main() - { - FILE *f=fopen("conftestval", "w"); -- if (!f) return(1); -+ if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int *)); -- return(0); -+ exit(0); - } - EOF --if { (eval echo configure:16749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_int_p=`cat conftestval` - else -@@ -16875,17 +16793,17 @@ - - ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 --echo "configure:16879: checking for valgrind/valgrind.h" >&5 -+echo "configure:16797: checking for valgrind/valgrind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 16884 "configure" -+#line 16802 "configure" - #include "confdefs.h" - #include <valgrind/valgrind.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:16889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -16962,7 +16880,7 @@ - - if test -n "$_ENABLE_EFENCE"; then - echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:16966: checking for malloc in -lefence" >&5 -+echo "configure:16884: checking for malloc in -lefence" >&5 - ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16970,7 +16888,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lefence $LIBS" - cat > conftest.$ac_ext <<EOF --#line 16974 "configure" -+#line 16892 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -16981,7 +16899,7 @@ - malloc() - ; return 0; } - EOF --if { (eval echo configure:16985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -17113,12 +17031,12 @@ - for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17117: checking for $ac_func" >&5 -+echo "configure:17035: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17122 "configure" -+#line 17040 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17144,7 +17062,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17363,12 +17281,12 @@ - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17367: checking for $ac_func" >&5 -+echo "configure:17285: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17372 "configure" -+#line 17290 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17394,7 +17312,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17442,17 +17360,17 @@ - if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then - ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 --echo "configure:17446: checking for unwind.h" >&5 -+echo "configure:17364: checking for unwind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17451 "configure" -+#line 17369 "configure" - #include "confdefs.h" - #include <unwind.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:17456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:17374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -17471,12 +17389,12 @@ - for ac_func in _Unwind_Backtrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:17475: checking for $ac_func" >&5 -+echo "configure:17393: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17480 "configure" -+#line 17398 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -17499,7 +17417,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -17621,7 +17539,7 @@ - # Compiler Options - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:17625: checking for gcc -pipe support" >&5 -+echo "configure:17543: checking for gcc -pipe support" >&5 - if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then - echo '#include <stdio.h>' > dummy-hello.c - echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c -@@ -17636,14 +17554,14 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext <<EOF --#line 17640 "configure" -+#line 17558 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:17647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -17685,16 +17603,16 @@ - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" - echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 --echo "configure:17689: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:17607: checking whether compiler supports -Wno-long-long" >&5 - cat > conftest.$ac_ext <<EOF --#line 17691 "configure" -+#line 17609 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:17698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" -@@ -17730,16 +17648,16 @@ - CFLAGS="$CFLAGS -fprofile-generate" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:17734: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:17652: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <<EOF --#line 17736 "configure" -+#line 17654 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:17743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -17759,16 +17677,16 @@ - else - CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" - echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:17763: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:17681: checking whether C compiler supports -fprofile-arcs" >&5 - cat > conftest.$ac_ext <<EOF --#line 17765 "configure" -+#line 17683 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:17772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-arcs" - result="yes" -@@ -17838,16 +17756,16 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" - echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 --echo "configure:17842: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:17760: checking whether C++ compiler has -pedantic long long bug" >&5 - cat > conftest.$ac_ext <<EOF --#line 17844 "configure" -+#line 17762 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) - ; return 0; } - EOF --if { (eval echo configure:17851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="no" - else -@@ -17872,13 +17790,16 @@ - fi - - echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:17876: checking for correct temporary object destruction order" >&5 -+echo "configure:17794: checking for correct temporary object destruction order" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <<EOF --#line 17881 "configure" -+#line 17799 "configure" - #include "confdefs.h" -+#ifdef __cplusplus -+extern "C" void exit(int); -+#endif - class A { - public: A(int& x) : mValue(x) {} - ~A() { mValue--; } -@@ -17897,7 +17818,7 @@ - } - - EOF --if { (eval echo configure:17901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -17918,12 +17839,12 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" - echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 --echo "configure:17922: checking for correct overload resolution with const and templates" >&5 -+echo "configure:17843: checking for correct overload resolution with const and templates" >&5 - if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 17927 "configure" -+#line 17848 "configure" - #include "confdefs.h" - - template <class T> -@@ -17953,7 +17874,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:17957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -18216,7 +18137,7 @@ - ;; - esac - --if test -z "$COMPILE_ENVIRONMENT"; then -+if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then - SKIP_IDL_CHECK="yes" - fi - -@@ -18256,7 +18177,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18260: checking for $ac_word" >&5 -+echo "configure:18181: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18300,19 +18221,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 --echo "configure:18304: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 -+echo "configure:18225: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:18311: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18232: checking LIBIDL_CFLAGS" >&5 - LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` - echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 - - echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 --echo "configure:18316: checking LIBIDL_LIBS" >&5 -+echo "configure:18237: checking LIBIDL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LIBIDL_LIBS" 1>&6 -@@ -18436,7 +18357,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18440: checking for $ac_word" >&5 -+echo "configure:18361: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18471,7 +18392,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:18475: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18396: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -18494,7 +18415,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 18498 "configure" -+#line 18419 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -18570,7 +18491,7 @@ - } - - EOF --if { (eval echo configure:18574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18604,7 +18525,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext <<EOF --#line 18608 "configure" -+#line 18529 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -18614,7 +18535,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" -@@ -18658,7 +18579,7 @@ - # Extract the first word of "libIDL-config", so it can be a program name with args. - set dummy libIDL-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18662: checking for $ac_word" >&5 -+echo "configure:18583: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18693,7 +18614,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:18697: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18618: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -18720,7 +18641,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 18724 "configure" -+#line 18645 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -18806,7 +18727,7 @@ - } - - EOF --if { (eval echo configure:18810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18840,7 +18761,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext <<EOF --#line 18844 "configure" -+#line 18765 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -18851,7 +18772,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:18855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libIDL or finding the wrong" -@@ -18891,7 +18812,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18895: checking for $ac_word" >&5 -+echo "configure:18816: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -18935,19 +18856,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 --echo "configure:18939: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18860: checking for libIDL-2.0 >= 0.8.0" >&5 - - if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:18946: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18867: checking LIBIDL_CFLAGS" >&5 - LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 - - echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 --echo "configure:18951: checking LIBIDL_LIBS" >&5 -+echo "configure:18872: checking LIBIDL_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LIBIDL_LIBS" 1>&6 -@@ -18984,7 +18905,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18988: checking for $ac_word" >&5 -+echo "configure:18909: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19021,7 +18942,7 @@ - - if test -n "$ORBIT_CONFIG"; then - echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:19025: checking for ORBit libIDL usability" >&5 -+echo "configure:18946: checking for ORBit libIDL usability" >&5 - _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` - _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` - _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` -@@ -19038,7 +18959,7 @@ - result="maybe" - else - cat > conftest.$ac_ext <<EOF --#line 19042 "configure" -+#line 18963 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -19053,7 +18974,7 @@ - } - - EOF --if { (eval echo configure:19057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - _LIBIDL_FOUND=1 - result="yes" -@@ -19100,7 +19021,7 @@ - fi - fi - --if test -z "$SKIP_PATH_CHECKS"; then -+if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then - if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2"; then - succeeded=no -@@ -19109,7 +19030,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19113: checking for $ac_word" >&5 -+echo "configure:19034: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19153,19 +19074,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 --echo "configure:19157: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 -+echo "configure:19078: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 - - if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 --echo "configure:19164: checking GLIB_CFLAGS" >&5 -+echo "configure:19085: checking GLIB_CFLAGS" >&5 - GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` - echo "$ac_t""$GLIB_CFLAGS" 1>&6 - - echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 --echo "configure:19169: checking GLIB_LIBS" >&5 -+echo "configure:19090: checking GLIB_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$GLIB_LIBS" 1>&6 -@@ -19250,7 +19171,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19254: checking for $ac_word" >&5 -+echo "configure:19175: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19285,7 +19206,7 @@ - - min_glib_version=${GLIB_VERSION} - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:19289: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:19210: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -19308,7 +19229,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext <<EOF --#line 19312 "configure" -+#line 19233 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -19384,7 +19305,7 @@ - } - - EOF --if { (eval echo configure:19388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -19418,7 +19339,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext <<EOF --#line 19422 "configure" -+#line 19343 "configure" - #include "confdefs.h" - - #include <glib.h> -@@ -19428,7 +19349,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:19432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" -@@ -19508,19 +19429,19 @@ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:19512: checking for working alloca.h" >&5 -+echo "configure:19433: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19517 "configure" -+#line 19438 "configure" - #include "confdefs.h" - #include <alloca.h> - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:19524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -19541,12 +19462,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:19545: checking for alloca" >&5 -+echo "configure:19466: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19550 "configure" -+#line 19471 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ -@@ -19574,7 +19495,7 @@ - char *p = (char *) alloca(1); - ; return 0; } - EOF --if { (eval echo configure:19578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -19606,12 +19527,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:19610: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19531: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19615 "configure" -+#line 19536 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -19636,12 +19557,12 @@ - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19640: checking for $ac_func" >&5 -+echo "configure:19561: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19645 "configure" -+#line 19566 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -19664,7 +19585,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:19668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -19691,7 +19612,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19695: checking stack direction for C alloca" >&5 -+echo "configure:19616: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19699,7 +19620,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <<EOF --#line 19703 "configure" -+#line 19624 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -19718,7 +19639,7 @@ - exit (find_stack_direction() < 0); - } - EOF --if { (eval echo configure:19722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -19765,17 +19686,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:19769: checking for $ac_hdr" >&5 -+echo "configure:19690: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 19774 "configure" -+#line 19695 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:19779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -19853,7 +19774,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19857: checking for $ac_word" >&5 -+echo "configure:19778: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -19897,19 +19818,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6 --echo "configure:19901: checking for fontconfig freetype2" >&5 -+echo "configure:19822: checking for fontconfig freetype2" >&5 - - if $PKG_CONFIG --exists "fontconfig freetype2" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6 --echo "configure:19908: checking CAIRO_FT_CFLAGS" >&5 -+echo "configure:19829: checking CAIRO_FT_CFLAGS" >&5 - CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"` - echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6 --echo "configure:19913: checking CAIRO_FT_LIBS" >&5 -+echo "configure:19834: checking CAIRO_FT_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_FT_LIBS" 1>&6 -@@ -20000,7 +19921,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20004: checking for $ac_word" >&5 -+echo "configure:19925: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20044,19 +19965,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6 --echo "configure:20048: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 -+echo "configure:19969: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 - - if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 --echo "configure:20055: checking CAIRO_CFLAGS" >&5 -+echo "configure:19976: checking CAIRO_CFLAGS" >&5 - CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"` - echo "$ac_t""$CAIRO_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 --echo "configure:20060: checking CAIRO_LIBS" >&5 -+echo "configure:19981: checking CAIRO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_LIBS" 1>&6 -@@ -20094,7 +20015,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20098: checking for $ac_word" >&5 -+echo "configure:20019: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20138,19 +20059,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 --echo "configure:20142: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 -+echo "configure:20063: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 - - if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 --echo "configure:20149: checking CAIRO_XRENDER_CFLAGS" >&5 -+echo "configure:20070: checking CAIRO_XRENDER_CFLAGS" >&5 - CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` - echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 --echo "configure:20154: checking CAIRO_XRENDER_LIBS" >&5 -+echo "configure:20075: checking CAIRO_XRENDER_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 -@@ -20221,7 +20142,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:20225: checking for $ac_word" >&5 -+echo "configure:20146: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -20265,19 +20186,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for lcms >= $LCMS_VERSION""... $ac_c" 1>&6 --echo "configure:20269: checking for lcms >= $LCMS_VERSION" >&5 -+echo "configure:20190: checking for lcms >= $LCMS_VERSION" >&5 - - if $PKG_CONFIG --exists "lcms >= $LCMS_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking LCMS_CFLAGS""... $ac_c" 1>&6 --echo "configure:20276: checking LCMS_CFLAGS" >&5 -+echo "configure:20197: checking LCMS_CFLAGS" >&5 - LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= $LCMS_VERSION"` - echo "$ac_t""$LCMS_CFLAGS" 1>&6 - - echo $ac_n "checking LCMS_LIBS""... $ac_c" 1>&6 --echo "configure:20281: checking LCMS_LIBS" >&5 -+echo "configure:20202: checking LCMS_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - LCMS_LIBS="`$PKG_CONFIG --libs \"lcms >= $LCMS_VERSION\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$LCMS_LIBS" 1>&6 -@@ -20625,14 +20546,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF --#line 20629 "configure" -+#line 20550 "configure" - #include "confdefs.h" - #include <gmodule.h> - int main() { - int x = 1; x++; - ; return 0; } - EOF --if { (eval echo configure:20636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -20946,7 +20867,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext <<EOF --#line 20950 "configure" -+#line 20871 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -20964,7 +20885,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:20968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -21187,34 +21108,15 @@ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - MOZ_DEFINES=$DEFS - -@@ -22081,7 +21983,7 @@ - unset MAKEFILES - unset CONFIG_FILES - --if test "$COMPILE_ENVIRONMENT"; then -+if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then - if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" - if test -z "$MOZ_DEBUG"; then -@@ -22190,7 +22092,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -22333,7 +22235,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - ---- iceweasel-3.0.1.orig/configure.in -+++ iceweasel-3.0.1/configure.in -@@ -2759,7 +2759,7 @@ - if test "$ac_cv_have_usable_wchar_v2" = "yes"; then - AC_DEFINE(HAVE_CPP_2BYTE_WCHAR_T) - HAVE_CPP_2BYTE_WCHAR_T=1 --else -+elif false; then - dnl This is really gcc-only - dnl Do this test using CXX only since some versions of gcc - dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions -@@ -4000,6 +4000,10 @@ - AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT])) - CFLAGS=$_SAVE_CFLAGS - else -+ if test -n "$LIBXUL_SDK"; then -+ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" -+ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" -+ else - NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' - # explicitly set libs for Visual Age C++ for OS/2 - if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then -@@ -4017,6 +4021,7 @@ - else - NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' - fi -+ fi - fi - - dnl ======================================================== -@@ -4641,6 +4646,10 @@ - dnl ======================================================== - MOZ_ARG_HEADER(Toolkit Options) - -+if test -n "$LIBXUL_SDK"; then -+ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` -+else -+ - dnl ======================================================== - dnl = Select the default toolkit - dnl ======================================================== -@@ -4676,6 +4685,7 @@ - AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).]) - fi - fi -+fi # LIBXUL_SDK - - AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT") - -@@ -4754,6 +4764,7 @@ - dnl = startup-notification support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_ENABLE_GTK2" - then - MOZ_ENABLE_STARTUP_NOTIFICATION= -@@ -4781,6 +4792,7 @@ - - TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" - fi -+fi - AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) - AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) -@@ -4799,7 +4811,7 @@ - - AC_SUBST(MOC) - --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - AC_DEFINE(MOZ_X11) - MOZ_X11=1 -@@ -4921,7 +4933,7 @@ - dnl ======================================================== - dnl = Xft and Pango - dnl ======================================================== --if test "$MOZ_ENABLE_GTK2" -+if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" - then - PKG_CHECK_MODULES(MOZ_XFT, xft) - AC_SUBST(MOZ_XFT_CFLAGS) -@@ -4945,6 +4957,7 @@ - dnl = GnomeVFS support module - dnl ======================================================== - -+if test -z "$LIBXUL_SDK"; then - if test "$MOZ_X11" - then - dnl build the gnomevfs extension by default only when the -@@ -5081,6 +5094,9 @@ - AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) - AC_SUBST(MOZ_DBUS_GLIB_LIBS) - -+fi # LIBXUL_SDK -+ -+ - dnl ======================================================== - dnl = Build Personal Security Manager - dnl ======================================================== -@@ -6245,7 +6261,7 @@ - MOZ_MEMORY=1, - MOZ_MEMORY=) - --if test "$NS_TRACE_MALLOC"; then -+if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then - MOZ_MEMORY= - fi - -@@ -7113,7 +7129,7 @@ - ;; - esac - --if test -z "$COMPILE_ENVIRONMENT"; then -+if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then - SKIP_IDL_CHECK="yes" - fi - -@@ -7220,7 +7236,7 @@ - fi - fi - --if test -z "$SKIP_PATH_CHECKS"; then -+if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then - if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2"; then - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) -@@ -8260,7 +8276,7 @@ - unset MAKEFILES - unset CONFIG_FILES - --if test "$COMPILE_ENVIRONMENT"; then -+if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then - if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" - if test -z "$MOZ_DEBUG"; then - - diff --git a/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.4/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Thu, 24 Jul 2008 16:05:09 -0400 -Subject: [PATCH 1/1] Remove -Werror from build - -Remove -Werror from build - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - configure | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,7 @@ if test "$GNU_CC"; then - # Don't allow undefined symbols in libraries - DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,7 @@ EOF - IMPLIB='emximp -o' - FILTER='emxexp -o' - LDFLAGS='-Zmap' -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_DEBUG_FLAGS="-g -fno-inline" - MOZ_OPTIMIZE_FLAGS="-O2" - MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" -@@ -7048,7 +7048,7 @@ else - fi - rm -f conftest* - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_OPTIMIZE_FLAGS="-xO4" - MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.0.4/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Fri, 25 Jul 2008 11:20:02 -0400 -Subject: [PATCH 1/1] Fix security cross compile cpu detection error - -Fix security cross compile cpu detection error. -Reference to bug 376279. - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - security/coreconf/arch.mk | 2 ++ - security/manager/Makefile.in | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk -index fba38ff..28da32e 100644 ---- a/security/coreconf/arch.mk -+++ b/security/coreconf/arch.mk -@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) - # Attempt to differentiate between sparc and x86 Solaris - # - -+ifndef OE_TEST - OS_TEST := $(shell uname -m) -+endif - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in -index 86119f7..86c09ca 100644 ---- a/security/manager/Makefile.in -+++ b/security/manager/Makefile.in -@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ - RC="$(RC) $(RCFLAGS)" \ - OS_ARCH="$(OS_ARCH)" \ - CPU_ARCH="$(TARGET_CPU)" \ -+ OS_TEST="$(TARGET_CPU)" \ - $(NULL) - SKIP_CHK=1 - endif --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.4/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.4/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.0.4/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler -# ---- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 -+++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 -@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask - /** - * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: - * ARM is a little endian architecture but 64 bit double words are stored - * differently: the 32 bit words are in little endian byte order, the two words - * are stored in big endian`s way. - */ - - #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) --#define CPU_IS_ARM -+#if !defined(__VFP_FP__) -+#define FPU_IS_ARM_FPA -+#endif - #endif - - #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 - /** - * This version of the macros is safe for the alias optimizations - * that gcc does, but uses gcc-specific extensions. - */ - - typedef union txdpun { - PRFloat64 d; - struct { --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - PRUint32 lo, hi; - #else - PRUint32 hi, lo; - #endif - } s; - } txdpun; - - #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) - #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) - - #else // __GNUC__ - - /* We don't know of any non-gcc compilers that perform alias optimization, - * so this code should work. - */ - --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) - #else - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) - #endif - - #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.0.4/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.4/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# XPTC_InvokeByIndex crashes -# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) -Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -=================================================================== ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -51,22 +51,32 @@ - #ifdef __ARM_EABI__ - #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) - #define VAR_STACK_SIZE_64 3 - #else - #define DOUBLEWORD_ALIGN(p) (p) - #define VAR_STACK_SIZE_64 2 - #endif - -+#ifdef __ARM_EABI__ -+#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) -+#else -+#define DOUBLEWORD_ALIGN(p) (p) -+#endif -+ - // Remember that these 'words' are 32bit DWORDS - - static PRUint32 - invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) - { - PRUint32 result = 0; -+ -+ /* Note that we give a "worst case" estimate of how much stack _might_ be -+ * needed, rather than the real count - this should be safe */ -+ - for(PRUint32 i = 0; i < paramCount; i++, s++) - { - if(s->IsPtrData()) - { - result++; - continue; - } - switch(s->type) diff --git a/recipes/mozilla/firefox-3.0.4/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.4/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 -@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); - #error "Linux/MIPS pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - --#elif defined(__arm__) --/* ARM/Linux */ -+#elif defined(__arm__) && !defined(__ARM_EABI__) -+/* ARM/Linux (old-ABI) */ - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] - #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) -@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); - #error "ARM/Linux pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - -+#elif defined(__arm__) && defined(__ARM_EABI__) -+/* ARM/Linux (EABI) */ -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] -+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) -+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) -+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) -+#define _MD_SP_TYPE __ptr_t -+#else -+#error "ARM/Linux pre-glibc2 not supported yet" -+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ -+ - #else - - #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.0.4/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.0.4/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.0.4/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# Add atomic operations for ARM. -diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h -index 5b794c5..cb8d58e 100644 ---- a/nsprpub/pr/include/md/_linux.h -+++ b/nsprpub/pr/include/md/_linux.h -@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); - }) - #endif - -+#if defined(__arm__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+ -+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); -+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) -+ -+#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) -+#define _MD_ATOMIC_ADD(ptr, n) \ -+ ({ \ -+ PRInt32 ov, nv; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ nv = ov + (n); \ -+ } \ -+ while (__kernel_cmpxchg(ov, nv, vp)); \ -+ \ -+ nv; \ -+ }) -+#define _MD_ATOMIC_SET(ptr, nv) \ -+ ({ \ -+ PRInt32 ov; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ } \ -+ while (__kernel_cmpxchg(ov, (nv), vp)); \ -+ \ -+ ov; \ -+ }) -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.0.4/configure-wchart.patch b/recipes/mozilla/firefox-3.0.4/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.0.4/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in 2008-04-15 12:56:35.000000000 +0300 -+++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 -@@ -2743,7 +2743,7 @@ - - AC_CACHE_CHECK(for compiler -fshort-wchar option, - ac_cv_have_usable_wchar_option_v2, -- [AC_TRY_LINK([#include <stddef.h> -+ [AC_TRY_COMPILE([#include <stddef.h> - $configure_static_assert_macros], - [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.0.4/jemalloc-tls.patch b/recipes/mozilla/firefox-3.0.4/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.0.4/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 -+++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 -@@ -386,7 +386,7 @@ - #else - # define NO_TLS - #endif --#if 0 -+ - #ifdef __i386__ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 -@@ -420,7 +420,6 @@ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 - #endif --#endif - - #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) - -@@ -2582,7 +2581,7 @@ - * knowledge of how _pthread_self() calculates values, we can't - * easily do much better than this. - */ -- ind = (unsigned long) _pthread_self() % narenas; -+ ind = 255255 % narenas; - - /* - * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.0.4/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.4/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.4/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.4/linkage-problem.patch b/recipes/mozilla/firefox-3.0.4/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.4/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 -+++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 -@@ -229,6 +229,11 @@ - $(NULL) - endif - -+ifdef MOZ_ENABLE_XFT -+EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ -+ $(NULL) -+endif -+ - ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) - EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ - $(NULL) diff --git a/recipes/mozilla/firefox-3.0.4/mozconfig b/recipes/mozilla/firefox-3.0.4/mozconfig deleted file mode 100644 index d8d3f3923d..0000000000 --- a/recipes/mozilla/firefox-3.0.4/mozconfig +++ /dev/null @@ -1,72 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-bz2 -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-updater - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -#ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul - -# Disable striping -ac_add_options --disable-strip -ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.0.4/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.4/random_to_urandom.diff deleted file mode 100644 index f969752381..0000000000 --- a/recipes/mozilla/firefox-3.0.4/random_to_urandom.diff +++ /dev/null @@ -1,26 +0,0 @@ -# Component manager should not use /dev/random for generation ranodm numbers -# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy -# Bug somewhere exists but it is very old -Index: nsprpub/pr/src/md/unix/uxrng.c -=================================================================== ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c -@@ -144,17 +144,17 @@ - #include <sys/stat.h> - #include <fcntl.h> - - static int fdDevRandom; - static PRCallOnceType coOpenDevRandom; - - static PRStatus OpenDevRandom( void ) - { -- fdDevRandom = open( "/dev/random", O_RDONLY ); -+ fdDevRandom = open( "/dev/urandom", O_RDONLY ); - return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS ); - } /* end OpenDevRandom() */ - - static size_t GetDevRandom( void *buf, size_t size ) - { - int bytesIn; - int rc; - diff --git a/recipes/mozilla/firefox-3.0.4/security-cross.patch b/recipes/mozilla/firefox-3.0.4/security-cross.patch deleted file mode 100644 index e1c988d7e6..0000000000 --- a/recipes/mozilla/firefox-3.0.4/security-cross.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,93 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = $(OS_TEST) --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/recipes/mozilla/firefox-3.0.8/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.8/0001-Remove-Werror-from-build.patch deleted file mode 100644 index 8fe1087b4d..0000000000 --- a/recipes/mozilla/firefox-3.0.8/0001-Remove-Werror-from-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Thu, 24 Jul 2008 16:05:09 -0400 -Subject: [PATCH 1/1] Remove -Werror from build - -Remove -Werror from build - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - configure | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index a2d84ab..402e70a 100755 ---- a/configure -+++ b/configure -@@ -5344,7 +5344,7 @@ if test "$GNU_CC"; then - # Don't allow undefined symbols in libraries - DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti -@@ -6811,7 +6811,7 @@ EOF - IMPLIB='emximp -o' - FILTER='emxexp -o' - LDFLAGS='-Zmap' -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_DEBUG_FLAGS="-g -fno-inline" - MOZ_OPTIMIZE_FLAGS="-O2" - MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" -@@ -7048,7 +7048,7 @@ else - fi - rm -f conftest* - fi -- WARNINGS_AS_ERRORS='-Werror' -+ WARNINGS_AS_ERRORS='' - MOZ_OPTIMIZE_FLAGS="-xO4" - MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch deleted file mode 100644 index ce8d4d9948..0000000000 --- a/recipes/mozilla/firefox-3.0.8/0002-Fix-security-cross-compile-cpu-detection-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 -From: Eduardo Valentin <eduardo.valentin@openpossa.org> -Date: Fri, 25 Jul 2008 11:20:02 -0400 -Subject: [PATCH 1/1] Fix security cross compile cpu detection error - -Fix security cross compile cpu detection error. -Reference to bug 376279. - -Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> ---- - security/coreconf/arch.mk | 2 ++ - security/manager/Makefile.in | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk -index fba38ff..28da32e 100644 ---- a/security/coreconf/arch.mk -+++ b/security/coreconf/arch.mk -@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) - # Attempt to differentiate between sparc and x86 Solaris - # - -+ifndef OE_TEST - OS_TEST := $(shell uname -m) -+endif - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in -index 86119f7..86c09ca 100644 ---- a/security/manager/Makefile.in -+++ b/security/manager/Makefile.in -@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ - RC="$(RC) $(RCFLAGS)" \ - OS_ARCH="$(OS_ARCH)" \ - CPU_ARCH="$(TARGET_CPU)" \ -+ OS_TEST="$(TARGET_CPU)" \ - $(NULL) - SKIP_CHK=1 - endif --- -1.5.4.3 diff --git a/recipes/mozilla/firefox-3.0.8/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.8/010_FPU_IS_ARM_FPA_xslt.diff deleted file mode 100644 index 854100c4c3..0000000000 --- a/recipes/mozilla/firefox-3.0.8/010_FPU_IS_ARM_FPA_xslt.diff +++ /dev/null @@ -1,56 +0,0 @@ -# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler -# ---- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 -+++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 -@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask - /** - * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: - * ARM is a little endian architecture but 64 bit double words are stored - * differently: the 32 bit words are in little endian byte order, the two words - * are stored in big endian`s way. - */ - - #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) --#define CPU_IS_ARM -+#if !defined(__VFP_FP__) -+#define FPU_IS_ARM_FPA -+#endif - #endif - - #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 - /** - * This version of the macros is safe for the alias optimizations - * that gcc does, but uses gcc-specific extensions. - */ - - typedef union txdpun { - PRFloat64 d; - struct { --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - PRUint32 lo, hi; - #else - PRUint32 hi, lo; - #endif - } s; - } txdpun; - - #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) - #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) - - #else // __GNUC__ - - /* We don't know of any non-gcc compilers that perform alias optimization, - * so this code should work. - */ - --#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) -+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) - #else - #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) - #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) - #endif - - #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.0.8/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.8/Bug339782.additional.fix.diff deleted file mode 100644 index 0848e730d3..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug339782.additional.fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -# XPTC_InvokeByIndex crashes -# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) -Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -=================================================================== ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -51,22 +51,32 @@ - #ifdef __ARM_EABI__ - #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) - #define VAR_STACK_SIZE_64 3 - #else - #define DOUBLEWORD_ALIGN(p) (p) - #define VAR_STACK_SIZE_64 2 - #endif - -+#ifdef __ARM_EABI__ -+#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) -+#else -+#define DOUBLEWORD_ALIGN(p) (p) -+#endif -+ - // Remember that these 'words' are 32bit DWORDS - - static PRUint32 - invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) - { - PRUint32 result = 0; -+ -+ /* Note that we give a "worst case" estimate of how much stack _might_ be -+ * needed, rather than the real count - this should be safe */ -+ - for(PRUint32 i = 0; i < paramCount; i++, s++) - { - if(s->IsPtrData()) - { - result++; - continue; - } - switch(s->type) diff --git a/recipes/mozilla/firefox-3.0.8/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.8/Bug385583.nspr.jmp_buf.eabi.diff deleted file mode 100644 index 486440c30e..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug385583.nspr.jmp_buf.eabi.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h ---- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 -+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 -@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); - #error "Linux/MIPS pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - --#elif defined(__arm__) --/* ARM/Linux */ -+#elif defined(__arm__) && !defined(__ARM_EABI__) -+/* ARM/Linux (old-ABI) */ - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] - #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) -@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); - #error "ARM/Linux pre-glibc2 not supported yet" - #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ - -+#elif defined(__arm__) && defined(__ARM_EABI__) -+/* ARM/Linux (EABI) */ -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] -+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) -+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) -+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) -+#define _MD_SP_TYPE __ptr_t -+#else -+#error "ARM/Linux pre-glibc2 not supported yet" -+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ -+ - #else - - #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.0.8/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.0.8/Bug405992.atomic.nspr.diff deleted file mode 100644 index f54f916a6a..0000000000 --- a/recipes/mozilla/firefox-3.0.8/Bug405992.atomic.nspr.diff +++ /dev/null @@ -1,48 +0,0 @@ -# Add atomic operations for ARM. -diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h -index 5b794c5..cb8d58e 100644 ---- a/nsprpub/pr/include/md/_linux.h -+++ b/nsprpub/pr/include/md/_linux.h -@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); - }) - #endif - -+#if defined(__arm__) -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+ -+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); -+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) -+ -+#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) -+#define _MD_ATOMIC_ADD(ptr, n) \ -+ ({ \ -+ PRInt32 ov, nv; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ nv = ov + (n); \ -+ } \ -+ while (__kernel_cmpxchg(ov, nv, vp)); \ -+ \ -+ nv; \ -+ }) -+#define _MD_ATOMIC_SET(ptr, nv) \ -+ ({ \ -+ PRInt32 ov; \ -+ volatile PRInt32 *vp = (ptr); \ -+ \ -+ do { \ -+ ov = *vp; \ -+ } \ -+ while (__kernel_cmpxchg(ov, (nv), vp)); \ -+ \ -+ ov; \ -+ }) -+#endif -+ - #define USE_SETJMP - #if defined(__GLIBC__) && __GLIBC__ >= 2 - #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.0.8/configure-wchart.patch b/recipes/mozilla/firefox-3.0.8/configure-wchart.patch deleted file mode 100644 index 36ee2a0ba4..0000000000 --- a/recipes/mozilla/firefox-3.0.8/configure-wchart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in 2008-04-15 12:56:35.000000000 +0300 -+++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 -@@ -2743,7 +2743,7 @@ - - AC_CACHE_CHECK(for compiler -fshort-wchar option, - ac_cv_have_usable_wchar_option_v2, -- [AC_TRY_LINK([#include <stddef.h> -+ [AC_TRY_COMPILE([#include <stddef.h> - $configure_static_assert_macros], - [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.0.8/jemalloc-tls.patch b/recipes/mozilla/firefox-3.0.8/jemalloc-tls.patch deleted file mode 100644 index d1d740989e..0000000000 --- a/recipes/mozilla/firefox-3.0.8/jemalloc-tls.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 -+++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 -@@ -386,7 +386,7 @@ - #else - # define NO_TLS - #endif --#if 0 -+ - #ifdef __i386__ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 -@@ -420,7 +420,6 @@ - # define QUANTUM_2POW_MIN 4 - # define SIZEOF_PTR_2POW 2 - #endif --#endif - - #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) - -@@ -2582,7 +2581,7 @@ - * knowledge of how _pthread_self() calculates values, we can't - * easily do much better than this. - */ -- ind = (unsigned long) _pthread_self() % narenas; -+ ind = 255255 % narenas; - - /* - * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.0.8/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.8/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/recipes/mozilla/firefox-3.0.8/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.0.8/linkage-problem.patch b/recipes/mozilla/firefox-3.0.8/linkage-problem.patch deleted file mode 100644 index 28bffd1e22..0000000000 --- a/recipes/mozilla/firefox-3.0.8/linkage-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 -+++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 -@@ -229,6 +229,11 @@ - $(NULL) - endif - -+ifdef MOZ_ENABLE_XFT -+EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ -+ $(NULL) -+endif -+ - ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) - EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ - $(NULL) diff --git a/recipes/mozilla/firefox-3.0.8/mozconfig b/recipes/mozilla/firefox-3.0.8/mozconfig deleted file mode 100644 index d8d3f3923d..0000000000 --- a/recipes/mozilla/firefox-3.0.8/mozconfig +++ /dev/null @@ -1,72 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -#ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-bz2 -#ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-updater - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui -ac_add_options --enable-debugger-info-modules - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource - -# build minimal set of image decoders -#ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O2 - -# Use cairo from system -ac_add_options --enable-system-cairo - -# Disable jemalloc -ac_add_options --disable-jemalloc - -# enable libxul -ac_add_options --enable-libxul - -# Disable striping -ac_add_options --disable-strip -ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.0.8/security-cross.patch b/recipes/mozilla/firefox-3.0.8/security-cross.patch deleted file mode 100644 index e1c988d7e6..0000000000 --- a/recipes/mozilla/firefox-3.0.8/security-cross.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,93 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else --ifeq (,$(filter-out i%86,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --else -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = $(OS_TEST) --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb deleted file mode 100644 index 0e62cbe2f7..0000000000 --- a/recipes/mozilla/firefox_3.0.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -DEPENDS += "cairo" -PR = "r9" - -SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://jsautocfg.h \ - file://security-cross.patch \ - file://jsautocfg-dontoverwrite.patch \ - file://Bug339782.additional.fix.diff \ - file://Bug385583.nspr.jmp_buf.eabi.diff \ - file://Bug405992.atomic.nspr.diff \ - file://random_to_urandom.diff \ - file://jemalloc-tls.patch \ - file://wchart.diff \ - file://0001-Remove-Werror-from-build.patch \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ - file://use-native-bpp.patch \ -" - -S = "${WORKDIR}/mozilla" - -#DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - - -SRC_URI[md5sum] = "406d67174f8f74ab154a1b17d0881b27" -SRC_URI[sha256sum] = "e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33" diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb deleted file mode 100644 index 988c435aba..0000000000 --- a/recipes/mozilla/firefox_3.0.4.bb +++ /dev/null @@ -1,47 +0,0 @@ -DEPENDS += "cairo" -PR = "r1" - -SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://jsautocfg.h \ - file://security-cross.patch \ - file://jsautocfg-dontoverwrite.patch \ - file://Bug339782.additional.fix.diff \ - file://Bug385583.nspr.jmp_buf.eabi.diff \ - file://Bug405992.atomic.nspr.diff \ - file://random_to_urandom.diff \ - file://jemalloc-tls.patch \ - file://0001-Remove-Werror-from-build.patch \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ - file://plugins-dir.patch \ -" - -S = "${WORKDIR}/mozilla" - -# This is missing the wchart.diff patch and can't be compiled with a recent gcc -DEFAULT_PREFERENCE = "-1" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "8a1ac4a5940108a96458c5307a74c98d" -SRC_URI[sha256sum] = "685df7c7f33fc71a8c2d0fb71e190d59e2dd92007c2ace1ad176e655fb3012d7" diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb deleted file mode 100644 index a4659eca10..0000000000 --- a/recipes/mozilla/firefox_3.0.8.bb +++ /dev/null @@ -1,47 +0,0 @@ -DEPENDS += "cairo" -PR = "r1" - -# Fails to build with gcc 4.3.x due to wchar problems: -# /OE/angstrom-dev/cross/armv7a/lib/gcc/arm-angstrom-linux-gnueabi/4.3.1/../../../../arm-angstrom-linux-gnueabi/bin/ld: ERROR: mozilla-xremote-client.o: Conflicting definitions of wchar_t -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://jsautocfg.h \ - file://security-cross.patch \ - file://jsautocfg-dontoverwrite.patch \ - file://Bug339782.additional.fix.diff \ - file://Bug385583.nspr.jmp_buf.eabi.diff \ - file://Bug405992.atomic.nspr.diff \ - file://jemalloc-tls.patch \ - file://0001-Remove-Werror-from-build.patch \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch \ - file://plugins-dir.patch \ -" - -S = "${WORKDIR}/mozilla" - -inherit mozilla -require firefox.inc - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - install -d ${STAGING_INCDIR}/firefox-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h -} - -SRC_URI[md5sum] = "5fb6c6f3e973516df83a573348377a2f" -SRC_URI[sha256sum] = "e0c279546d99d3d21c30cdae6649e0d3710a5db44edd1347b4f31e04cb729040" |