diff -u xulrunner-1.8.1.11/debian/patches/00list xulrunner-1.8.1.11/debian/patches/00list --- xulrunner-1.8.1.11/debian/patches/00list +++ xulrunner-1.8.1.11/debian/patches/00list @@ -77,2 +77,5 @@ 85_xpcomglue +88_force-no-pragma-visibility-for-gcc-4.2_4.3 +88_bz384304_lp117575_linkrecursion_fix_in_startscript +88_bz399589_fix_missing_symbol_with_new_nss 99_configure diff -u xulrunner-1.8.1.11/debian/patches/99_configure.dpatch xulrunner-1.8.1.11/debian/patches/99_configure.dpatch --- xulrunner-1.8.1.11/debian/patches/99_configure.dpatch +++ xulrunner-1.8.1.11/debian/patches/99_configure.dpatch @@ -5,12 +5,10 @@ ## DP: autoconf @DPATCH@ - -diff --git a/configure b/configure -index 456f34d..7ac4b92 100755 ---- a/configure -+++ b/configure -@@ -57,9 +57,14 @@ ac_help="$ac_help +diff -urNad xulrunner-1.8.1.11-1ubuntu1~/configure xulrunner-1.8.1.11-1ubuntu1/configure +--- xulrunner-1.8.1.11-1ubuntu1~/configure 2007-12-02 11:01:44.000000000 +0100 ++++ xulrunner-1.8.1.11-1ubuntu1/configure 2007-12-05 21:39:56.000000000 +0100 +@@ -57,9 +57,14 @@ --with-system-zlib[=PFX] Use system libz [installed at prefix PFX]" ac_help="$ac_help @@ -25,7 +23,7 @@ --with-java-include-path=dir Location of Java SDK headers" ac_help="$ac_help --with-java-bin-path=dir Location of Java binaries (java, javac, jar)" -@@ -217,6 +222,10 @@ ac_help="$ac_help +@@ -217,6 +222,10 @@ ac_help="$ac_help --disable-tests Do not build test libraries & programs" ac_help="$ac_help @@ -36,7 +34,7 @@ --enable-xpcom-lea Use Lea malloc in xpcom " ac_help="$ac_help --enable-places Enable 'places' bookmark/history implementation" -@@ -231,6 +240,11 @@ ac_help="$ac_help +@@ -231,6 +240,11 @@ ac_help="$ac_help --enable-js-ultrasparc Use UltraSPARC optimizations in JS" ac_help="$ac_help @@ -48,7 +46,7 @@ --enable-debug[=DBG] Enable building with developer debug info (Using compiler flags DBG)" ac_help="$ac_help -@@ -960,7 +974,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +@@ -960,7 +974,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 @@ -57,7 +55,7 @@ host_alias=$host case "$host_alias" in -@@ -981,7 +995,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +@@ -981,7 +995,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 @@ -66,7 +64,7 @@ target_alias=$target case "$target_alias" in -@@ -999,7 +1013,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +@@ -999,7 +1013,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 @@ -75,7 +73,7 @@ build_alias=$build case "$build_alias" in -@@ -1069,12 +1083,12 @@ GCONF_VERSION=1.2.1 +@@ -1069,12 +1083,12 @@ LIBGNOME_VERSION=2.0 MISSING_X= @@ -90,7 +88,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1172,7 +1186,7 @@ do +@@ -1172,7 +1186,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 @@ -99,7 +97,7 @@ if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1214,7 +1228,7 @@ do +@@ -1214,7 +1228,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 @@ -108,7 +106,7 @@ if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1285,13 +1299,13 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then +@@ -1285,13 +1299,13 @@ _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 @@ -124,7 +122,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1326,13 +1340,13 @@ test -n "$HOST_CC" || HOST_CC="""" +@@ -1326,13 +1340,13 @@ fi echo "$ac_t""$HOST_CC" 1>&6 echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 @@ -140,7 +138,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1381,7 +1395,7 @@ do +@@ -1381,7 +1395,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 @@ -149,7 +147,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1416,7 +1430,7 @@ do +@@ -1416,7 +1430,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 @@ -158,7 +156,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1451,16 +1465,16 @@ test -n "$HOST_AR" || HOST_AR="ar" +@@ -1451,16 +1465,16 @@ LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 @@ -178,7 +176,7 @@ rm -rf conftest* ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 else -@@ -1475,16 +1489,16 @@ rm -f conftest* +@@ -1475,16 +1489,16 @@ CFLAGS="$HOST_CXXFLAGS" echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 @@ -198,7 +196,7 @@ rm -rf conftest* ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 else -@@ -1513,7 +1527,7 @@ do +@@ -1513,7 +1527,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 @@ -207,7 +205,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1547,7 +1561,7 @@ test -n "$CC" || CC=":" +@@ -1547,7 +1561,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 @@ -216,7 +214,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1577,7 +1591,7 @@ if test -z "$CC"; then +@@ -1577,7 +1591,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 @@ -225,7 +223,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1628,7 +1642,7 @@ fi +@@ -1628,7 +1642,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 @@ -234,7 +232,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1660,7 +1674,7 @@ fi +@@ -1660,7 +1674,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 @@ -243,7 +241,7 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1671,12 +1685,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -1671,12 +1685,12 @@ cat > conftest.$ac_ext << EOF @@ -258,7 +256,7 @@ 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 -@@ -1702,12 +1716,12 @@ if test $ac_cv_prog_cc_works = no; then +@@ -1702,12 +1716,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 @@ -273,7 +271,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1716,7 +1730,7 @@ else +@@ -1716,7 +1730,7 @@ yes; #endif EOF @@ -282,7 +280,7 @@ ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -@@ -1735,7 +1749,7 @@ ac_test_CFLAGS="${CFLAGS+set}" +@@ -1735,7 +1749,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 @@ -291,7 +289,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1771,7 +1785,7 @@ do +@@ -1771,7 +1785,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 @@ -300,7 +298,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1807,7 +1821,7 @@ do +@@ -1807,7 +1821,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 @@ -309,7 +307,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1839,7 +1853,7 @@ test -n "$CXX" || CXX="gcc" +@@ -1839,7 +1853,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 @@ -318,7 +316,7 @@ ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1850,12 +1864,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -1850,12 +1864,12 @@ cat > conftest.$ac_ext << EOF @@ -333,7 +331,7 @@ 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 -@@ -1881,12 +1895,12 @@ if test $ac_cv_prog_cxx_works = no; then +@@ -1881,12 +1895,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 @@ -348,7 +346,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1895,7 +1909,7 @@ else +@@ -1895,7 +1909,7 @@ yes; #endif EOF @@ -357,7 +355,7 @@ ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -@@ -1914,7 +1928,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" +@@ -1914,7 +1928,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 @@ -366,7 +364,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1945,57 +1959,6 @@ else +@@ -1945,57 +1959,6 @@ fi fi @@ -424,7 +422,7 @@ case "$build:$target" in powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -2009,7 +1972,7 @@ do +@@ -2009,7 +1972,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 @@ -433,7 +431,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2044,7 +2007,7 @@ do +@@ -2044,7 +2007,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 @@ -442,7 +440,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2079,7 +2042,7 @@ do +@@ -2079,7 +2042,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 @@ -451,7 +449,7 @@ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2120,7 +2083,7 @@ do +@@ -2120,7 +2083,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 @@ -460,7 +458,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2155,7 +2118,7 @@ do +@@ -2155,7 +2118,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 @@ -469,7 +467,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2190,7 +2153,7 @@ do +@@ -2190,7 +2153,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 @@ -478,7 +476,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2228,7 +2191,7 @@ else +@@ -2228,7 +2191,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 @@ -487,7 +485,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2258,7 +2221,7 @@ if test -z "$CC"; then +@@ -2258,7 +2221,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 @@ -496,7 +494,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2309,7 +2272,7 @@ fi +@@ -2309,7 +2272,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 @@ -505,7 +503,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2341,7 +2304,7 @@ fi +@@ -2341,7 +2304,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 @@ -514,7 +512,7 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2352,12 +2315,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -2352,12 +2315,12 @@ cat > conftest.$ac_ext << EOF @@ -529,7 +527,7 @@ 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 -@@ -2383,12 +2346,12 @@ if test $ac_cv_prog_cc_works = no; then +@@ -2383,12 +2346,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 @@ -544,7 +542,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2397,7 +2360,7 @@ else +@@ -2397,7 +2360,7 @@ yes; #endif EOF @@ -553,7 +551,7 @@ ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -@@ -2416,7 +2379,7 @@ ac_test_CFLAGS="${CFLAGS+set}" +@@ -2416,7 +2379,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 @@ -562,7 +560,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2452,7 +2415,7 @@ do +@@ -2452,7 +2415,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 @@ -571,7 +569,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2484,7 +2447,7 @@ test -n "$CXX" || CXX="gcc" +@@ -2484,7 +2447,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 @@ -580,7 +578,7 @@ ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2495,12 +2458,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -2495,12 +2458,12 @@ cat > conftest.$ac_ext << EOF @@ -595,7 +593,7 @@ 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 -@@ -2526,12 +2489,12 @@ if test $ac_cv_prog_cxx_works = no; then +@@ -2526,12 +2489,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 @@ -610,7 +608,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2540,7 +2503,7 @@ else +@@ -2540,7 +2503,7 @@ yes; #endif EOF @@ -619,7 +617,7 @@ ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -@@ -2559,7 +2522,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" +@@ -2559,7 +2522,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 @@ -628,7 +626,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2590,61 +2553,10 @@ else +@@ -2590,61 +2553,10 @@ fi fi @@ -691,7 +689,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2676,7 +2588,7 @@ do +@@ -2676,7 +2588,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 @@ -700,7 +698,7 @@ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2717,7 +2629,7 @@ do +@@ -2717,7 +2629,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 @@ -709,7 +707,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2752,7 +2664,7 @@ do +@@ -2752,7 +2664,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 @@ -718,7 +716,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2787,7 +2699,7 @@ do +@@ -2787,7 +2699,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 @@ -727,7 +725,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2822,7 +2734,7 @@ do +@@ -2822,7 +2734,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 @@ -736,7 +734,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2911,7 +2823,7 @@ do +@@ -2911,7 +2823,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 @@ -745,7 +743,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2953,14 +2865,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a +@@ -2953,14 +2865,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5 -@@ -2978,14 +2890,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -2978,14 +2890,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5 -@@ -3041,7 +2953,7 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -3041,7 +2953,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 @@ -788,7 +786,7 @@ 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 -@@ -3063,9 +2975,9 @@ echo "configure:3045: checking for midl flags" >&5 +@@ -3063,9 +2975,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 @@ -800,7 +798,7 @@ #include "confdefs.h" #include int main() { -@@ -3077,7 +2989,7 @@ int main() { +@@ -3077,7 +2989,7 @@ ; return 0; } EOF @@ -809,7 +807,7 @@ rm -rf conftest* res=yes else -@@ -3093,7 +3005,7 @@ rm -f conftest* +@@ -3093,7 +3005,7 @@ fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 @@ -818,7 +816,7 @@ _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 }'` -@@ -3120,7 +3032,7 @@ if test -n "$_WIN32_MSVC"; then +@@ -3120,7 +3032,7 @@ SKIP_COMPILER_CHECKS=1 SKIP_LIBRARY_CHECKS=1 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 @@ -827,7 +825,7 @@ # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -3135,13 +3047,13 @@ else +@@ -3135,13 +3047,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 @@ -896,7 +894,7 @@ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -3244,10 +3156,10 @@ fi +@@ -3244,10 +3156,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 @@ -909,7 +907,7 @@ fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -3259,16 +3171,16 @@ else +@@ -3259,16 +3171,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' @@ -931,7 +929,7 @@ then # cc works too. : -@@ -3304,7 +3216,7 @@ fi +@@ -3304,7 +3216,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 @@ -940,7 +938,7 @@ # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -3319,13 +3231,13 @@ else +@@ -3319,13 +3231,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 @@ -997,7 +995,7 @@ if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3397,12 +3309,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -3397,12 +3309,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <&6 @@ -1021,7 +1019,7 @@ if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3502,7 +3414,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +@@ -3502,7 +3414,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 @@ -1030,7 +1028,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3527,7 +3439,7 @@ do +@@ -3527,7 +3439,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 @@ -1039,7 +1037,7 @@ if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3567,7 +3479,7 @@ if test -z "$PERL" || test "$PERL" = ":"; then +@@ -3567,7 +3479,7 @@ fi echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 @@ -1048,7 +1046,7 @@ _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 -@@ -3577,7 +3489,7 @@ if test "$_perl_res" != 0; then +@@ -3577,7 +3489,7 @@ fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 @@ -1057,7 +1055,7 @@ _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 -@@ -3590,7 +3502,7 @@ fi +@@ -3590,7 +3502,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 @@ -1066,7 +1064,7 @@ if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3626,7 +3538,7 @@ fi +@@ -3626,7 +3538,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 @@ -1075,7 +1073,7 @@ if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3662,7 +3574,7 @@ fi +@@ -3662,7 +3574,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 @@ -1084,7 +1082,7 @@ if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3698,7 +3610,7 @@ fi +@@ -3698,7 +3610,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 @@ -1093,7 +1091,7 @@ if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3731,53 +3643,10 @@ else +@@ -3731,53 +3643,10 @@ echo "$ac_t""no" 1>&6 fi @@ -1148,7 +1146,7 @@ if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3812,7 +3681,7 @@ fi +@@ -3812,7 +3681,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 @@ -1157,7 +1155,7 @@ if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3875,7 +3744,7 @@ do +@@ -3875,7 +3744,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 @@ -1166,7 +1164,7 @@ if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3925,7 +3794,7 @@ done +@@ -3925,7 +3794,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 @@ -1175,7 +1173,7 @@ if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4029,7 +3898,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; +@@ -4029,7 +3898,7 @@ fi echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 @@ -1184,7 +1182,7 @@ ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -@@ -4038,7 +3907,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -4038,7 +3907,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { return 0; } -@@ -4046,7 +3915,7 @@ int main() { +@@ -4046,7 +3915,7 @@ result=yes ; return 0; } EOF @@ -1202,7 +1200,7 @@ rm -rf conftest* result=no else -@@ -4071,7 +3940,7 @@ do +@@ -4071,7 +3940,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 @@ -1211,7 +1209,7 @@ if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4114,7 +3983,7 @@ do +@@ -4114,7 +3983,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 @@ -1220,7 +1218,7 @@ if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4182,7 +4051,7 @@ if test "$COMPILE_ENVIRONMENT"; then +@@ -4182,7 +4051,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 @@ -1229,7 +1227,7 @@ # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then -@@ -4244,12 +4113,12 @@ if test "$ac_x_includes" = NO; then +@@ -4244,12 +4113,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < conftest.$ac_ext </dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 @@ -1282,7 +1280,7 @@ rm -rf conftest* ac_R_nospace=yes else -@@ -4457,14 +4326,14 @@ rm -f conftest* +@@ -4457,14 +4326,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&6 @@ -1308,7 +1306,7 @@ 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 -@@ -4504,7 +4373,7 @@ else +@@ -4504,7 +4373,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&6 @@ -1335,7 +1333,7 @@ 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 -@@ -4548,7 +4417,7 @@ else +@@ -4548,7 +4417,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&6 @@ -1368,7 +1366,7 @@ #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ -@@ -4622,7 +4491,7 @@ gethostbyname(); +@@ -4622,7 +4491,7 @@ ; return 0; } EOF @@ -1377,7 +1375,7 @@ rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else -@@ -4643,7 +4512,7 @@ fi +@@ -4643,7 +4512,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 @@ -1386,7 +1384,7 @@ 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 -@@ -4651,7 +4520,7 @@ else +@@ -4651,7 +4520,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&6 @@ -1419,7 +1417,7 @@ #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ -@@ -4726,7 +4595,7 @@ connect(); +@@ -4726,7 +4595,7 @@ ; return 0; } EOF @@ -1428,7 +1426,7 @@ rm -rf conftest* eval "ac_cv_func_connect=yes" else -@@ -4747,7 +4616,7 @@ fi +@@ -4747,7 +4616,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 @@ -1437,7 +1435,7 @@ 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 -@@ -4755,7 +4624,7 @@ else +@@ -4755,7 +4624,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&6 @@ -1470,7 +1468,7 @@ #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ -@@ -4824,7 +4693,7 @@ remove(); +@@ -4824,7 +4693,7 @@ ; return 0; } EOF @@ -1479,7 +1477,7 @@ rm -rf conftest* eval "ac_cv_func_remove=yes" else -@@ -4845,7 +4714,7 @@ fi +@@ -4845,7 +4714,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 @@ -1488,7 +1486,7 @@ 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 -@@ -4853,7 +4722,7 @@ else +@@ -4853,7 +4722,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&6 @@ -1521,7 +1519,7 @@ #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ -@@ -4922,7 +4791,7 @@ shmat(); +@@ -4922,7 +4791,7 @@ ; return 0; } EOF @@ -1530,7 +1528,7 @@ rm -rf conftest* eval "ac_cv_func_shmat=yes" else -@@ -4943,7 +4812,7 @@ fi +@@ -4943,7 +4812,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 @@ -1539,7 +1537,7 @@ 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 -@@ -4951,7 +4820,7 @@ else +@@ -4951,7 +4820,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&6 @@ -1566,7 +1564,7 @@ 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 -@@ -5006,7 +4875,7 @@ else +@@ -5006,7 +4875,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&6 @@ -1664,7 +1662,7 @@ if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5475,14 +5355,14 @@ LOOP_INPUT +@@ -5475,14 +5355,14 @@ LDFLAGS=$force LIBS=$unforce cat > conftest.$ac_ext <&6 @@ -1690,7 +1688,7 @@ if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5529,14 +5409,14 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -5529,14 +5409,14 @@ ac_cv_static_assertion_macros_work="yes" cat > conftest.$ac_ext <&5 -@@ -5546,14 +5426,14 @@ else +@@ -5546,14 +5426,14 @@ fi rm -f conftest* cat > conftest.$ac_ext <&6 @@ -1778,7 +1776,7 @@ rm -rf conftest* result="yes" else -@@ -5716,7 +5596,7 @@ case "$host" in +@@ -5716,7 +5596,7 @@ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' ;; @@ -1787,7 +1785,7 @@ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -@@ -5795,9 +5675,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -5795,9 +5675,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 @@ -1799,7 +1797,7 @@ #include "confdefs.h" int main() { -@@ -5806,7 +5686,7 @@ int main() { +@@ -5806,7 +5686,7 @@ #endif ; return 0; } EOF @@ -1808,7 +1806,7 @@ rm -rf conftest* _BAD_COMPILER= else -@@ -5844,17 +5724,17 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -5844,17 +5724,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1829,7 +1827,7 @@ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5889,14 +5769,14 @@ EOF +@@ -5889,14 +5769,14 @@ *-beos*) no_x=yes @@ -1846,7 +1844,7 @@ 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 -@@ -5904,14 +5784,14 @@ else +@@ -5904,14 +5784,14 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&6 @@ -1872,7 +1870,7 @@ 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 -@@ -5940,14 +5820,14 @@ else +@@ -5940,14 +5820,14 @@ ac_save_LIBS="$LIBS" LIBS="-lzeta $LIBS" cat > conftest.$ac_ext <&6 @@ -1911,7 +1909,7 @@ rm -rf conftest* _HAVE_DEAD_STRIP=1 else -@@ -6165,8 +6045,6 @@ EOF +@@ -6165,8 +6045,6 @@ MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 ;; mips*) @@ -1920,7 +1918,7 @@ ;; esac ;; -@@ -6225,6 +6103,7 @@ EOF +@@ -6225,6 +6103,7 @@ MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' @@ -1928,7 +1926,7 @@ OBJ_SUFFIX=obj RANLIB='echo not_ranlib' STRIP='echo not_strip' -@@ -6314,6 +6193,7 @@ EOF +@@ -6314,6 +6193,7 @@ RCFLAGS='-O coff --use-temp-file' MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)' MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' @@ -1936,7 +1934,7 @@ MOZ_PNG_LIBS='-L$(DIST)/lib -lpng' MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)' MOZ_FIX_LINK_PATHS= -@@ -6353,6 +6233,7 @@ EOF +@@ -6353,6 +6233,7 @@ MOZ_OPTIMIZE_FLAGS='-O1' MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' @@ -1944,7 +1942,7 @@ MOZ_PNG_LIBS='$(DIST)/lib/png.lib' MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' MOZ_FIX_LINK_PATHS= -@@ -6580,8 +6461,8 @@ EOF +@@ -6580,8 +6461,8 @@ if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -1955,7 +1953,7 @@ ;; *-nto*) -@@ -6796,6 +6677,7 @@ EOF +@@ -6796,6 +6677,7 @@ LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)' @@ -1963,7 +1961,7 @@ MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)' MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)' MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)' -@@ -6804,8 +6686,8 @@ EOF +@@ -6804,8 +6686,8 @@ alpha*-*-osf*) if test "$GNU_CC"; then @@ -1974,7 +1972,7 @@ else MOZ_DEBUG_FLAGS='-g' -@@ -6815,8 +6697,8 @@ alpha*-*-osf*) +@@ -6815,8 +6697,8 @@ DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' DSO_CFLAGS= DSO_PIC_CFLAGS= @@ -1985,7 +1983,7 @@ MKSHLIB_FORCE_ALL='-all' MKSHLIB_UNFORCE_ALL='-none' cat >> confdefs.h <<\EOF -@@ -6894,14 +6776,14 @@ EOF +@@ -6894,14 +6776,14 @@ _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" cat > conftest.$ac_ext <&5 -@@ -6912,8 +6794,8 @@ fi +@@ -6912,8 +6794,8 @@ rm -f conftest* fi MOZ_OPTIMIZE_FLAGS="-xO4" @@ -2013,7 +2011,7 @@ MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' MKSHLIB_UNFORCE_ALL='' DSO_LDOPTS='-G -Qoption ld -z,muldefs' -@@ -6929,7 +6811,7 @@ rm -f conftest* +@@ -6929,7 +6811,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 @@ -2022,7 +2020,7 @@ ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -6939,7 +6821,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -6939,7 +6821,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&6 @@ -2058,7 +2056,7 @@ if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7117,12 +6999,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a +@@ -7117,12 +6999,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 @@ -2073,7 +2071,7 @@ #include "confdefs.h" #include #include -@@ -7130,7 +7012,7 @@ else +@@ -7130,7 +7012,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" @@ -2082,7 +2080,7 @@ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -7147,7 +7029,7 @@ rm -f conftest* +@@ -7147,7 +7029,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 -@@ -7165,7 +7047,7 @@ fi +@@ -7165,7 +7047,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 -@@ -7186,7 +7068,7 @@ if test "$cross_compiling" = yes; then +@@ -7186,7 +7068,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7197,7 +7079,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +@@ -7197,7 +7079,7 @@ exit (0); } EOF @@ -2118,7 +2116,7 @@ then : else -@@ -7221,12 +7103,12 @@ EOF +@@ -7221,12 +7103,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 @@ -2133,7 +2131,7 @@ #include "confdefs.h" int main() { -@@ -7275,7 +7157,7 @@ ccp = (char const *const *) p; +@@ -7275,7 +7157,7 @@ ; return 0; } EOF @@ -2142,7 +2140,7 @@ rm -rf conftest* ac_cv_c_const=yes else -@@ -7296,12 +7178,12 @@ EOF +@@ -7296,12 +7178,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 @@ -2157,7 +2155,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7329,12 +7211,12 @@ EOF +@@ -7329,12 +7211,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 @@ -2172,7 +2170,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7362,12 +7244,12 @@ EOF +@@ -7362,12 +7244,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 @@ -2187,7 +2185,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7395,12 +7277,12 @@ EOF +@@ -7395,12 +7277,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 @@ -2202,7 +2200,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7428,12 +7310,12 @@ EOF +@@ -7428,12 +7310,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 @@ -2217,7 +2215,7 @@ #include "confdefs.h" #include #include -@@ -7441,7 +7323,7 @@ int main() { +@@ -7441,7 +7323,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF @@ -2226,7 +2224,7 @@ rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -7462,12 +7344,12 @@ EOF +@@ -7462,12 +7344,12 @@ fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 @@ -2241,7 +2239,7 @@ #include "confdefs.h" #define _POSIX_C_SOURCE 199506L #include -@@ -7475,7 +7357,7 @@ int main() { +@@ -7475,7 +7357,7 @@ siginfo_t* info; ; return 0; } EOF @@ -2250,7 +2248,7 @@ rm -rf conftest* ac_cv_siginfo_t=true else -@@ -7509,12 +7391,12 @@ EOF +@@ -7509,12 +7391,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 @@ -2265,7 +2263,7 @@ #include "confdefs.h" #include #include -@@ -7522,7 +7404,7 @@ int main() { +@@ -7522,7 +7404,7 @@ int16_t foo = 0; ; return 0; } EOF @@ -2274,7 +2272,7 @@ rm -rf conftest* ac_cv_int16_t=true else -@@ -7544,12 +7426,12 @@ else +@@ -7544,12 +7426,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 @@ -2289,7 +2287,7 @@ #include "confdefs.h" #include #include -@@ -7557,7 +7439,7 @@ int main() { +@@ -7557,7 +7439,7 @@ int32_t foo = 0; ; return 0; } EOF @@ -2298,7 +2296,7 @@ rm -rf conftest* ac_cv_int32_t=true else -@@ -7579,12 +7461,12 @@ else +@@ -7579,12 +7461,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 @@ -2313,7 +2311,7 @@ #include "confdefs.h" #include #include -@@ -7592,7 +7474,7 @@ int main() { +@@ -7592,7 +7474,7 @@ int64_t foo = 0; ; return 0; } EOF @@ -2322,7 +2320,7 @@ rm -rf conftest* ac_cv_int64_t=true else -@@ -7614,12 +7496,12 @@ else +@@ -7614,12 +7496,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 @@ -2337,7 +2335,7 @@ #include "confdefs.h" #include #include -@@ -7627,7 +7509,7 @@ int main() { +@@ -7627,7 +7509,7 @@ int64 foo = 0; ; return 0; } EOF @@ -2346,7 +2344,7 @@ rm -rf conftest* ac_cv_int64=true else -@@ -7649,12 +7531,12 @@ else +@@ -7649,12 +7531,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 @@ -2361,7 +2359,7 @@ #include "confdefs.h" #include #include -@@ -7662,7 +7544,7 @@ int main() { +@@ -7662,7 +7544,7 @@ uint foo = 0; ; return 0; } EOF @@ -2370,7 +2368,7 @@ rm -rf conftest* ac_cv_uint=true else -@@ -7684,12 +7566,12 @@ else +@@ -7684,12 +7566,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 @@ -2385,7 +2383,7 @@ #include "confdefs.h" #include #include -@@ -7697,7 +7579,7 @@ int main() { +@@ -7697,7 +7579,7 @@ uint_t foo = 0; ; return 0; } EOF @@ -2394,7 +2392,7 @@ rm -rf conftest* ac_cv_uint_t=true else -@@ -7719,12 +7601,12 @@ else +@@ -7719,12 +7601,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 @@ -2409,7 +2407,7 @@ #include "confdefs.h" #include #include -@@ -7732,7 +7614,7 @@ int main() { +@@ -7732,7 +7614,7 @@ uint16_t foo = 0; ; return 0; } EOF @@ -2418,7 +2416,7 @@ rm -rf conftest* ac_cv_uint16_t=true else -@@ -7763,12 +7645,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -7763,12 +7645,12 @@ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 @@ -2433,7 +2431,7 @@ #include "confdefs.h" #include int main() { -@@ -7776,7 +7658,7 @@ int main() { +@@ -7776,7 +7658,7 @@ (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF @@ -2442,7 +2440,7 @@ rm -rf conftest* ac_cv_have_uname_domainname_field=true else -@@ -7800,12 +7682,12 @@ else +@@ -7800,12 +7682,12 @@ fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 @@ -2457,7 +2455,7 @@ #include "confdefs.h" #include int main() { -@@ -7813,7 +7695,7 @@ int main() { +@@ -7813,7 +7695,7 @@ (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF @@ -2466,7 +2464,7 @@ rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else -@@ -7846,12 +7728,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -7846,12 +7728,12 @@ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 @@ -2481,7 +2479,7 @@ #include "confdefs.h" #include $configure_static_assert_macros -@@ -7860,7 +7742,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); +@@ -7860,7 +7742,7 @@ CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF @@ -2490,7 +2488,7 @@ rm -rf conftest* ac_cv_have_usable_wchar_v2="yes" else -@@ -7893,12 +7775,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -7893,12 +7775,12 @@ CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 @@ -2505,7 +2503,7 @@ #include "confdefs.h" #include $configure_static_assert_macros -@@ -7907,7 +7789,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); +@@ -7907,7 +7789,7 @@ CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF @@ -2514,7 +2512,7 @@ rm -rf conftest* ac_cv_have_usable_wchar_option_v2="yes" else -@@ -7941,7 +7823,7 @@ fi +@@ -7941,7 +7823,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 @@ -2523,7 +2521,7 @@ if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7966,7 +7848,7 @@ EOF +@@ -7966,7 +7848,7 @@ echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 @@ -2532,7 +2530,7 @@ if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7991,7 +7873,7 @@ EOF +@@ -7991,7 +7873,7 @@ echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 @@ -2541,7 +2539,7 @@ if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8016,7 +7898,7 @@ fi +@@ -8016,7 +7898,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 @@ -2550,7 +2548,7 @@ if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8044,7 +7926,7 @@ fi +@@ -8044,7 +7926,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 @@ -2559,853 +2557,863 @@ if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8092,12 +7974,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h +@@ -8074,8 +7956,7 @@ + echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug +@@ -8092,12 +7973,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:8096: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:7978: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7977: 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 < #include <$ac_hdr> -@@ -8105,7 +7987,7 @@ int main() { +@@ -8105,7 +7986,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:8109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -8130,7 +8012,7 @@ done +@@ -8130,7 +8011,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:8134: checking for opendir in -ldir" >&5 -+echo "configure:8016: checking for opendir in -ldir" >&5 ++echo "configure:8015: 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 -@@ -8138,7 +8020,7 @@ else +@@ -8138,7 +8019,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8034: \"$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 -@@ -8171,7 +8053,7 @@ fi +@@ -8171,7 +8052,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:8175: checking for opendir in -lx" >&5 -+echo "configure:8057: checking for opendir in -lx" >&5 ++echo "configure:8056: 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 -@@ -8179,7 +8061,7 @@ else +@@ -8179,7 +8060,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8075: \"$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 -@@ -8222,17 +8104,17 @@ for ac_hdr in sys/byteorder.h compat.h getopt.h +@@ -8222,17 +8103,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8226: checking for $ac_hdr" >&5 -+echo "configure:8108: checking for $ac_hdr" >&5 ++echo "configure:8107: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8117: \"$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* -@@ -8262,17 +8144,17 @@ for ac_hdr in sys/bitypes.h memory.h unistd.h +@@ -8262,17 +8143,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8266: checking for $ac_hdr" >&5 -+echo "configure:8148: checking for $ac_hdr" >&5 ++echo "configure:8147: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8157: \"$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* -@@ -8302,17 +8184,17 @@ for ac_hdr in gnu/libc-version.h nl_types.h +@@ -8302,17 +8183,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8306: checking for $ac_hdr" >&5 -+echo "configure:8188: checking for $ac_hdr" >&5 ++echo "configure:8187: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8197: \"$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* -@@ -8342,17 +8224,17 @@ for ac_hdr in malloc.h +@@ -8342,17 +8223,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8346: checking for $ac_hdr" >&5 -+echo "configure:8228: checking for $ac_hdr" >&5 ++echo "configure:8227: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8237: \"$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* -@@ -8382,17 +8264,17 @@ for ac_hdr in X11/XKBlib.h +@@ -8382,17 +8263,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8386: checking for $ac_hdr" >&5 -+echo "configure:8268: checking for $ac_hdr" >&5 ++echo "configure:8267: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8277: \"$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* -@@ -8423,17 +8305,17 @@ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h +@@ -8423,17 +8304,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8427: checking for $ac_hdr" >&5 -+echo "configure:8309: checking for $ac_hdr" >&5 ++echo "configure:8308: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8318: \"$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* -@@ -8464,17 +8346,17 @@ for ac_hdr in mmintrin.h +@@ -8464,17 +8345,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8468: checking for $ac_hdr" >&5 -+echo "configure:8350: checking for $ac_hdr" >&5 ++echo "configure:8349: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8359: \"$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* -@@ -8511,17 +8393,17 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -8511,17 +8392,17 @@ NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 -echo "configure:8515: checking for new" >&5 -+echo "configure:8397: checking for new" >&5 ++echo "configure:8396: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8406: \"$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* -@@ -8562,17 +8444,17 @@ case $target in +@@ -8562,17 +8443,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8566: checking for $ac_hdr" >&5 -+echo "configure:8448: checking for $ac_hdr" >&5 ++echo "configure:8447: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8457: \"$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* -@@ -8606,7 +8488,7 @@ case $target in +@@ -8606,7 +8487,7 @@ ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:8610: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8492: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8491: 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 -@@ -8614,7 +8496,7 @@ else +@@ -8614,7 +8495,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8510: \"$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 -@@ -8655,7 +8537,7 @@ fi +@@ -8655,7 +8536,7 @@ ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:8659: checking for atan in -lm" >&5 -+echo "configure:8541: checking for atan in -lm" >&5 ++echo "configure:8540: 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 -@@ -8663,7 +8545,7 @@ else +@@ -8663,7 +8544,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8559: \"$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 -@@ -8708,7 +8590,7 @@ case $target in +@@ -8708,7 +8589,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:8712: checking for dlopen in -ldl" >&5 -+echo "configure:8594: checking for dlopen in -ldl" >&5 ++echo "configure:8593: 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 -@@ -8716,7 +8598,7 @@ else +@@ -8716,7 +8597,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8612: \"$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 -@@ -8744,17 +8626,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -8744,17 +8625,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:8748: checking for dlfcn.h" >&5 -+echo "configure:8630: checking for dlfcn.h" >&5 ++echo "configure:8629: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8639: \"$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* -@@ -8790,7 +8672,7 @@ if test ! "$GNU_CXX"; then +@@ -8790,7 +8671,7 @@ case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 -echo "configure:8794: checking for demangle in -lC_r" >&5 -+echo "configure:8676: checking for demangle in -lC_r" >&5 ++echo "configure:8675: 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 -@@ -8798,7 +8680,7 @@ else +@@ -8798,7 +8679,7 @@ ac_save_LIBS="$LIBS" LIBS="-lC_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8694: \"$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 -@@ -8839,7 +8721,7 @@ fi +@@ -8839,7 +8720,7 @@ ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8843: checking for demangle in -lC" >&5 -+echo "configure:8725: checking for demangle in -lC" >&5 ++echo "configure:8724: 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 -@@ -8847,7 +8729,7 @@ else +@@ -8847,7 +8728,7 @@ ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8743: \"$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 -@@ -8889,7 +8771,7 @@ fi +@@ -8889,7 +8770,7 @@ esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8893: checking for socket in -lsocket" >&5 -+echo "configure:8775: checking for socket in -lsocket" >&5 ++echo "configure:8774: 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 -@@ -8897,7 +8779,7 @@ else +@@ -8897,7 +8778,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8793: \"$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 -@@ -8953,7 +8835,7 @@ EOF +@@ -8953,7 +8834,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8957: checking for XDrawLines in -lX11" >&5 -+echo "configure:8839: checking for XDrawLines in -lX11" >&5 ++echo "configure:8838: 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 -@@ -8961,7 +8843,7 @@ else +@@ -8961,7 +8842,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8857: \"$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 -@@ -8994,7 +8876,7 @@ MISSING_X="$MISSING_X -lX11" +@@ -8994,7 +8875,7 @@ fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8998: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8880: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8879: 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 -@@ -9002,7 +8884,7 @@ else +@@ -9002,7 +8883,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8898: \"$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 -@@ -9037,7 +8919,7 @@ fi +@@ -9037,7 +8918,7 @@ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:9041: checking for XtFree in -lXt" >&5 -+echo "configure:8923: checking for XtFree in -lXt" >&5 ++echo "configure:8922: 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 -@@ -9045,7 +8927,7 @@ else +@@ -9045,7 +8926,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8941: \"$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 -@@ -9077,7 +8959,7 @@ else +@@ -9077,7 +8958,7 @@ unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:9081: checking for IceFlush in -lICE" >&5 -+echo "configure:8963: checking for IceFlush in -lICE" >&5 ++echo "configure:8962: 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 -@@ -9085,7 +8967,7 @@ else +@@ -9085,7 +8966,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8981: \"$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 -@@ -9117,7 +8999,7 @@ else +@@ -9117,7 +8998,7 @@ fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:9121: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:9003: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9002: 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 -@@ -9125,7 +9007,7 @@ else +@@ -9125,7 +9006,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9021: \"$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 -@@ -9157,7 +9039,7 @@ else +@@ -9157,7 +9038,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:9161: checking for XtFree in -lXt" >&5 -+echo "configure:9043: checking for XtFree in -lXt" >&5 ++echo "configure:9042: 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 -@@ -9165,7 +9047,7 @@ else +@@ -9165,7 +9046,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9061: \"$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 -@@ -9210,7 +9092,7 @@ fi +@@ -9210,7 +9091,7 @@ esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:9214: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:9096: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9095: checking for XineramaIsActive in -lXinerama" >&5 ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9218,7 +9100,7 @@ else +@@ -9218,7 +9099,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9114: \"$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 -@@ -9251,17 +9133,17 @@ fi +@@ -9251,17 +9132,17 @@ ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 -echo "configure:9255: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:9137: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9136: checking for X11/extensions/Xinerama.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9146: \"$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* -@@ -9284,7 +9166,7 @@ fi +@@ -9284,7 +9165,7 @@ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:9288: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9170: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9169: 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 -@@ -9292,7 +9174,7 @@ else +@@ -9292,7 +9173,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9188: \"$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 -@@ -9325,17 +9207,17 @@ fi +@@ -9325,17 +9206,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:9329: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9211: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9210: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9220: \"$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* -@@ -9365,7 +9247,7 @@ EOF +@@ -9365,7 +9246,7 @@ fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:9369: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9251: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9250: 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 -@@ -9373,7 +9255,7 @@ else +@@ -9373,7 +9254,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9269: \"$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 -@@ -9406,17 +9288,17 @@ fi +@@ -9406,17 +9287,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:9410: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9292: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9291: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9301: \"$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* -@@ -9490,7 +9372,7 @@ fi +@@ -9490,7 +9371,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:9494: checking for $ac_word" >&5 -+echo "configure:9376: checking for $ac_word" >&5 ++echo "configure:9375: 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 -@@ -9526,7 +9408,7 @@ fi +@@ -9526,7 +9407,7 @@ min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:9530: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9412: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9411: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes -@@ -9574,7 +9456,7 @@ else +@@ -9574,7 +9455,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -9600,7 +9482,7 @@ main() +@@ -9600,7 +9481,7 @@ } EOF -if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -9652,7 +9534,7 @@ fi # $no_x +@@ -9652,7 +9533,7 @@ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:9656: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9538: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9537: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9674,7 +9556,7 @@ echo " +@@ -9674,7 +9555,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9678: checking for pthread_create in -lpthread" >&5 -+echo "configure:9560: checking for pthread_create in -lpthread" >&5 ++echo "configure:9559: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9696,7 +9578,7 @@ echo " +@@ -9696,7 +9577,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9700: checking for pthread_create in -lc_r" >&5 -+echo "configure:9582: checking for pthread_create in -lc_r" >&5 ++echo "configure:9581: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9718,7 +9600,7 @@ echo " +@@ -9718,7 +9599,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:9722: checking for pthread_create in -lc" >&5 -+echo "configure:9604: checking for pthread_create in -lc" >&5 ++echo "configure:9603: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9774,7 +9656,7 @@ then +@@ -9774,7 +9655,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:9778: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9660: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9659: 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 -@@ -9797,7 +9679,7 @@ echo "configure:9778: checking whether ${CC-cc} accepts -pthread" >&5 +@@ -9797,7 +9678,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:9801: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9683: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9682: 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 -@@ -9843,7 +9725,7 @@ EOF +@@ -9843,7 +9724,7 @@ fi ;; @@ -3414,165 +3422,165 @@ cat >> confdefs.h <<\EOF #define _REENTRANT 1 EOF -@@ -9919,7 +9801,7 @@ esac +@@ -9919,7 +9800,7 @@ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:9923: checking whether mmap() sees write()s" >&5 -+echo "configure:9805: checking whether mmap() sees write()s" >&5 ++echo "configure:9804: checking whether mmap() sees write()s" >&5 mmap_test_prog=' -@@ -9958,11 +9840,11 @@ if test "$cross_compiling" = yes; then +@@ -9958,11 +9839,11 @@ result="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -9987,13 +9869,13 @@ fi +@@ -9987,13 +9868,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:9991: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9873: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9872: 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 < Autoconf TIOCGETP -@@ -10011,7 +9893,7 @@ rm -f conftest* +@@ -10011,7 +9892,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA -@@ -10033,7 +9915,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 +@@ -10033,7 +9914,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:10037: checking for 8-bit clean memcmp" >&5 -+echo "configure:9919: checking for 8-bit clean memcmp" >&5 ++echo "configure:9918: 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 -@@ -10041,7 +9923,7 @@ else +@@ -10041,7 +9922,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9936: \"$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 -@@ -10071,12 +9953,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" +@@ -10071,12 +9952,12 @@ for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10075: checking for $ac_func" >&5 -+echo "configure:9957: checking for $ac_func" >&5 ++echo "configure:9956: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9984: \"$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 -@@ -10126,12 +10008,12 @@ done +@@ -10126,12 +10007,12 @@ for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10130: checking for $ac_func" >&5 -+echo "configure:10012: checking for $ac_func" >&5 ++echo "configure:10011: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10039: \"$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 -@@ -10183,12 +10065,12 @@ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "10 +@@ -10183,12 +10064,12 @@ for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10187: checking for $ac_func" >&5 -+echo "configure:10069: checking for $ac_func" >&5 ++echo "configure:10068: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10096: \"$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 -@@ -10247,19 +10129,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -10247,19 +10128,19 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 -echo "configure:10251: checking for wcrtomb" >&5 -+echo "configure:10133: checking for wcrtomb" >&5 ++echo "configure:10132: 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 < int main() { @@ -3580,22 +3588,22 @@ ; return 0; } EOF -if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else -@@ -10279,19 +10161,19 @@ EOF +@@ -10279,19 +10160,19 @@ fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:10283: checking for mbrtowc" >&5 -+echo "configure:10165: checking for mbrtowc" >&5 ++echo "configure:10164: 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 < int main() { @@ -3603,199 +3611,199 @@ ; return 0; } EOF -if { (eval echo configure:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else -@@ -10320,12 +10202,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -10320,12 +10201,12 @@ fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:10324: checking for res_ninit()" >&5 -+echo "configure:10206: checking for res_ninit()" >&5 ++echo "configure:10205: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10222: \"$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 -@@ -10367,12 +10249,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -10367,12 +10248,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 -echo "configure:10371: checking for gnu_get_libc_version()" >&5 -+echo "configure:10253: checking for gnu_get_libc_version()" >&5 ++echo "configure:10252: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10268: \"$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 -@@ -10412,7 +10294,7 @@ case $target_os in +@@ -10412,7 +10293,7 @@ *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:10416: checking for iconv in -lc" >&5 -+echo "configure:10298: checking for iconv in -lc" >&5 ++echo "configure:10297: 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 -@@ -10420,7 +10302,7 @@ else +@@ -10420,7 +10301,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10319: \"$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 -@@ -10453,7 +10335,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -10453,7 +10334,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:10457: checking for iconv in -liconv" >&5 -+echo "configure:10339: checking for iconv in -liconv" >&5 ++echo "configure:10338: 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 -@@ -10461,7 +10343,7 @@ else +@@ -10461,7 +10342,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10360: \"$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 -@@ -10494,7 +10376,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -10494,7 +10375,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -echo "configure:10498: checking for libiconv in -liconv" >&5 -+echo "configure:10380: checking for libiconv in -liconv" >&5 ++echo "configure:10379: 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 -@@ -10502,7 +10384,7 @@ else +@@ -10502,7 +10383,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10401: \"$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 -@@ -10543,12 +10425,12 @@ fi +@@ -10543,12 +10424,12 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:10547: checking for iconv()" >&5 -+echo "configure:10429: checking for iconv()" >&5 ++echo "configure:10428: 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 < -@@ -10562,7 +10444,7 @@ int main() { +@@ -10562,7 +10443,7 @@ ; return 0; } EOF -if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else -@@ -10586,12 +10468,12 @@ EOF +@@ -10586,12 +10467,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:10590: checking for iconv() with const input" >&5 -+echo "configure:10472: checking for iconv() with const input" >&5 ++echo "configure:10471: 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 < -@@ -10606,7 +10488,7 @@ int main() { +@@ -10606,7 +10487,7 @@ ; return 0; } EOF -if { (eval echo configure:10610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else -@@ -10635,19 +10517,19 @@ esac +@@ -10635,19 +10516,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:10639: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10521: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10520: 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 < int main() { @@ -3803,365 +3811,365 @@ ; return 0; } EOF -if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else -@@ -10679,7 +10561,7 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -10679,7 +10560,7 @@ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:10683: checking for an implementation of va_copy()" >&5 -+echo "configure:10565: checking for an implementation of va_copy()" >&5 ++echo "configure:10564: 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 -@@ -10689,7 +10571,7 @@ else +@@ -10689,7 +10570,7 @@ else cat > conftest.$ac_ext < -@@ -10703,7 +10585,7 @@ else +@@ -10703,7 +10584,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10588: \"$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 -@@ -10720,7 +10602,7 @@ fi +@@ -10720,7 +10601,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:10724: checking for an implementation of __va_copy()" >&5 -+echo "configure:10606: checking for an implementation of __va_copy()" >&5 ++echo "configure:10605: 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 -@@ -10730,7 +10612,7 @@ else +@@ -10730,7 +10611,7 @@ else cat > conftest.$ac_ext < -@@ -10744,7 +10626,7 @@ else +@@ -10744,7 +10625,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10629: \"$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 -@@ -10761,7 +10643,7 @@ fi +@@ -10761,7 +10642,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:10765: checking whether va_lists can be copied by value" >&5 -+echo "configure:10647: checking whether va_lists can be copied by value" >&5 ++echo "configure:10646: 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 -@@ -10771,7 +10653,7 @@ else +@@ -10771,7 +10652,7 @@ else cat > conftest.$ac_ext < -@@ -10785,7 +10667,7 @@ else +@@ -10785,7 +10666,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10670: \"$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 -@@ -10884,7 +10766,7 @@ esac +@@ -10884,7 +10765,7 @@ if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:10888: checking for C++ exceptions flag" >&5 -+echo "configure:10770: checking for C++ exceptions flag" >&5 ++echo "configure:10769: 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 -@@ -10919,12 +10801,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -10919,12 +10800,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 -echo "configure:10923: checking for gcc 3.0 ABI" >&5 -+echo "configure:10805: checking for gcc 3.0 ABI" >&5 ++echo "configure:10804: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else -@@ -10961,12 +10843,12 @@ fi +@@ -10961,12 +10842,12 @@ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:10965: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10847: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10846: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else -@@ -10997,12 +10879,12 @@ EOF +@@ -10997,12 +10878,12 @@ fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:11001: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10883: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10882: 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 < A; +@@ -11021,7 +10902,7 @@ A.foo(0); ; return 0; } EOF -if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else -@@ -11042,12 +10924,12 @@ EOF +@@ -11042,12 +10923,12 @@ fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:11046: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10928: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10927: 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 < struct X { int a; }; class Y {}; -@@ -11057,7 +10939,7 @@ X int_x; +@@ -11057,7 +10938,7 @@ X y_x; ; return 0; } EOF -if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else -@@ -11079,12 +10961,12 @@ fi +@@ -11079,12 +10960,12 @@ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:11083: checking whether partial template specialization works" >&5 -+echo "configure:10965: checking whether partial template specialization works" >&5 ++echo "configure:10964: 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 < class Foo {}; template class Foo {}; -@@ -11092,7 +10974,7 @@ int main() { +@@ -11092,7 +10973,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else -@@ -11113,12 +10995,12 @@ EOF +@@ -11113,12 +10994,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:11117: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:10999: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10998: 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 < class Base { }; template -@@ -11130,7 +11012,7 @@ Derived a, b; +@@ -11130,7 +11011,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else -@@ -11152,12 +11034,12 @@ fi +@@ -11152,12 +11033,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:11156: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11038: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11037: 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 < class Base { }; template class Derived : public Base { }; -@@ -11166,7 +11048,7 @@ int main() { +@@ -11166,7 +11047,7 @@ Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:11170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else -@@ -11187,12 +11069,12 @@ EOF +@@ -11187,12 +11068,12 @@ fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:11191: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11073: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11072: 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 < class ptrClass { -@@ -11213,7 +11095,7 @@ int main() { +@@ -11213,7 +11094,7 @@ a(&i); ; return 0; } EOF -if { (eval echo configure:11217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else -@@ -11235,12 +11117,12 @@ fi +@@ -11235,12 +11116,12 @@ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:11239: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11121: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11120: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else -@@ -11287,12 +11169,12 @@ EOF +@@ -11287,12 +11168,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:11291: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11173: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11172: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else -@@ -11329,19 +11211,19 @@ EOF +@@ -11329,19 +11210,19 @@ fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:11333: checking for \"std::\" namespace" >&5 -+echo "configure:11215: checking for \"std::\" namespace" >&5 ++echo "configure:11214: 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 < int main() { @@ -4169,73 +4177,73 @@ ; return 0; } EOF -if { (eval echo configure:11345: \"$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 ++if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else -@@ -11362,12 +11244,12 @@ EOF +@@ -11362,12 +11243,12 @@ fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:11366: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11248: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11247: 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 < struct T1 {}; -@@ -11377,7 +11259,7 @@ int main() { +@@ -11377,7 +11258,7 @@ T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else -@@ -11399,12 +11281,12 @@ fi +@@ -11399,12 +11280,12 @@ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:11403: checking for C++ reinterpret_cast" >&5 -+echo "configure:11285: checking for C++ reinterpret_cast" >&5 ++echo "configure:11284: 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 <(z); ; return 0; } EOF -if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else -@@ -11433,7 +11315,7 @@ EOF +@@ -11433,7 +11314,7 @@ fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:11437: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11319: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11318: 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 -@@ -11441,8 +11323,11 @@ else +@@ -11441,8 +11322,11 @@ ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11345: \"$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 -@@ -11481,19 +11366,19 @@ fi +@@ -11481,19 +11365,19 @@ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:11485: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11370: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11369: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11381: \"$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 -@@ -11516,12 +11401,12 @@ fi +@@ -11516,12 +11400,12 @@ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:11520: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11405: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11404: 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 < template class Foo {}; -@@ -11532,7 +11417,7 @@ int main() { +@@ -11532,7 +11416,7 @@ Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else -@@ -11564,19 +11449,19 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -11564,19 +11448,19 @@ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:11568: checking for LC_MESSAGES" >&5 -+echo "configure:11453: checking for LC_MESSAGES" >&5 ++echo "configure:11452: 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 < int main() { @@ -4318,74 +4326,83 @@ ; return 0; } EOF -if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11465: \"$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_i18n_lc_messages=yes else -@@ -11657,7 +11542,7 @@ fi +@@ -11657,7 +11541,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:11661: checking for $ac_word" >&5 -+echo "configure:11546: checking for $ac_word" >&5 ++echo "configure:11545: 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 -@@ -11692,7 +11577,7 @@ fi +@@ -11692,7 +11576,7 @@ min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 -echo "configure:11696: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11581: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11580: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then -@@ -11794,7 +11679,7 @@ fi +@@ -11794,7 +11678,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:11798: checking for $ac_word" >&5 -+echo "configure:11683: checking for $ac_word" >&5 ++echo "configure:11682: 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 -@@ -11829,7 +11714,7 @@ fi +@@ -11829,7 +11713,7 @@ min_nss_version=3.0.0 echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 -echo "configure:11833: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+echo "configure:11718: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11717: checking for NSS - version >= $min_nss_version (skipping)" >&5 no_nss="" if test "$NSS_CONFIG" = "no"; then -@@ -11902,7 +11787,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then +@@ -11861,7 +11745,7 @@ + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS=" -lcrmf $NSS_LIBS" + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ +@@ -11902,7 +11786,7 @@ SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:11906: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11791: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11790: 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 -@@ -11910,7 +11795,7 @@ else +@@ -11910,7 +11794,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11809: \"$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 -@@ -11944,13 +11829,13 @@ fi +@@ -11944,13 +11828,13 @@ fi @@ -4397,47 +4414,47 @@ else cat > conftest.$ac_ext < #include -@@ -11964,7 +11849,7 @@ else +@@ -11964,7 +11848,7 @@ } EOF -if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else -@@ -12005,7 +11890,7 @@ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then +@@ -12005,7 +11889,7 @@ SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:12009: checking for gzread in -lz" >&5 -+echo "configure:11894: checking for gzread in -lz" >&5 ++echo "configure:11893: 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 -@@ -12013,7 +11898,7 @@ else +@@ -12013,7 +11897,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11912: \"$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 -@@ -12046,13 +11931,13 @@ SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS= +@@ -12046,13 +11930,13 @@ fi fi @@ -4449,20 +4466,20 @@ else cat > conftest.$ac_ext < -@@ -12073,7 +11958,7 @@ else +@@ -12073,7 +11957,7 @@ } EOF -if { (eval echo configure:12077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else -@@ -12096,6 +11981,74 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then +@@ -12096,6 +11980,74 @@ ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi @@ -4484,7 +4501,7 @@ + SYSTEM_BZ2= +else + echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 -+echo "configure:12003: checking for BZ2_bzread in -lbz2" >&5 ++echo "configure:12002: 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 @@ -4492,7 +4509,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lbz2 $MOZ_BZ2_LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12021: \"$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 @@ -4537,34 +4554,34 @@ # Check whether --with-system-png or --without-system-png was given. if test "${with_system_png+set}" = set; then withval="$with_system_png" -@@ -12116,7 +12069,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then +@@ -12116,7 +12068,7 @@ SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:12120: checking for png_get_valid in -lpng" >&5 -+echo "configure:12073: checking for png_get_valid in -lpng" >&5 ++echo "configure:12072: 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 -@@ -12124,7 +12077,7 @@ else +@@ -12124,7 +12076,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12091: \"$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 -@@ -12157,13 +12110,13 @@ SYSTEM_PNG= +@@ -12157,13 +12109,13 @@ fi fi @@ -4576,20 +4593,20 @@ else cat > conftest.$ac_ext < #include -@@ -12177,7 +12130,7 @@ else +@@ -12177,7 +12129,7 @@ } EOF -if { (eval echo configure:12181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else -@@ -12202,6 +12155,116 @@ fi +@@ -12202,6 +12154,116 @@ fi # SKIP_LIBRARY_CHECKS @@ -4614,7 +4631,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:12180: checking for $ac_word" >&5 ++echo "configure:12179: 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 @@ -4658,19 +4675,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:12224: checking for hunspell" >&5 ++echo "configure:12223: 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:12231: checking MOZ_HUNSPELL_CFLAGS" >&5 ++echo "configure:12230: 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:12236: checking MOZ_HUNSPELL_LIBS" >&5 ++echo "configure:12235: checking MOZ_HUNSPELL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"hunspell\"` `$PKG_CONFIG --libs-only-l \"hunspell\"`" @@ -4706,75 +4723,75 @@ JAVA_INCLUDE_PATH= # Check whether --with-java-include-path or --without-java-include-path was given. if test "${with_java_include_path+set}" = set; then -@@ -12427,7 +12490,7 @@ fi +@@ -12427,7 +12489,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12431: checking for $ac_word" >&5 -+echo "configure:12494: checking for $ac_word" >&5 ++echo "configure:12493: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -12462,7 +12525,7 @@ fi +@@ -12462,7 +12524,7 @@ min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12466: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:12529: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12528: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes -@@ -12485,7 +12548,7 @@ echo "configure:12466: checking for GTK - version >= $min_gtk_version" >&5 +@@ -12485,7 +12547,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -12563,7 +12626,7 @@ main () +@@ -12563,7 +12625,7 @@ } EOF -if { (eval echo configure:12567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -12598,7 +12661,7 @@ fi +@@ -12598,7 +12660,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < -@@ -12608,7 +12671,7 @@ int main() { +@@ -12608,7 +12670,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; 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:12675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12674: \"$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 GTK or finding the wrong" -@@ -12660,7 +12723,7 @@ then +@@ -12660,7 +12722,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:12664: checking for $ac_word" >&5 -+echo "configure:12727: checking for $ac_word" >&5 ++echo "configure:12726: 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 -@@ -12704,19 +12767,19 @@ fi +@@ -12704,19 +12766,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 >= 1.3.7""... $ac_c" 1>&6 -echo "configure:12708: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12771: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12770: checking for gtk+-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 @@ -4782,40 +4799,40 @@ echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 -echo "configure:12715: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12778: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12777: checking MOZ_GTK2_CFLAGS" >&5 MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 -echo "configure:12720: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12783: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12782: checking MOZ_GTK2_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" -@@ -12781,7 +12844,7 @@ do +@@ -12781,7 +12843,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:12785: checking for $ac_word" >&5 -+echo "configure:12848: checking for $ac_word" >&5 ++echo "configure:12847: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -12833,7 +12896,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -12833,7 +12895,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 -echo "configure:12837: checking for main in -lqt" >&5 -+echo "configure:12900: checking for main in -lqt" >&5 ++echo "configure:12899: checking for main in -lqt" >&5 ac_lib_var=`echo qt'_'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 -@@ -12841,14 +12904,14 @@ else +@@ -12841,14 +12903,14 @@ ac_save_LIBS="$LIBS" LIBS="-lqt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12914: \"$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 -@@ -12867,7 +12930,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -12867,7 +12929,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 -echo "configure:12871: checking for main in -lqt-mt" >&5 -+echo "configure:12934: checking for main in -lqt-mt" >&5 ++echo "configure:12933: checking for main in -lqt-mt" >&5 ac_lib_var=`echo qt-mt'_'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 -@@ -12875,14 +12938,14 @@ else +@@ -12875,14 +12937,14 @@ ac_save_LIBS="$LIBS" LIBS="-lqt-mt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12948: \"$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 -@@ -12918,9 +12981,9 @@ fi +@@ -12918,9 +12980,9 @@ LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:12922: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12985: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12984: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { -@@ -12931,7 +12994,7 @@ int main() { +@@ -12931,7 +12993,7 @@ ; return 0; } EOF -if { (eval echo configure:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else -@@ -13527,7 +13590,7 @@ EOF +@@ -13527,7 +13589,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:13531: checking for $ac_word" >&5 -+echo "configure:13594: checking for $ac_word" >&5 ++echo "configure:13593: 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 -@@ -13571,19 +13634,19 @@ fi +@@ -13571,19 +13633,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:13575: checking for xft" >&5 -+echo "configure:13638: checking for xft" >&5 ++echo "configure:13637: checking for xft" >&5 if $PKG_CONFIG --exists "xft" ; then echo "$ac_t""yes" 1>&6 @@ -4896,31 +4913,31 @@ echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 -echo "configure:13582: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13645: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13644: 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:13587: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13650: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13649: checking MOZ_XFT_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" -@@ -13618,7 +13681,7 @@ echo "configure:13587: checking MOZ_XFT_LIBS" >&5 +@@ -13618,7 +13680,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:13622: checking for $ac_word" >&5 -+echo "configure:13685: checking for $ac_word" >&5 ++echo "configure:13684: 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 -@@ -13662,19 +13725,19 @@ fi +@@ -13662,19 +13724,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 >= 1.1.0""... $ac_c" 1>&6 -echo "configure:13666: checking for pango >= 1.1.0" >&5 -+echo "configure:13729: checking for pango >= 1.1.0" >&5 ++echo "configure:13728: checking for pango >= 1.1.0" >&5 if $PKG_CONFIG --exists "pango >= 1.1.0" ; then echo "$ac_t""yes" 1>&6 @@ -4928,31 +4945,31 @@ echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 -echo "configure:13673: checking _PANGOCHK_CFLAGS" >&5 -+echo "configure:13736: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13735: checking _PANGOCHK_CFLAGS" >&5 _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 -echo "configure:13678: checking _PANGOCHK_LIBS" >&5 -+echo "configure:13741: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13740: checking _PANGOCHK_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" -@@ -13734,7 +13797,7 @@ EOF +@@ -13734,7 +13796,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:13738: checking for $ac_word" >&5 -+echo "configure:13801: checking for $ac_word" >&5 ++echo "configure:13800: 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 -@@ -13778,19 +13841,19 @@ fi +@@ -13778,19 +13840,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 >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 -echo "configure:13782: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 -+echo "configure:13845: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++echo "configure:13844: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then echo "$ac_t""yes" 1>&6 @@ -4960,58 +4977,58 @@ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:13789: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13852: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13851: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:13794: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13857: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13856: checking MOZ_PANGO_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" -@@ -13858,7 +13921,7 @@ then +@@ -13858,7 +13920,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:13862: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13925: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13924: checking for XpGetPrinterList in -lXp" >&5 ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -13866,7 +13929,7 @@ else +@@ -13866,7 +13928,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:13944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13943: \"$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 -@@ -13950,7 +14013,7 @@ fi +@@ -13950,7 +14012,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:13954: checking for $ac_word" >&5 -+echo "configure:14017: checking for $ac_word" >&5 ++echo "configure:14016: 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 -@@ -13994,19 +14057,19 @@ fi +@@ -13994,19 +14056,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:13998: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14061: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14060: 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 @@ -5019,31 +5036,31 @@ echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 -echo "configure:14005: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14068: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14067: 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:14010: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14073: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14072: checking MOZ_GNOMEVFS_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" -@@ -14057,7 +14120,7 @@ echo "configure:14010: checking MOZ_GNOMEVFS_LIBS" >&5 +@@ -14057,7 +14119,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:14061: checking for $ac_word" >&5 -+echo "configure:14124: checking for $ac_word" >&5 ++echo "configure:14123: 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 -@@ -14101,19 +14164,19 @@ fi +@@ -14101,19 +14163,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:14105: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14168: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14167: checking for gconf-2.0 >= $GCONF_VERSION" >&5 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then echo "$ac_t""yes" 1>&6 @@ -5051,31 +5068,31 @@ echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 -echo "configure:14112: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14175: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14174: 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:14117: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14180: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14179: checking MOZ_GCONF_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" -@@ -14160,7 +14223,7 @@ echo "configure:14117: checking MOZ_GCONF_LIBS" >&5 +@@ -14160,7 +14222,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:14164: checking for $ac_word" >&5 -+echo "configure:14227: checking for $ac_word" >&5 ++echo "configure:14226: 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 -@@ -14204,19 +14267,19 @@ fi +@@ -14204,19 +14266,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:14208: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14271: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14270: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then echo "$ac_t""yes" 1>&6 @@ -5083,31 +5100,31 @@ echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 -echo "configure:14215: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14278: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14277: 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:14220: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14283: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14282: checking MOZ_LIBGNOME_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" -@@ -14294,7 +14357,7 @@ fi +@@ -14294,7 +14356,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:14298: checking for $ac_word" >&5 -+echo "configure:14361: checking for $ac_word" >&5 ++echo "configure:14360: 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 -@@ -14338,19 +14401,19 @@ fi +@@ -14338,19 +14400,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:14342: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14405: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14404: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then echo "$ac_t""yes" 1>&6 @@ -5115,96 +5132,96 @@ echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 -echo "configure:14349: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14412: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14411: 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:14354: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14417: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14416: checking MOZ_GNOMEUI_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" -@@ -14836,7 +14899,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then +@@ -14836,7 +14898,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:14840: checking for $ac_word" >&5 -+echo "configure:14903: checking for $ac_word" >&5 ++echo "configure:14902: 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 -@@ -14872,7 +14935,7 @@ fi +@@ -14872,7 +14934,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:14876: checking for $ac_word" >&5 -+echo "configure:14939: checking for $ac_word" >&5 ++echo "configure:14938: 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 -@@ -15119,7 +15182,7 @@ fi +@@ -15119,7 +15181,7 @@ gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:15123: checking for Gdiplus.h" >&5 -+echo "configure:15186: checking for Gdiplus.h" >&5 ++echo "configure:15185: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -15129,7 +15192,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -15129,7 +15191,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include -@@ -15138,7 +15201,7 @@ int main() { +@@ -15138,7 +15200,7 @@ ; return 0; } EOF -if { (eval echo configure:15142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else -@@ -15218,7 +15281,7 @@ do +@@ -15218,7 +15280,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:15222: checking for $ac_word" >&5 -+echo "configure:15285: checking for $ac_word" >&5 ++echo "configure:15284: 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 -@@ -15263,7 +15326,7 @@ do +@@ -15263,7 +15325,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:15267: checking for $ac_word" >&5 -+echo "configure:15330: checking for $ac_word" >&5 ++echo "configure:15329: 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 -@@ -15332,13 +15395,13 @@ case "$target_os" in +@@ -15332,13 +15394,13 @@ msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:15336: checking for iconv" >&5 -+echo "configure:15399: checking for iconv" >&5 ++echo "configure:15398: 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:15342: checking for $ac_word" >&5 -+echo "configure:15405: checking for $ac_word" >&5 ++echo "configure:15404: 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 -@@ -15481,6 +15544,21 @@ if test "${enable_tests+set}" = set; then +@@ -15481,6 +15543,21 @@ fi @@ -5226,7 +5243,7 @@ # Individual module options # Check whether --enable-xpcom-lea or --disable-xpcom-lea was given. -@@ -15623,6 +15701,84 @@ if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ +@@ -15623,6 +15700,84 @@ fi @@ -5257,7 +5274,7 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -+echo "configure:15732: checking for readline in -lreadline" >&5 ++echo "configure:15731: checking for readline in -lreadline" >&5 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -5265,7 +5282,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15750: \"$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 @@ -5311,17 +5328,17 @@ # Debugging and Optimizations -@@ -15684,18 +15840,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" +@@ -15684,18 +15839,18 @@ if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -echo "configure:15688: checking for valid debug flags" >&5 -+echo "configure:15844: checking for valid debug flags" >&5 ++echo "configure:15843: checking for valid debug flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" cat > conftest.$ac_ext < int main() { @@ -5329,21 +5346,21 @@ ; return 0; } EOF -if { (eval echo configure:15699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15736,18 +15892,18 @@ fi +@@ -15736,18 +15891,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:15740: checking for valid optimization flags" >&5 -+echo "configure:15896: checking for valid optimization flags" >&5 ++echo "configure:15895: checking for valid optimization flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" cat > conftest.$ac_ext < int main() { @@ -5351,86 +5368,86 @@ ; return 0; } EOF -if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15964,7 +16120,7 @@ fi +@@ -15964,7 +16119,7 @@ if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:15968: checking for malloc in -lefence" >&5 -+echo "configure:16124: checking for malloc in -lefence" >&5 ++echo "configure:16123: 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 -@@ -15972,7 +16128,7 @@ else +@@ -15972,7 +16127,7 @@ ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16142: \"$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 -@@ -16084,12 +16240,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -16084,12 +16239,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:16088: checking for $ac_func" >&5 -+echo "configure:16244: checking for $ac_func" >&5 ++echo "configure:16243: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16274: \"$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 -@@ -16358,12 +16514,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -16358,12 +16513,12 @@ for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16362: checking for $ac_func" >&5 -+echo "configure:16518: checking for $ac_func" >&5 ++echo "configure:16517: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16548: \"$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 -@@ -16468,6 +16624,53 @@ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && +@@ -16468,6 +16623,53 @@ { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; } fi @@ -5441,7 +5458,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:16635: checking for $ac_word" >&5 ++echo "configure:16634: 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 @@ -5484,21 +5501,21 @@ # Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given. if test "${with_default_mozilla_five_home+set}" = set; then withval="$with_default_mozilla_five_home" -@@ -16527,7 +16730,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then +@@ -16527,7 +16729,7 @@ # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:16531: checking for gcc -pipe support" >&5 -+echo "configure:16734: checking for gcc -pipe support" >&5 ++echo "configure:16733: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c -@@ -16542,14 +16745,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then +@@ -16542,14 +16744,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { @@ -5506,19 +5523,19 @@ ; return 0; } EOF -if { (eval echo configure:16553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else -@@ -16591,16 +16794,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then +@@ -16591,16 +16793,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:16595: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:16798: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16797: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16806: \"$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" -@@ -16621,16 +16824,16 @@ _SAVE_CFLAGS="$CFLAGS" +@@ -16621,16 +16823,16 @@ CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:16625: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:16828: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16827: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" -@@ -16648,16 +16851,16 @@ if test $result = "yes"; then +@@ -16648,16 +16850,16 @@ else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 -echo "configure:16652: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:16855: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16854: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" -@@ -16703,16 +16906,16 @@ if test "$_PEDANTIC"; then +@@ -16703,16 +16905,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:16707: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:16910: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16909: checking whether C++ compiler has -pedantic long long bug" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="no" else -@@ -16737,13 +16940,16 @@ rm -f conftest* +@@ -16737,13 +16939,16 @@ fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:16741: checking for correct temporary object destruction order" >&5 -+echo "configure:16944: checking for correct temporary object destruction order" >&5 ++echo "configure:16943: checking for correct temporary object destruction order" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -16783,12 +16989,12 @@ fi +@@ -16783,12 +16988,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:16787: checking for correct overload resolution with const and templates" >&5 -+echo "configure:16993: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16992: 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 < -@@ -16818,7 +17024,7 @@ int main() { +@@ -16818,7 +17023,7 @@ ; return 0; } EOF -if { (eval echo configure:16822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else -@@ -17110,7 +17316,7 @@ then +@@ -17110,7 +17315,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:17114: checking for $ac_word" >&5 -+echo "configure:17320: checking for $ac_word" >&5 ++echo "configure:17319: 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 -@@ -17154,19 +17360,19 @@ fi +@@ -17154,19 +17359,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:17158: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17364: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17363: 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 @@ -5664,247 +5681,247 @@ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:17165: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17371: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17370: 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:17170: checking LIBIDL_LIBS" >&5 -+echo "configure:17376: checking LIBIDL_LIBS" >&5 ++echo "configure:17375: checking LIBIDL_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" -@@ -17289,7 +17495,7 @@ fi +@@ -17289,7 +17494,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:17293: checking for $ac_word" >&5 -+echo "configure:17499: checking for $ac_word" >&5 ++echo "configure:17498: 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 -@@ -17324,7 +17530,7 @@ fi +@@ -17324,7 +17529,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17328: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17534: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17533: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17347,7 +17553,7 @@ echo "configure:17328: checking for GLIB - version >= $min_glib_version" >&5 +@@ -17347,7 +17552,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17423,7 +17629,7 @@ main () +@@ -17423,7 +17628,7 @@ } EOF -if { (eval echo configure:17427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17457,7 +17663,7 @@ fi +@@ -17457,7 +17662,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17467,7 +17673,7 @@ int main() { +@@ -17467,7 +17672,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:17471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17676: \"$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" -@@ -17511,7 +17717,7 @@ rm -f conftest* +@@ -17511,7 +17716,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:17515: checking for $ac_word" >&5 -+echo "configure:17721: checking for $ac_word" >&5 ++echo "configure:17720: 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 -@@ -17546,7 +17752,7 @@ fi +@@ -17546,7 +17751,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:17550: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17756: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17755: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -17573,7 +17779,7 @@ echo "configure:17550: checking for libIDL - version >= $min_libIDL_version" >&5 +@@ -17573,7 +17778,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17659,7 +17865,7 @@ main () +@@ -17659,7 +17864,7 @@ } EOF -if { (eval echo configure:17663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17693,7 +17899,7 @@ fi +@@ -17693,7 +17898,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -17704,7 +17910,7 @@ int main() { +@@ -17704,7 +17909,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17913: \"$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" -@@ -17832,7 +18038,7 @@ fi +@@ -17832,7 +18037,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:17836: checking for $ac_word" >&5 -+echo "configure:18042: checking for $ac_word" >&5 ++echo "configure:18041: 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 -@@ -17867,7 +18073,7 @@ fi +@@ -17867,7 +18072,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17871: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18077: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18076: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17890,7 +18096,7 @@ echo "configure:17871: checking for GLIB - version >= $min_glib_version" >&5 +@@ -17890,7 +18095,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17966,7 +18172,7 @@ main () +@@ -17966,7 +18171,7 @@ } EOF -if { (eval echo configure:17970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18000,7 +18206,7 @@ fi +@@ -18000,7 +18205,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -18010,7 +18216,7 @@ int main() { +@@ -18010,7 +18215,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:18014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18219: \"$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" -@@ -18054,7 +18260,7 @@ rm -f conftest* +@@ -18054,7 +18259,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:18058: checking for $ac_word" >&5 -+echo "configure:18264: checking for $ac_word" >&5 ++echo "configure:18263: 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 -@@ -18089,7 +18295,7 @@ fi +@@ -18089,7 +18294,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:18093: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18299: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18298: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -18116,7 +18322,7 @@ echo "configure:18093: checking for libIDL - version >= $min_libIDL_version" >&5 +@@ -18116,7 +18321,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18202,7 +18408,7 @@ main () +@@ -18202,7 +18407,7 @@ } EOF -if { (eval echo configure:18206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18236,7 +18442,7 @@ fi +@@ -18236,7 +18441,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -18247,7 +18453,7 @@ int main() { +@@ -18247,7 +18452,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:18251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18456: \"$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" -@@ -18288,7 +18494,7 @@ rm -f conftest* +@@ -18288,7 +18493,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:18292: checking for $ac_word" >&5 -+echo "configure:18498: checking for $ac_word" >&5 ++echo "configure:18497: 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 -@@ -18332,19 +18538,19 @@ fi +@@ -18332,19 +18537,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:18336: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18542: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18541: 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 @@ -5912,67 +5929,67 @@ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:18343: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18549: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18548: 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:18348: checking LIBIDL_LIBS" >&5 -+echo "configure:18554: checking LIBIDL_LIBS" >&5 ++echo "configure:18553: checking LIBIDL_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" -@@ -18380,7 +18586,7 @@ do +@@ -18380,7 +18585,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:18384: checking for $ac_word" >&5 -+echo "configure:18590: checking for $ac_word" >&5 ++echo "configure:18589: 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 -@@ -18417,7 +18623,7 @@ done +@@ -18417,7 +18622,7 @@ if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:18421: checking for ORBit libIDL usability" >&5 -+echo "configure:18627: checking for ORBit libIDL usability" >&5 ++echo "configure:18626: 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}` -@@ -18434,7 +18640,7 @@ echo "configure:18421: checking for ORBit libIDL usability" >&5 +@@ -18434,7 +18639,7 @@ result="maybe" else cat > conftest.$ac_ext < -@@ -18449,7 +18655,7 @@ int main() { +@@ -18449,7 +18654,7 @@ } EOF -if { (eval echo configure:18453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18658: \"$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" -@@ -18506,7 +18712,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then +@@ -18506,7 +18711,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:18510: checking for $ac_word" >&5 -+echo "configure:18716: checking for $ac_word" >&5 ++echo "configure:18715: 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 -@@ -18550,19 +18756,19 @@ fi +@@ -18550,19 +18755,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""... $ac_c" 1>&6 -echo "configure:18554: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:18760: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18759: checking for glib-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 @@ -5980,82 +5997,82 @@ echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:18561: checking GLIB_CFLAGS" >&5 -+echo "configure:18767: checking GLIB_CFLAGS" >&5 ++echo "configure:18766: checking GLIB_CFLAGS" >&5 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` echo "$ac_t""$GLIB_CFLAGS" 1>&6 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:18566: checking GLIB_LIBS" >&5 -+echo "configure:18772: checking GLIB_LIBS" >&5 ++echo "configure:18771: checking GLIB_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" -@@ -18646,7 +18852,7 @@ fi +@@ -18646,7 +18851,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:18650: checking for $ac_word" >&5 -+echo "configure:18856: checking for $ac_word" >&5 ++echo "configure:18855: 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 -@@ -18681,7 +18887,7 @@ fi +@@ -18681,7 +18886,7 @@ min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:18685: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18891: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18890: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -18704,7 +18910,7 @@ echo "configure:18685: checking for GLIB - version >= $min_glib_version" >&5 +@@ -18704,7 +18909,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18780,7 +18986,7 @@ main () +@@ -18780,7 +18985,7 @@ } EOF -if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18814,7 +19020,7 @@ fi +@@ -18814,7 +19019,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -18824,7 +19030,7 @@ int main() { +@@ -18824,7 +19029,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:18828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19033: \"$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" -@@ -18904,19 +19110,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl" 1>&2; exit 1; } +@@ -18904,19 +19109,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:18908: checking for working alloca.h" >&5 -+echo "configure:19114: checking for working alloca.h" >&5 ++echo "configure:19113: 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 < int main() { @@ -6063,136 +6080,136 @@ ; return 0; } EOF -if { (eval echo configure:18920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19125: \"$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 -@@ -18937,12 +19143,12 @@ EOF +@@ -18937,12 +19142,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18941: checking for alloca" >&5 -+echo "configure:19147: checking for alloca" >&5 ++echo "configure:19146: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19179: \"$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 -@@ -19002,12 +19208,12 @@ EOF +@@ -19002,12 +19207,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:19006: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19212: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19211: 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 <&6 +@@ -19032,12 +19237,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:19036: checking for $ac_func" >&5 -+echo "configure:19242: checking for $ac_func" >&5 ++echo "configure:19241: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19269: \"$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 -@@ -19087,7 +19293,7 @@ done +@@ -19087,7 +19292,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:19091: checking stack direction for C alloca" >&5 -+echo "configure:19297: checking stack direction for C alloca" >&5 ++echo "configure:19296: 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 -@@ -19095,7 +19301,7 @@ else +@@ -19095,7 +19300,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19323: \"$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 -@@ -19163,17 +19369,17 @@ fi +@@ -19163,17 +19368,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19167: checking for $ac_hdr" >&5 -+echo "configure:19373: checking for $ac_hdr" >&5 ++echo "configure:19372: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19382: \"$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* -@@ -19264,7 +19470,7 @@ EOF +@@ -19264,7 +19469,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:19268: checking for $ac_word" >&5 -+echo "configure:19474: checking for $ac_word" >&5 ++echo "configure:19473: 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 -@@ -19308,19 +19514,19 @@ fi +@@ -19308,19 +19513,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""... $ac_c" 1>&6 -echo "configure:19312: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:19518: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19517: checking for cairo >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 @@ -6200,17 +6217,17 @@ echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:19319: checking CAIRO_CFLAGS" >&5 -+echo "configure:19525: checking CAIRO_CFLAGS" >&5 ++echo "configure:19524: checking CAIRO_CFLAGS" >&5 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:19324: checking CAIRO_LIBS" >&5 -+echo "configure:19530: checking CAIRO_LIBS" >&5 ++echo "configure:19529: checking CAIRO_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" -@@ -19350,6 +19556,199 @@ echo "configure:19324: checking CAIRO_LIBS" >&5 +@@ -19350,6 +19555,199 @@ MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_LIBS=$CAIRO_LIBS @@ -6224,7 +6241,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:19570: checking for $ac_word" >&5 ++echo "configure:19569: 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 @@ -6268,19 +6285,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 >= $CAIRO_VERSION""... $ac_c" 1>&6 -+echo "configure:19614: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++echo "configure:19613: checking for cairo-xlib >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 -+echo "configure:19621: checking CAIRO_XLIB_CFLAGS" >&5 ++echo "configure:19620: checking CAIRO_XLIB_CFLAGS" >&5 + CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 -+echo "configure:19626: checking CAIRO_XLIB_LIBS" >&5 ++echo "configure:19625: checking CAIRO_XLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" @@ -6319,7 +6336,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:19665: checking for $ac_word" >&5 ++echo "configure:19664: 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 @@ -6363,19 +6380,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:19709: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++echo "configure:19708: 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:19716: checking CAIRO_XRENDER_CFLAGS" >&5 ++echo "configure:19715: 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:19721: checking CAIRO_XRENDER_LIBS" >&5 ++echo "configure:19720: checking CAIRO_XRENDER_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" @@ -6410,7 +6427,7 @@ fi fi -@@ -19357,6 +19756,10 @@ fi +@@ -19357,6 +19755,10 @@ @@ -6421,21 +6438,21 @@ # Check whether --enable-xul or --disable-xul was given. if test "${enable_xul+set}" = set; then enableval="$enable_xul" -@@ -19385,7 +19788,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then +@@ -19385,7 +19787,7 @@ # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19389: checking for $ac_word" >&5 -+echo "configure:19792: checking for $ac_word" >&5 ++echo "configure:19791: 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 -@@ -19661,14 +20064,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a +@@ -19661,14 +20063,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { @@ -6443,11 +6460,11 @@ ; return 0; } EOF -if { (eval echo configure:19672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -19852,6 +20255,7 @@ fi # COMPILE_ENVIRONMENT +@@ -19852,6 +20254,7 @@ @@ -6455,7 +6472,7 @@ CFLAGS=`echo \ $_WARNINGS_CFLAGS \ $CFLAGS` -@@ -19948,6 +20352,9 @@ COMPILE_CXXFLAGS=`echo \ +@@ -19948,6 +20351,9 @@ @@ -6465,25 +6482,25 @@ cat >> confdefs.h < conftest.$ac_ext < -@@ -19991,7 +20398,7 @@ int main() { +@@ -19991,7 +20397,7 @@ ; return 0; } EOF -if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -20209,34 +20616,15 @@ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h +@@ -20209,34 +20615,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. @@ -6527,7 +6544,7 @@ MOZ_DEFINES=$DEFS -@@ -20439,7 +20827,6 @@ s%@DOXYGEN@%$DOXYGEN%g +@@ -20439,7 +20826,6 @@ s%@WHOAMI@%$WHOAMI%g s%@AUTOCONF@%$AUTOCONF%g s%@UNZIP@%$UNZIP%g @@ -6535,7 +6552,7 @@ s%@SYSTEM_MAKEDEPEND@%$SYSTEM_MAKEDEPEND%g s%@XARGS@%$XARGS%g s%@PBBUILD@%$PBBUILD%g -@@ -20476,10 +20863,13 @@ s%@NSPR_LIBS@%$NSPR_LIBS%g +@@ -20476,10 +20862,13 @@ s%@NSS_CONFIG@%$NSS_CONFIG%g s%@NSS_CFLAGS@%$NSS_CFLAGS%g s%@NSS_LIBS@%$NSS_LIBS%g @@ -6550,7 +6567,7 @@ s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@HOST_MOC@%$HOST_MOC%g -@@ -20553,6 +20943,9 @@ s%@MOZ_ACTIVEX_SCRIPTING_SUPPORT@%$MOZ_ACTIVEX_SCRIPTING_SUPPORT%g +@@ -20553,6 +20942,9 @@ s%@MOZ_SAFE_BROWSING@%$MOZ_SAFE_BROWSING%g s%@MOZ_URL_CLASSIFIER@%$MOZ_URL_CLASSIFIER%g s%@JS_ULTRASPARC_OPTS@%$JS_ULTRASPARC_OPTS%g @@ -6560,7 +6577,7 @@ s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g -@@ -20560,6 +20953,7 @@ s%@DETECT_WEBSHELL_LEAKS@%$DETECT_WEBSHELL_LEAKS%g +@@ -20560,6 +20952,7 @@ s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g s%@MOZ_DEMANGLE_SYMBOLS@%$MOZ_DEMANGLE_SYMBOLS%g @@ -6568,7 +6585,7 @@ s%@MOZ_DOC_INPUT_DIRS@%$MOZ_DOC_INPUT_DIRS%g s%@MOZ_DOC_INCLUDE_DIRS@%$MOZ_DOC_INCLUDE_DIRS%g s%@MOZ_DOC_OUTPUT_DIR@%$MOZ_DOC_OUTPUT_DIR%g -@@ -20600,9 +20994,17 @@ s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g +@@ -20600,9 +20993,17 @@ s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g s%@CAIRO_LIBS@%$CAIRO_LIBS%g @@ -6586,7 +6603,7 @@ s%@MOZ_XUL@%$MOZ_XUL%g s%@MOZ_PYTHON@%$MOZ_PYTHON%g s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g -@@ -20711,6 +21113,7 @@ s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g +@@ -20711,6 +21112,7 @@ s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g s%@MOZ_ENABLE_LIBXUL@%$MOZ_ENABLE_LIBXUL%g s%@ENABLE_TESTS@%$ENABLE_TESTS%g @@ -6594,7 +6611,7 @@ s%@IBMBIDI@%$IBMBIDI%g s%@SUNCTL@%$SUNCTL%g s%@ACCESSIBILITY@%$ACCESSIBILITY%g -@@ -20760,6 +21163,7 @@ s%@AS_PERL@%$AS_PERL%g +@@ -20760,6 +21162,7 @@ s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g s%@SYSTEM_PNG@%$SYSTEM_PNG%g s%@SYSTEM_ZLIB@%$SYSTEM_ZLIB%g @@ -6602,7 +6619,7 @@ s%@JPEG_CFLAGS@%$JPEG_CFLAGS%g s%@JPEG_LIBS@%$JPEG_LIBS%g s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g -@@ -20770,6 +21174,8 @@ s%@MOZ_JPEG_CFLAGS@%$MOZ_JPEG_CFLAGS%g +@@ -20770,6 +21173,8 @@ s%@MOZ_JPEG_LIBS@%$MOZ_JPEG_LIBS%g s%@MOZ_ZLIB_CFLAGS@%$MOZ_ZLIB_CFLAGS%g s%@MOZ_ZLIB_LIBS@%$MOZ_ZLIB_LIBS%g @@ -6611,7 +6628,7 @@ s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g -@@ -21175,7 +21581,7 @@ if test "$no_recursion" != yes; then +@@ -21175,7 +21580,7 @@ fi fi @@ -6620,7 +6637,7 @@ done fi -@@ -21318,7 +21724,7 @@ if test "$no_recursion" != yes; then +@@ -21318,7 +21723,7 @@ fi fi diff -u xulrunner-1.8.1.11/debian/changelog xulrunner-1.8.1.11/debian/changelog --- xulrunner-1.8.1.11/debian/changelog +++ xulrunner-1.8.1.11/debian/changelog @@ -1,3 +1,16 @@ +xulrunner (1.8.1.11-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #174219), remaining changes: + - 88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch + - 88_bz399589_fix_missing_symbol_with_new_nss.dpatch + - 88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch + - xulrunner alternative in /usr/bin + - debian/xulrunner.install + - debian/xulrunner.{postinst,prerm} + * Update debian/patches/99_configure.dpatch + + -- Fabien Tassin Wed, 05 Dec 2007 21:35:09 +0100 + xulrunner (1.8.1.11-1) unstable; urgency=low * New security/stability upstream release (taken from upstream CVS) @@ -19,6 +32,31 @@ -- Mike Hommey Sat, 17 Nov 2007 15:02:22 +0100 +xulrunner (1.8.1.9-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #163271), remaining changes: + - remaining Ubuntu patches in debian/patches: + - 88_force-no-pragma-visibility-for-gcc-4.2_4.3 + - 88_bz384304_lp117575_linkrecursion_fix_in_startscript + - xulrunner diversion (xulrunner.{postinst,prerm,install}) + - Maintainer set to Ubuntu MOTU Developers + * Drop debian/patches/{68_python25_api_breakage.dpatch, + 88_ubuntu_pyginputstream.dpatch,88_ubuntu_pyiinputstream.dpatch} + merge by Debian into debian/patches/35_python_2.5.dpatch + - update debian/patches/00list + * Drop debian/patches/61_python_py_ssize_t_detect now useless + - update debian/patches/00list + * Fix FTBFS with cairo lib needing Xrender: + - add patch 88_bz344818_missing_library_check + - update debian/patches/00list + * Fix FTBFS with newer nss allowing to build with either old nss 3.11 + or upcoming 3.12. + - add patch 88_bz399589_fix_missing_symbol_with_new_nss + - update debian/patches/00list + * Update debian/patches/99_configure.dpatch + + -- Fabien Tassin Sat, 17 Nov 2007 17:36:34 +0100 + xulrunner (1.8.1.9-1) unstable; urgency=low * New security/stability upstream release (taken from upstream CVS) @@ -81,6 +119,78 @@ -- Mike Hommey Sun, 01 Jul 2007 14:23:56 +0200 +xulrunner (1.8.1.4-2ubuntu5) gutsy; urgency=low + + * debian/control: build depend on ecj instead of ecj-bootstrap, that doesn't + exist anymore. + + -- Alexander Sack Fri, 28 Sep 2007 12:38:52 +0200 + +xulrunner (1.8.1.4-2ubuntu4) gutsy; urgency=low + + Prepare xul 1.8 to play nicely with forthcoming xulrunner 1.9 upload: + + * debian/xulrunner.install: install startup script as + /usr/lib/xulrunner/xulrunner instead of /usr/bin/xulrunner + * debian/xulrunner.{postinst,prerm}: introduce xulrunner alternative + to allow multiple xulrunner versions to be installed on the same + system. + * debian/patches/88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch: + adapt patch from bugzilla 384304 to allow deep link recursions of xulrunner + start script. + + -- Alexander Sack Thu, 27 Sep 2007 01:30:55 +0200 + +xulrunner (1.8.1.4-2ubuntu3) gutsy; urgency=low + + * debian/patches/88_ubuntu_pyginputstream.dpatch, + debian/patches/88_ubuntu_pyiinputstream.dpatch: drop patches because they + are not applied anyway. + * debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch, + debian/patches/00list: add anti ftbfs-on-gcc-4.2_4.3 patch to force use of + -fvisibility=hidden instead of pragma push (hidden) even if gcc bugs are not + detected. + * debian/patches/99_configure.dpatch: refresh configure accordingly. + + -- Alexander Sack Tue, 21 Aug 2007 18:30:06 +0200 + +xulrunner (1.8.1.4-2ubuntu2) gutsy; urgency=low + + * replacing bogus patches that can cause access to unintialized + memory and that should have never ended up in here: + - Dropped 88_ubuntu_pyginputstream.dpatch + - Dropped 88_ubuntu_pyiinputstream.dpatch + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - Update 99_configure.dpatch because 61_python_py_ssize_t_detect.dpatch + touches configure.in. + New patches that do boundary checks are submitted to bugzilla + bug 386610 and debian bug 431483. + - update 00list accordingly + + Remaining Ubuntu Changes: + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - update 00list accordingly + - Update 99_configure.dpatch like: + 1. dpatch-edit-patch 99_configure.dpatch + 2. autoconf2.13 + 3. exit 0 + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Alexander Sack Wed, 04 Jul 2007 14:13:40 +0200 + +xulrunner (1.8.1.4-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ and __ia64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + - update debian/patches/00list + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michele Angrisano Mon, 11 Jun 2007 18:04:53 +0200 + xulrunner (1.8.1.4-2) unstable; urgency=low * debian/patches/85_URI_fixup.dpatch: Enable keyword lookup by default in @@ -103,6 +213,23 @@ -- Mike Hommey Sun, 10 Jun 2007 09:46:32 +0200 +xulrunner (1.8.1.4-1ubuntu2) gutsy; urgency=low + + * Apply the fix for AMD64 also to IA64 + (this should hopefully fix the FTBFS on IA64). + + -- Michael Bienia Wed, 6 Jun 2007 10:07:27 -0500 + +xulrunner (1.8.1.4-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Arthur Loiret Mon, 4 Jun 2007 00:19:28 +0200 + xulrunner (1.8.1.4-1) unstable; urgency=high * New upstream release (taken from upstream CVS) @@ -177,6 +304,14 @@ -- Steve Langasek Sun, 20 May 2007 18:14:00 -0700 +xulrunner (1.8.0.11-4ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - resolve conflict in debian/control + debian/rules + - looks like candidate for sync + + -- Alexander Sack Fri, 18 May 2007 10:00:00 +0200 + xulrunner (1.8.0.11-4) unstable; urgency=low * debian/rules: Don't make shlibs for components (which happened to make one @@ -270,6 +405,16 @@ -- Mike Hommey Sat, 24 Mar 2007 18:04:03 +0100 +xulrunner (1.8.0.10-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michael Bienia Sat, 10 Mar 2007 18:44:59 +0100 + xulrunner (1.8.0.10-3) unstable; urgency=low * debian/rules: Re-add xulrunner-xpcom requirement in xulrunner-plugin.pc, @@ -287,6 +432,17 @@ -- Mike Hommey Thu, 8 Mar 2007 19:08:10 +0100 +xulrunner (1.8.0.10-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * UVF exception: LP: #89561 + + -- Michael Bienia Mon, 5 Mar 2007 12:34:50 +0100 + xulrunner (1.8.0.10-1) unstable; urgency=low * New upstream release (taken from upstream CVS) @@ -347,6 +503,14 @@ -- Mike Hommey Thu, 1 Mar 2007 19:01:34 +0100 +xulrunner (1.8.0.9-1ubuntu1) feisty; urgency=low + + * Fixing __x86_64__ FTBFS + + Added 100_ubuntu_pyginputstream.dpatch + + Added 100_ubuntu_pyiinputstream.dpatch + + -- Stephan Hermann Fri, 19 Jan 2007 17:50:12 +0100 + xulrunner (1.8.0.9-1) unstable; urgency=low * New upstream release (taken from upstream CVS) @@ -1187,0 +1352 @@ + diff -u xulrunner-1.8.1.11/debian/control xulrunner-1.8.1.11/debian/control --- xulrunner-1.8.1.11/debian/control +++ xulrunner-1.8.1.11/debian/control @@ -1,7 +1,8 @@ Source: xulrunner Section: devel Priority: optional -Maintainer: Mike Hommey +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Mike Hommey Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, dpatch, libx11-dev, libxt-dev, libidl-dev, libgtk2.0-dev, libgnomevfs2-dev, libgnome2-dev, libgnomeui-dev, libcairo2-dev, libpng12-dev, libjpeg62-dev, zlib1g-dev, libbz2-dev, libreadline5-dev | libreadline-dev, libkrb5-dev, python-dev, python-support (>= 0.3), dpkg-dev (>= 1.13.19), binutils (>= 2.17-1) [mips mipsel], libnspr4-dev, libnss3-dev (>= 3.11.5-2), libhunspell-dev (>= 1.1.5-2) Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.56) Standards-Version: 3.7.2.2 diff -u xulrunner-1.8.1.11/debian/xulrunner.install xulrunner-1.8.1.11/debian/xulrunner.install --- xulrunner-1.8.1.11/debian/xulrunner.install +++ xulrunner-1.8.1.11/debian/xulrunner.install @@ -1,6 +1,6 @@ etc/gre.d/xulrunner.conf -usr/bin/xulrunner +usr/bin/xulrunner usr/lib/xulrunner/ usr/lib/xulrunner/xpt_dump usr/lib/xulrunner/run-mozilla.sh usr/lib/xulrunner/xpt_link only in patch2: unchanged: --- xulrunner-1.8.1.11.orig/debian/xulrunner.postinst +++ xulrunner-1.8.1.11/debian/xulrunner.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + update-alternatives --install /usr/bin/xulrunner \ + xulrunner /usr/lib/xulrunner/xulrunner 50 +fi + +#DEBHELPER# + only in patch2: unchanged: --- xulrunner-1.8.1.11.orig/debian/xulrunner.prerm +++ xulrunner-1.8.1.11/debian/xulrunner.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove xulrunner /usr/lib/xulrunner/xulrunner + if [ "$(update-alternatives --list xulrunner | wc -l)" = "0" ]; then + update-alternatives --remove-all xulrunner + fi +fi + +#DEBHELPER# only in patch2: unchanged: --- xulrunner-1.8.1.11.orig/debian/patches/88_bz399589_fix_missing_symbol_with_new_nss.dpatch +++ xulrunner-1.8.1.11/debian/patches/88_bz399589_fix_missing_symbol_with_new_nss.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 88_bz399589_fix_missing_symbol_with_new_nss.dpatch by Fabien Tassin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/configure.in xulrunner-1.8.1.9-1ubuntu1/configure.in +--- xulrunner-1.8.1.9-1ubuntu1~/configure.in 2007-11-17 16:15:18.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/configure.in 2007-11-17 16:24:58.000000000 +0000 +@@ -3753,7 +3753,7 @@ + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS=" -lcrmf $NSS_LIBS" + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/security/manager/ssl/src/nsKeygenHandler.cpp xulrunner-1.8.1.9-1ubuntu1/security/manager/ssl/src/nsKeygenHandler.cpp +--- xulrunner-1.8.1.9-1ubuntu1~/security/manager/ssl/src/nsKeygenHandler.cpp 2007-11-17 16:08:10.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/security/manager/ssl/src/nsKeygenHandler.cpp 2007-11-17 16:15:49.000000000 +0000 +@@ -75,6 +75,15 @@ + { nsnull, 0 }, + }; + ++DERTemplate SECAlgorithmIDTemplate[] = { ++ { DER_SEQUENCE, ++ 0, NULL, sizeof(SECAlgorithmID) }, ++ { DER_OBJECT_ID, ++ offsetof(SECAlgorithmID,algorithm), }, ++ { DER_OPTIONAL | DER_ANY, ++ offsetof(SECAlgorithmID,parameters), }, ++ { 0, } ++}; + + DERTemplate CERTSubjectPublicKeyInfoTemplate[] = { + { DER_SEQUENCE, +@@ -95,16 +104,6 @@ + { 0, } + }; + +-DERTemplate SECAlgorithmIDTemplate[] = { +- { DER_SEQUENCE, +- 0, NULL, sizeof(SECAlgorithmID) }, +- { DER_OBJECT_ID, +- offsetof(SECAlgorithmID,algorithm), }, +- { DER_OPTIONAL | DER_ANY, +- offsetof(SECAlgorithmID,parameters), }, +- { 0, } +-}; +- + const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { + { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, only in patch2: unchanged: --- xulrunner-1.8.1.11.orig/debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch +++ xulrunner-1.8.1.11/debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-08-21 15:52:32.000000000 +0000 ++++ mozilla/configure.in 2007-08-21 15:54:29.000000000 +0000 +@@ -2642,18 +2642,17 @@ + if test `grep -c "@PLT" conftest.S` = 0; then + ac_cv_visibility_builtin_bug=yes + fi + fi + rm -f conftest.{c,S} + ]) + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute + fi # GNU_CC + only in patch2: unchanged: --- xulrunner-1.8.1.11.orig/debian/patches/88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch +++ xulrunner-1.8.1.11/debian/patches/88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## 88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Build the xpcom glue as a shared library. Still hackish. +## DP: - Load DSOs from . when directory is not given. + +@DPATCH@ + +--- mozilla.orig/xulrunner/app/mozilla.in 2005-09-20 23:13:03.000000000 +0200 ++++ mozilla/xulrunner/app/mozilla.in 2007-06-13 16:36:16.000000000 +0200 +@@ -111,6 +111,7 @@ + bn=`basename "$progname"` + cd `dirname "$progname"` + progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` ++ progbase=`basename "$progname"` + if [ ! -x "$progname" ]; then + break + fi