diff -u xulrunner-1.8.1.9/debian/patches/00list xulrunner-1.8.1.9/debian/patches/00list --- xulrunner-1.8.1.9/debian/patches/00list +++ xulrunner-1.8.1.9/debian/patches/00list @@ -76,2 +76,6 @@ 85_xpcomglue +88_force-no-pragma-visibility-for-gcc-4.2_4.3 +88_bz384304_lp117575_linkrecursion_fix_in_startscript +88_bz344818_missing_library_check +88_bz399589_fix_missing_symbol_with_new_nss 99_configure diff -u xulrunner-1.8.1.9/debian/patches/99_configure.dpatch xulrunner-1.8.1.9/debian/patches/99_configure.dpatch --- xulrunner-1.8.1.9/debian/patches/99_configure.dpatch +++ xulrunner-1.8.1.9/debian/patches/99_configure.dpatch @@ -5,12 +5,10 @@ ## DP: autoconf @DPATCH@ - -diff --git a/configure b/configure -index 8ea93d2..7a07920 100755 ---- a/configure -+++ b/configure -@@ -57,9 +57,14 @@ ac_help="$ac_help +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/configure xulrunner-1.8.1.9-1ubuntu1/configure +--- xulrunner-1.8.1.9-1ubuntu1~/configure 2007-11-17 16:26:42.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/configure 2007-11-17 16:31:27.000000000 +0000 +@@ -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 -@@ -4021,7 +3890,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; +@@ -4021,7 +3890,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' -@@ -4030,7 +3899,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -4030,7 +3899,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { return 0; } -@@ -4038,7 +3907,7 @@ int main() { +@@ -4038,7 +3907,7 @@ result=yes ; return 0; } EOF @@ -1202,7 +1200,7 @@ rm -rf conftest* result=no else -@@ -4063,7 +3932,7 @@ do +@@ -4063,7 +3932,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 -@@ -4106,7 +3975,7 @@ do +@@ -4106,7 +3975,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 -@@ -4174,7 +4043,7 @@ if test "$COMPILE_ENVIRONMENT"; then +@@ -4174,7 +4043,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 -@@ -4236,12 +4105,12 @@ if test "$ac_x_includes" = NO; then +@@ -4236,12 +4105,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 -@@ -4449,14 +4318,14 @@ rm -f conftest* +@@ -4449,14 +4318,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 -@@ -4496,7 +4365,7 @@ else +@@ -4496,7 +4365,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 -@@ -4540,7 +4409,7 @@ else +@@ -4540,7 +4409,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. */ -@@ -4614,7 +4483,7 @@ gethostbyname(); +@@ -4614,7 +4483,7 @@ ; return 0; } EOF @@ -1377,7 +1375,7 @@ rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else -@@ -4635,7 +4504,7 @@ fi +@@ -4635,7 +4504,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 -@@ -4643,7 +4512,7 @@ else +@@ -4643,7 +4512,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. */ -@@ -4718,7 +4587,7 @@ connect(); +@@ -4718,7 +4587,7 @@ ; return 0; } EOF @@ -1428,7 +1426,7 @@ rm -rf conftest* eval "ac_cv_func_connect=yes" else -@@ -4739,7 +4608,7 @@ fi +@@ -4739,7 +4608,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 -@@ -4747,7 +4616,7 @@ else +@@ -4747,7 +4616,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. */ -@@ -4816,7 +4685,7 @@ remove(); +@@ -4816,7 +4685,7 @@ ; return 0; } EOF @@ -1479,7 +1477,7 @@ rm -rf conftest* eval "ac_cv_func_remove=yes" else -@@ -4837,7 +4706,7 @@ fi +@@ -4837,7 +4706,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 -@@ -4845,7 +4714,7 @@ else +@@ -4845,7 +4714,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. */ -@@ -4914,7 +4783,7 @@ shmat(); +@@ -4914,7 +4783,7 @@ ; return 0; } EOF @@ -1530,7 +1528,7 @@ rm -rf conftest* eval "ac_cv_func_shmat=yes" else -@@ -4935,7 +4804,7 @@ fi +@@ -4935,7 +4804,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 -@@ -4943,7 +4812,7 @@ else +@@ -4943,7 +4812,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 -@@ -4998,7 +4867,7 @@ else +@@ -4998,7 +4867,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 -@@ -5467,14 +5347,14 @@ LOOP_INPUT +@@ -5467,14 +5347,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 -@@ -5521,14 +5401,14 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -5521,14 +5401,14 @@ ac_cv_static_assertion_macros_work="yes" cat > conftest.$ac_ext <&5 -@@ -5538,14 +5418,14 @@ else +@@ -5538,14 +5418,14 @@ fi rm -f conftest* cat > conftest.$ac_ext <&6 @@ -1778,7 +1776,7 @@ rm -rf conftest* result="yes" else -@@ -5708,7 +5588,7 @@ case "$host" in +@@ -5708,7 +5588,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}" -@@ -5787,9 +5667,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -5787,9 +5667,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() { -@@ -5798,7 +5678,7 @@ int main() { +@@ -5798,7 +5678,7 @@ #endif ; return 0; } EOF @@ -1808,7 +1806,7 @@ rm -rf conftest* _BAD_COMPILER= else -@@ -5836,17 +5716,17 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -5836,17 +5716,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* -@@ -5881,14 +5761,14 @@ EOF +@@ -5881,14 +5761,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 -@@ -5896,14 +5776,14 @@ else +@@ -5896,14 +5776,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 -@@ -5932,14 +5812,14 @@ else +@@ -5932,14 +5812,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 -@@ -6153,8 +6033,6 @@ EOF +@@ -6153,8 +6033,6 @@ MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 ;; mips*) @@ -1920,7 +1918,7 @@ ;; esac ;; -@@ -6213,6 +6091,7 @@ EOF +@@ -6213,6 +6091,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' -@@ -6302,6 +6181,7 @@ EOF +@@ -6302,6 +6181,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= -@@ -6341,6 +6221,7 @@ EOF +@@ -6341,6 +6221,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= -@@ -6568,8 +6449,8 @@ EOF +@@ -6568,8 +6449,8 @@ if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -1955,7 +1953,7 @@ ;; *-nto*) -@@ -6784,6 +6665,7 @@ EOF +@@ -6784,6 +6665,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)' -@@ -6792,8 +6674,8 @@ EOF +@@ -6792,8 +6674,8 @@ alpha*-*-osf*) if test "$GNU_CC"; then @@ -1974,7 +1972,7 @@ else MOZ_DEBUG_FLAGS='-g' -@@ -6803,8 +6685,8 @@ alpha*-*-osf*) +@@ -6803,8 +6685,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 -@@ -6882,14 +6764,14 @@ EOF +@@ -6882,14 +6764,14 @@ _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" cat > conftest.$ac_ext <&5 -@@ -6900,8 +6782,8 @@ fi +@@ -6900,8 +6782,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' -@@ -6917,7 +6799,7 @@ rm -f conftest* +@@ -6917,7 +6799,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. -@@ -6927,7 +6809,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -6927,7 +6809,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 -@@ -7105,12 +6987,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a +@@ -7105,12 +6987,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 -@@ -7118,7 +7000,7 @@ else +@@ -7118,7 +7000,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* -@@ -7135,7 +7017,7 @@ rm -f conftest* +@@ -7135,7 +7017,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 -@@ -7153,7 +7035,7 @@ fi +@@ -7153,7 +7035,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 -@@ -7174,7 +7056,7 @@ if test "$cross_compiling" = yes; then +@@ -7174,7 +7056,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7185,7 +7067,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +@@ -7185,7 +7067,7 @@ exit (0); } EOF @@ -2118,7 +2116,7 @@ then : else -@@ -7209,12 +7091,12 @@ EOF +@@ -7209,12 +7091,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 @@ -2133,7 +2131,7 @@ #include "confdefs.h" int main() { -@@ -7263,7 +7145,7 @@ ccp = (char const *const *) p; +@@ -7263,7 +7145,7 @@ ; return 0; } EOF @@ -2142,7 +2140,7 @@ rm -rf conftest* ac_cv_c_const=yes else -@@ -7284,12 +7166,12 @@ EOF +@@ -7284,12 +7166,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 @@ -2157,7 +2155,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7317,12 +7199,12 @@ EOF +@@ -7317,12 +7199,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 @@ -2172,7 +2170,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7350,12 +7232,12 @@ EOF +@@ -7350,12 +7232,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 @@ -2187,7 +2185,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7383,12 +7265,12 @@ EOF +@@ -7383,12 +7265,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 @@ -2202,7 +2200,7 @@ #include "confdefs.h" #include #if STDC_HEADERS -@@ -7416,12 +7298,12 @@ EOF +@@ -7416,12 +7298,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 -@@ -7429,7 +7311,7 @@ int main() { +@@ -7429,7 +7311,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF @@ -2226,7 +2224,7 @@ rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -7450,12 +7332,12 @@ EOF +@@ -7450,12 +7332,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 -@@ -7463,7 +7345,7 @@ int main() { +@@ -7463,7 +7345,7 @@ siginfo_t* info; ; return 0; } EOF @@ -2250,7 +2248,7 @@ rm -rf conftest* ac_cv_siginfo_t=true else -@@ -7497,12 +7379,12 @@ EOF +@@ -7497,12 +7379,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 @@ -2265,7 +2263,7 @@ #include "confdefs.h" #include #include -@@ -7510,7 +7392,7 @@ int main() { +@@ -7510,7 +7392,7 @@ int16_t foo = 0; ; return 0; } EOF @@ -2274,7 +2272,7 @@ rm -rf conftest* ac_cv_int16_t=true else -@@ -7532,12 +7414,12 @@ else +@@ -7532,12 +7414,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 -@@ -7545,7 +7427,7 @@ int main() { +@@ -7545,7 +7427,7 @@ int32_t foo = 0; ; return 0; } EOF @@ -2298,7 +2296,7 @@ rm -rf conftest* ac_cv_int32_t=true else -@@ -7567,12 +7449,12 @@ else +@@ -7567,12 +7449,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 -@@ -7580,7 +7462,7 @@ int main() { +@@ -7580,7 +7462,7 @@ int64_t foo = 0; ; return 0; } EOF @@ -2322,7 +2320,7 @@ rm -rf conftest* ac_cv_int64_t=true else -@@ -7602,12 +7484,12 @@ else +@@ -7602,12 +7484,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 -@@ -7615,7 +7497,7 @@ int main() { +@@ -7615,7 +7497,7 @@ int64 foo = 0; ; return 0; } EOF @@ -2346,7 +2344,7 @@ rm -rf conftest* ac_cv_int64=true else -@@ -7637,12 +7519,12 @@ else +@@ -7637,12 +7519,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 -@@ -7650,7 +7532,7 @@ int main() { +@@ -7650,7 +7532,7 @@ uint foo = 0; ; return 0; } EOF @@ -2370,7 +2368,7 @@ rm -rf conftest* ac_cv_uint=true else -@@ -7672,12 +7554,12 @@ else +@@ -7672,12 +7554,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 -@@ -7685,7 +7567,7 @@ int main() { +@@ -7685,7 +7567,7 @@ uint_t foo = 0; ; return 0; } EOF @@ -2394,7 +2392,7 @@ rm -rf conftest* ac_cv_uint_t=true else -@@ -7707,12 +7589,12 @@ else +@@ -7707,12 +7589,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 -@@ -7720,7 +7602,7 @@ int main() { +@@ -7720,7 +7602,7 @@ uint16_t foo = 0; ; return 0; } EOF @@ -2418,7 +2416,7 @@ rm -rf conftest* ac_cv_uint16_t=true else -@@ -7751,12 +7633,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -7751,12 +7633,12 @@ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 @@ -2433,7 +2431,7 @@ #include "confdefs.h" #include int main() { -@@ -7764,7 +7646,7 @@ int main() { +@@ -7764,7 +7646,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 -@@ -7788,12 +7670,12 @@ else +@@ -7788,12 +7670,12 @@ fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 @@ -2457,7 +2455,7 @@ #include "confdefs.h" #include int main() { -@@ -7801,7 +7683,7 @@ int main() { +@@ -7801,7 +7683,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 -@@ -7834,12 +7716,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -7834,12 +7716,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 -@@ -7848,7 +7730,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); +@@ -7848,7 +7730,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 -@@ -7881,12 +7763,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -7881,12 +7763,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 -@@ -7895,7 +7777,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); +@@ -7895,7 +7777,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 -@@ -7929,7 +7811,7 @@ fi +@@ -7929,7 +7811,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 -@@ -7954,7 +7836,7 @@ EOF +@@ -7954,7 +7836,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 -@@ -7979,7 +7861,7 @@ EOF +@@ -7979,7 +7861,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 -@@ -8004,7 +7886,7 @@ fi +@@ -8004,7 +7886,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 -@@ -8032,7 +7914,7 @@ fi +@@ -8032,7 +7914,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 -@@ -8080,12 +7962,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h +@@ -8062,8 +7944,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 +@@ -8080,12 +7961,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:8084: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:7966: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7965: 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> -@@ -8093,7 +7975,7 @@ int main() { +@@ -8093,7 +7974,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -8118,7 +8000,7 @@ done +@@ -8118,7 +7999,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:8122: checking for opendir in -ldir" >&5 -+echo "configure:8004: checking for opendir in -ldir" >&5 ++echo "configure:8003: 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 -@@ -8126,7 +8008,7 @@ else +@@ -8126,7 +8007,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:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8022: \"$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 -@@ -8159,7 +8041,7 @@ fi +@@ -8159,7 +8040,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:8163: checking for opendir in -lx" >&5 -+echo "configure:8045: checking for opendir in -lx" >&5 ++echo "configure:8044: 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 -@@ -8167,7 +8049,7 @@ else +@@ -8167,7 +8048,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:8064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8063: \"$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 -@@ -8210,17 +8092,17 @@ for ac_hdr in sys/byteorder.h compat.h getopt.h +@@ -8210,17 +8091,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8214: checking for $ac_hdr" >&5 -+echo "configure:8096: checking for $ac_hdr" >&5 ++echo "configure:8095: 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:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8105: \"$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* -@@ -8250,17 +8132,17 @@ for ac_hdr in sys/bitypes.h memory.h unistd.h +@@ -8250,17 +8131,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8254: checking for $ac_hdr" >&5 -+echo "configure:8136: checking for $ac_hdr" >&5 ++echo "configure:8135: 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:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8145: \"$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* -@@ -8290,17 +8172,17 @@ for ac_hdr in gnu/libc-version.h nl_types.h +@@ -8290,17 +8171,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8294: checking for $ac_hdr" >&5 -+echo "configure:8176: checking for $ac_hdr" >&5 ++echo "configure:8175: 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:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8185: \"$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* -@@ -8330,17 +8212,17 @@ for ac_hdr in malloc.h +@@ -8330,17 +8211,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8334: checking for $ac_hdr" >&5 -+echo "configure:8216: checking for $ac_hdr" >&5 ++echo "configure:8215: 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:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8225: \"$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* -@@ -8370,17 +8252,17 @@ for ac_hdr in X11/XKBlib.h +@@ -8370,17 +8251,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8374: checking for $ac_hdr" >&5 -+echo "configure:8256: checking for $ac_hdr" >&5 ++echo "configure:8255: 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:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8265: \"$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* -@@ -8411,17 +8293,17 @@ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h +@@ -8411,17 +8292,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8415: checking for $ac_hdr" >&5 -+echo "configure:8297: checking for $ac_hdr" >&5 ++echo "configure:8296: 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:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8306: \"$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* -@@ -8452,17 +8334,17 @@ for ac_hdr in mmintrin.h +@@ -8452,17 +8333,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8456: checking for $ac_hdr" >&5 -+echo "configure:8338: checking for $ac_hdr" >&5 ++echo "configure:8337: 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:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8347: \"$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* -@@ -8499,17 +8381,17 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -8499,17 +8380,17 @@ NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 -echo "configure:8503: checking for new" >&5 -+echo "configure:8385: checking for new" >&5 ++echo "configure:8384: 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:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8394: \"$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* -@@ -8550,17 +8432,17 @@ case $target in +@@ -8550,17 +8431,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8554: checking for $ac_hdr" >&5 -+echo "configure:8436: checking for $ac_hdr" >&5 ++echo "configure:8435: 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:8564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8445: \"$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* -@@ -8594,7 +8476,7 @@ case $target in +@@ -8594,7 +8475,7 @@ ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:8598: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8480: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8479: 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 -@@ -8602,7 +8484,7 @@ else +@@ -8602,7 +8483,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:8499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8498: \"$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 -@@ -8643,7 +8525,7 @@ fi +@@ -8643,7 +8524,7 @@ ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:8647: checking for atan in -lm" >&5 -+echo "configure:8529: checking for atan in -lm" >&5 ++echo "configure:8528: 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 -@@ -8651,7 +8533,7 @@ else +@@ -8651,7 +8532,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:8548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8547: \"$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 -@@ -8696,7 +8578,7 @@ case $target in +@@ -8696,7 +8577,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:8700: checking for dlopen in -ldl" >&5 -+echo "configure:8582: checking for dlopen in -ldl" >&5 ++echo "configure:8581: 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 -@@ -8704,7 +8586,7 @@ else +@@ -8704,7 +8585,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:8601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8600: \"$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 -@@ -8732,17 +8614,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -8732,17 +8613,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:8736: checking for dlfcn.h" >&5 -+echo "configure:8618: checking for dlfcn.h" >&5 ++echo "configure:8617: 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:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8627: \"$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* -@@ -8778,7 +8660,7 @@ if test ! "$GNU_CXX"; then +@@ -8778,7 +8659,7 @@ case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 -echo "configure:8782: checking for demangle in -lC_r" >&5 -+echo "configure:8664: checking for demangle in -lC_r" >&5 ++echo "configure:8663: 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 -@@ -8786,7 +8668,7 @@ else +@@ -8786,7 +8667,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:8683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8682: \"$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 -@@ -8827,7 +8709,7 @@ fi +@@ -8827,7 +8708,7 @@ ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8831: checking for demangle in -lC" >&5 -+echo "configure:8713: checking for demangle in -lC" >&5 ++echo "configure:8712: 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 -@@ -8835,7 +8717,7 @@ else +@@ -8835,7 +8716,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:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8731: \"$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 -@@ -8877,7 +8759,7 @@ fi +@@ -8877,7 +8758,7 @@ esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8881: checking for socket in -lsocket" >&5 -+echo "configure:8763: checking for socket in -lsocket" >&5 ++echo "configure:8762: 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 -@@ -8885,7 +8767,7 @@ else +@@ -8885,7 +8766,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:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8781: \"$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 -@@ -8941,7 +8823,7 @@ EOF +@@ -8941,7 +8822,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8945: checking for XDrawLines in -lX11" >&5 -+echo "configure:8827: checking for XDrawLines in -lX11" >&5 ++echo "configure:8826: 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 -@@ -8949,7 +8831,7 @@ else +@@ -8949,7 +8830,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:8846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8982,7 +8864,7 @@ MISSING_X="$MISSING_X -lX11" +@@ -8982,7 +8863,7 @@ fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8986: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8868: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8867: 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 -@@ -8990,7 +8872,7 @@ else +@@ -8990,7 +8871,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:8887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8886: \"$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 -@@ -9025,7 +8907,7 @@ fi +@@ -9025,7 +8906,7 @@ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:9029: checking for XtFree in -lXt" >&5 -+echo "configure:8911: checking for XtFree in -lXt" >&5 ++echo "configure:8910: 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 -@@ -9033,7 +8915,7 @@ else +@@ -9033,7 +8914,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:8930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8929: \"$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 -@@ -9065,7 +8947,7 @@ else +@@ -9065,7 +8946,7 @@ unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:9069: checking for IceFlush in -lICE" >&5 -+echo "configure:8951: checking for IceFlush in -lICE" >&5 ++echo "configure:8950: 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 -@@ -9073,7 +8955,7 @@ else +@@ -9073,7 +8954,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:8970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8969: \"$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 -@@ -9105,7 +8987,7 @@ else +@@ -9105,7 +8986,7 @@ fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:9109: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:8991: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:8990: 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 -@@ -9113,7 +8995,7 @@ else +@@ -9113,7 +8994,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:9010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9009: \"$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 -@@ -9145,7 +9027,7 @@ else +@@ -9145,7 +9026,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:9149: checking for XtFree in -lXt" >&5 -+echo "configure:9031: checking for XtFree in -lXt" >&5 ++echo "configure:9030: 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 -@@ -9153,7 +9035,7 @@ else +@@ -9153,7 +9034,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:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9049: \"$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 -@@ -9198,7 +9080,7 @@ fi +@@ -9198,7 +9079,7 @@ esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:9202: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:9084: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9083: 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 -@@ -9206,7 +9088,7 @@ else +@@ -9206,7 +9087,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:9103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9102: \"$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 -@@ -9239,17 +9121,17 @@ fi +@@ -9239,17 +9120,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:9243: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:9125: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9124: 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:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9134: \"$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* -@@ -9272,7 +9154,7 @@ fi +@@ -9272,7 +9153,7 @@ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:9276: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9158: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9157: 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 -@@ -9280,7 +9162,7 @@ else +@@ -9280,7 +9161,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:9177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9176: \"$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 -@@ -9313,17 +9195,17 @@ fi +@@ -9313,17 +9194,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:9317: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9199: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9198: 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:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9208: \"$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* -@@ -9353,7 +9235,7 @@ EOF +@@ -9353,7 +9234,7 @@ fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:9357: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9239: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9238: 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 -@@ -9361,7 +9243,7 @@ else +@@ -9361,7 +9242,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:9258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9257: \"$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 -@@ -9394,17 +9276,17 @@ fi +@@ -9394,17 +9275,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:9398: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9280: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9279: 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:9408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9289: \"$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* -@@ -9478,7 +9360,7 @@ fi +@@ -9478,7 +9359,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:9482: checking for $ac_word" >&5 -+echo "configure:9364: checking for $ac_word" >&5 ++echo "configure:9363: 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 -@@ -9514,7 +9396,7 @@ fi +@@ -9514,7 +9395,7 @@ min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:9518: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9400: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9399: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes -@@ -9562,7 +9444,7 @@ else +@@ -9562,7 +9443,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -9588,7 +9470,7 @@ main() +@@ -9588,7 +9469,7 @@ } EOF -if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -9640,7 +9522,7 @@ fi # $no_x +@@ -9640,7 +9521,7 @@ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:9644: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9526: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9525: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9662,7 +9544,7 @@ echo " +@@ -9662,7 +9543,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9666: checking for pthread_create in -lpthread" >&5 -+echo "configure:9548: checking for pthread_create in -lpthread" >&5 ++echo "configure:9547: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9684,7 +9566,7 @@ echo " +@@ -9684,7 +9565,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9688: checking for pthread_create in -lc_r" >&5 -+echo "configure:9570: checking for pthread_create in -lc_r" >&5 ++echo "configure:9569: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9706,7 +9588,7 @@ echo " +@@ -9706,7 +9587,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:9710: checking for pthread_create in -lc" >&5 -+echo "configure:9592: checking for pthread_create in -lc" >&5 ++echo "configure:9591: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9762,7 +9644,7 @@ then +@@ -9762,7 +9643,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:9766: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9648: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9647: 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 -@@ -9785,7 +9667,7 @@ echo "configure:9766: checking whether ${CC-cc} accepts -pthread" >&5 +@@ -9785,7 +9666,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:9789: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9671: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9670: 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 -@@ -9831,7 +9713,7 @@ EOF +@@ -9831,7 +9712,7 @@ fi ;; @@ -3414,165 +3422,165 @@ cat >> confdefs.h <<\EOF #define _REENTRANT 1 EOF -@@ -9907,7 +9789,7 @@ esac +@@ -9907,7 +9788,7 @@ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:9911: checking whether mmap() sees write()s" >&5 -+echo "configure:9793: checking whether mmap() sees write()s" >&5 ++echo "configure:9792: checking whether mmap() sees write()s" >&5 mmap_test_prog=' -@@ -9946,11 +9828,11 @@ if test "$cross_compiling" = yes; then +@@ -9946,11 +9827,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:9836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -9975,13 +9857,13 @@ fi +@@ -9975,13 +9856,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:9979: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9861: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9860: 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 -@@ -9999,7 +9881,7 @@ rm -f conftest* +@@ -9999,7 +9880,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA -@@ -10021,7 +9903,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 +@@ -10021,7 +9902,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:10025: checking for 8-bit clean memcmp" >&5 -+echo "configure:9907: checking for 8-bit clean memcmp" >&5 ++echo "configure:9906: 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 -@@ -10029,7 +9911,7 @@ else +@@ -10029,7 +9910,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:9925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9924: \"$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 -@@ -10059,12 +9941,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" +@@ -10059,12 +9940,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:10063: checking for $ac_func" >&5 -+echo "configure:9945: checking for $ac_func" >&5 ++echo "configure:9944: 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:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9972: \"$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 -@@ -10114,12 +9996,12 @@ done +@@ -10114,12 +9995,12 @@ for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10118: checking for $ac_func" >&5 -+echo "configure:10000: checking for $ac_func" >&5 ++echo "configure:9999: 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:10028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10027: \"$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 -@@ -10171,12 +10053,12 @@ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "10 +@@ -10171,12 +10052,12 @@ for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10175: checking for $ac_func" >&5 -+echo "configure:10057: checking for $ac_func" >&5 ++echo "configure:10056: 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:10085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10084: \"$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 -@@ -10235,19 +10117,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -10235,19 +10116,19 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 -echo "configure:10239: checking for wcrtomb" >&5 -+echo "configure:10121: checking for wcrtomb" >&5 ++echo "configure:10120: 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:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else -@@ -10267,19 +10149,19 @@ EOF +@@ -10267,19 +10148,19 @@ fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:10271: checking for mbrtowc" >&5 -+echo "configure:10153: checking for mbrtowc" >&5 ++echo "configure:10152: 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:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else -@@ -10308,12 +10190,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -10308,12 +10189,12 @@ fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:10312: checking for res_ninit()" >&5 -+echo "configure:10194: checking for res_ninit()" >&5 ++echo "configure:10193: 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:10211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10210: \"$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 -@@ -10355,12 +10237,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -10355,12 +10236,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 -echo "configure:10359: checking for gnu_get_libc_version()" >&5 -+echo "configure:10241: checking for gnu_get_libc_version()" >&5 ++echo "configure:10240: 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:10257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10256: \"$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 -@@ -10400,7 +10282,7 @@ case $target_os in +@@ -10400,7 +10281,7 @@ *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:10404: checking for iconv in -lc" >&5 -+echo "configure:10286: checking for iconv in -lc" >&5 ++echo "configure:10285: 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 -@@ -10408,7 +10290,7 @@ else +@@ -10408,7 +10289,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:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10307: \"$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 -@@ -10441,7 +10323,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -10441,7 +10322,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:10445: checking for iconv in -liconv" >&5 -+echo "configure:10327: checking for iconv in -liconv" >&5 ++echo "configure:10326: 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 -@@ -10449,7 +10331,7 @@ else +@@ -10449,7 +10330,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:10349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10348: \"$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 -@@ -10482,7 +10364,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -10482,7 +10363,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -echo "configure:10486: checking for libiconv in -liconv" >&5 -+echo "configure:10368: checking for libiconv in -liconv" >&5 ++echo "configure:10367: 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 -@@ -10490,7 +10372,7 @@ else +@@ -10490,7 +10371,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:10390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10389: \"$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 -@@ -10531,12 +10413,12 @@ fi +@@ -10531,12 +10412,12 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:10535: checking for iconv()" >&5 -+echo "configure:10417: checking for iconv()" >&5 ++echo "configure:10416: 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 < -@@ -10550,7 +10432,7 @@ int main() { +@@ -10550,7 +10431,7 @@ ; return 0; } EOF -if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else -@@ -10574,12 +10456,12 @@ EOF +@@ -10574,12 +10455,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:10578: checking for iconv() with const input" >&5 -+echo "configure:10460: checking for iconv() with const input" >&5 ++echo "configure:10459: 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 < -@@ -10594,7 +10476,7 @@ int main() { +@@ -10594,7 +10475,7 @@ ; return 0; } EOF -if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else -@@ -10623,19 +10505,19 @@ esac +@@ -10623,19 +10504,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:10627: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10509: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10508: 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:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else -@@ -10667,7 +10549,7 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -10667,7 +10548,7 @@ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:10671: checking for an implementation of va_copy()" >&5 -+echo "configure:10553: checking for an implementation of va_copy()" >&5 ++echo "configure:10552: 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 -@@ -10677,7 +10559,7 @@ else +@@ -10677,7 +10558,7 @@ else cat > conftest.$ac_ext < -@@ -10691,7 +10573,7 @@ else +@@ -10691,7 +10572,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10576: \"$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 -@@ -10708,7 +10590,7 @@ fi +@@ -10708,7 +10589,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:10712: checking for an implementation of __va_copy()" >&5 -+echo "configure:10594: checking for an implementation of __va_copy()" >&5 ++echo "configure:10593: 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 -@@ -10718,7 +10600,7 @@ else +@@ -10718,7 +10599,7 @@ else cat > conftest.$ac_ext < -@@ -10732,7 +10614,7 @@ else +@@ -10732,7 +10613,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10617: \"$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 -@@ -10749,7 +10631,7 @@ fi +@@ -10749,7 +10630,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:10753: checking whether va_lists can be copied by value" >&5 -+echo "configure:10635: checking whether va_lists can be copied by value" >&5 ++echo "configure:10634: 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 -@@ -10759,7 +10641,7 @@ else +@@ -10759,7 +10640,7 @@ else cat > conftest.$ac_ext < -@@ -10773,7 +10655,7 @@ else +@@ -10773,7 +10654,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10658: \"$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 -@@ -10872,7 +10754,7 @@ esac +@@ -10872,7 +10753,7 @@ if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:10876: checking for C++ exceptions flag" >&5 -+echo "configure:10758: checking for C++ exceptions flag" >&5 ++echo "configure:10757: 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 -@@ -10907,12 +10789,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -10907,12 +10788,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 -echo "configure:10911: checking for gcc 3.0 ABI" >&5 -+echo "configure:10793: checking for gcc 3.0 ABI" >&5 ++echo "configure:10792: 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:10811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else -@@ -10949,12 +10831,12 @@ fi +@@ -10949,12 +10830,12 @@ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:10953: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10835: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10834: 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:10850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else -@@ -10985,12 +10867,12 @@ EOF +@@ -10985,12 +10866,12 @@ fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:10989: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10871: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10870: 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; +@@ -11009,7 +10890,7 @@ A.foo(0); ; return 0; } EOF -if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else -@@ -11030,12 +10912,12 @@ EOF +@@ -11030,12 +10911,12 @@ fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:11034: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10916: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10915: 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 {}; -@@ -11045,7 +10927,7 @@ X int_x; +@@ -11045,7 +10926,7 @@ X y_x; ; return 0; } EOF -if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else -@@ -11067,12 +10949,12 @@ fi +@@ -11067,12 +10948,12 @@ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:11071: checking whether partial template specialization works" >&5 -+echo "configure:10953: checking whether partial template specialization works" >&5 ++echo "configure:10952: 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 {}; -@@ -11080,7 +10962,7 @@ int main() { +@@ -11080,7 +10961,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:11084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else -@@ -11101,12 +10983,12 @@ EOF +@@ -11101,12 +10982,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:11105: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:10987: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10986: 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 -@@ -11118,7 +11000,7 @@ Derived a, b; +@@ -11118,7 +10999,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:11122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else -@@ -11140,12 +11022,12 @@ fi +@@ -11140,12 +11021,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:11144: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11026: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11025: 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 { }; -@@ -11154,7 +11036,7 @@ int main() { +@@ -11154,7 +11035,7 @@ Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:11158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else -@@ -11175,12 +11057,12 @@ EOF +@@ -11175,12 +11056,12 @@ fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:11179: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11061: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11060: 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 { -@@ -11201,7 +11083,7 @@ int main() { +@@ -11201,7 +11082,7 @@ a(&i); ; return 0; } EOF -if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else -@@ -11223,12 +11105,12 @@ fi +@@ -11223,12 +11104,12 @@ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:11227: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11109: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11108: 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:11122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11121: \"$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:11133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else -@@ -11275,12 +11157,12 @@ EOF +@@ -11275,12 +11156,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:11279: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11161: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11160: 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:11182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else -@@ -11317,19 +11199,19 @@ EOF +@@ -11317,19 +11198,19 @@ fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:11321: checking for \"std::\" namespace" >&5 -+echo "configure:11203: checking for \"std::\" namespace" >&5 ++echo "configure:11202: 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:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else -@@ -11350,12 +11232,12 @@ EOF +@@ -11350,12 +11231,12 @@ fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:11354: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11236: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11235: 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 {}; -@@ -11365,7 +11247,7 @@ int main() { +@@ -11365,7 +11246,7 @@ T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else -@@ -11387,12 +11269,12 @@ fi +@@ -11387,12 +11268,12 @@ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:11391: checking for C++ reinterpret_cast" >&5 -+echo "configure:11273: checking for C++ reinterpret_cast" >&5 ++echo "configure:11272: 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:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else -@@ -11421,7 +11303,7 @@ EOF +@@ -11421,7 +11302,7 @@ fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:11425: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11307: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11306: 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 -@@ -11429,8 +11311,11 @@ else +@@ -11429,8 +11310,11 @@ ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11333: \"$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 -@@ -11469,19 +11354,19 @@ fi +@@ -11469,19 +11353,19 @@ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:11473: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11358: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11357: 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:11370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11369: \"$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 -@@ -11504,12 +11389,12 @@ fi +@@ -11504,12 +11388,12 @@ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:11508: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11393: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11392: 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 {}; -@@ -11520,7 +11405,7 @@ int main() { +@@ -11520,7 +11404,7 @@ Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else -@@ -11552,19 +11437,19 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -11552,19 +11436,19 @@ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:11556: checking for LC_MESSAGES" >&5 -+echo "configure:11441: checking for LC_MESSAGES" >&5 ++echo "configure:11440: 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:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else -@@ -11645,7 +11530,7 @@ fi +@@ -11645,7 +11529,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:11649: checking for $ac_word" >&5 -+echo "configure:11534: checking for $ac_word" >&5 ++echo "configure:11533: 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 -@@ -11680,7 +11565,7 @@ fi +@@ -11680,7 +11564,7 @@ min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 -echo "configure:11684: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11569: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11568: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then -@@ -11782,7 +11667,7 @@ fi +@@ -11782,7 +11666,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:11786: checking for $ac_word" >&5 -+echo "configure:11671: checking for $ac_word" >&5 ++echo "configure:11670: 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 -@@ -11817,7 +11702,7 @@ fi +@@ -11817,7 +11701,7 @@ min_nss_version=3.0.0 echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 -echo "configure:11821: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+echo "configure:11706: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11705: checking for NSS - version >= $min_nss_version (skipping)" >&5 no_nss="" if test "$NSS_CONFIG" = "no"; then -@@ -11890,7 +11775,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then +@@ -11849,7 +11733,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='\\\ +@@ -11890,7 +11774,7 @@ SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:11894: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11779: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11778: 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 -@@ -11898,7 +11783,7 @@ else +@@ -11898,7 +11782,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:11798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11797: \"$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 -@@ -11932,13 +11817,13 @@ fi +@@ -11932,13 +11816,13 @@ fi @@ -4397,47 +4414,47 @@ else cat > conftest.$ac_ext < #include -@@ -11952,7 +11837,7 @@ else +@@ -11952,7 +11836,7 @@ } EOF -if { (eval echo configure:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else -@@ -11993,7 +11878,7 @@ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then +@@ -11993,7 +11877,7 @@ SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:11997: checking for gzread in -lz" >&5 -+echo "configure:11882: checking for gzread in -lz" >&5 ++echo "configure:11881: 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 -@@ -12001,7 +11886,7 @@ else +@@ -12001,7 +11885,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:11901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11900: \"$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 -@@ -12034,13 +11919,13 @@ SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS= +@@ -12034,13 +11918,13 @@ fi fi @@ -4449,20 +4466,20 @@ else cat > conftest.$ac_ext < -@@ -12061,7 +11946,7 @@ else +@@ -12061,7 +11945,7 @@ } EOF -if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else -@@ -12084,6 +11969,74 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then +@@ -12084,6 +11968,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:11991: checking for BZ2_bzread in -lbz2" >&5 ++echo "configure:11990: 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:12009: \"$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" -@@ -12104,7 +12057,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then +@@ -12104,7 +12056,7 @@ SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:12108: checking for png_get_valid in -lpng" >&5 -+echo "configure:12061: checking for png_get_valid in -lpng" >&5 ++echo "configure:12060: 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 -@@ -12112,7 +12065,7 @@ else +@@ -12112,7 +12064,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:12080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12079: \"$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 -@@ -12145,13 +12098,13 @@ SYSTEM_PNG= +@@ -12145,13 +12097,13 @@ fi fi @@ -4576,20 +4593,20 @@ else cat > conftest.$ac_ext < #include -@@ -12165,7 +12118,7 @@ else +@@ -12165,7 +12117,7 @@ } EOF -if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else -@@ -12190,6 +12143,116 @@ fi +@@ -12190,6 +12142,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:12168: checking for $ac_word" >&5 ++echo "configure:12167: 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:12212: checking for hunspell" >&5 ++echo "configure:12211: 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:12219: checking MOZ_HUNSPELL_CFLAGS" >&5 ++echo "configure:12218: 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:12224: checking MOZ_HUNSPELL_LIBS" >&5 ++echo "configure:12223: 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 -@@ -12415,7 +12478,7 @@ fi +@@ -12415,7 +12477,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:12419: checking for $ac_word" >&5 -+echo "configure:12482: checking for $ac_word" >&5 ++echo "configure:12481: 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 -@@ -12450,7 +12513,7 @@ fi +@@ -12450,7 +12512,7 @@ min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:12517: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12516: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes -@@ -12473,7 +12536,7 @@ echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5 +@@ -12473,7 +12535,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -12551,7 +12614,7 @@ main () +@@ -12551,7 +12613,7 @@ } EOF -if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -12586,7 +12649,7 @@ fi +@@ -12586,7 +12648,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < -@@ -12596,7 +12659,7 @@ int main() { +@@ -12596,7 +12658,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12662: \"$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" -@@ -12648,7 +12711,7 @@ then +@@ -12648,7 +12710,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:12652: checking for $ac_word" >&5 -+echo "configure:12715: checking for $ac_word" >&5 ++echo "configure:12714: 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 -@@ -12692,19 +12755,19 @@ fi +@@ -12692,19 +12754,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:12696: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12759: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12758: 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:12703: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12766: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12765: 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:12708: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12771: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12770: 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\"`" -@@ -12769,7 +12832,7 @@ do +@@ -12769,7 +12831,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:12773: checking for $ac_word" >&5 -+echo "configure:12836: checking for $ac_word" >&5 ++echo "configure:12835: 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 -@@ -12821,7 +12884,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -12821,7 +12883,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 -echo "configure:12825: checking for main in -lqt" >&5 -+echo "configure:12888: checking for main in -lqt" >&5 ++echo "configure:12887: 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 -@@ -12829,14 +12892,14 @@ else +@@ -12829,14 +12891,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:12903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12902: \"$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 -@@ -12855,7 +12918,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -12855,7 +12917,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 -echo "configure:12859: checking for main in -lqt-mt" >&5 -+echo "configure:12922: checking for main in -lqt-mt" >&5 ++echo "configure:12921: 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 -@@ -12863,14 +12926,14 @@ else +@@ -12863,14 +12925,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:12937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12936: \"$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 -@@ -12906,9 +12969,9 @@ fi +@@ -12906,9 +12968,9 @@ LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:12910: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12973: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12972: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { -@@ -12919,7 +12982,7 @@ int main() { +@@ -12919,7 +12981,7 @@ ; return 0; } EOF -if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else -@@ -13515,7 +13578,7 @@ EOF +@@ -13515,7 +13577,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:13519: checking for $ac_word" >&5 -+echo "configure:13582: checking for $ac_word" >&5 ++echo "configure:13581: 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 -@@ -13559,19 +13622,19 @@ fi +@@ -13559,19 +13621,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:13563: checking for xft" >&5 -+echo "configure:13626: checking for xft" >&5 ++echo "configure:13625: 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:13570: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13633: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13632: 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:13575: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13638: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13637: 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\"`" -@@ -13606,7 +13669,7 @@ echo "configure:13575: checking MOZ_XFT_LIBS" >&5 +@@ -13606,7 +13668,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:13610: checking for $ac_word" >&5 -+echo "configure:13673: checking for $ac_word" >&5 ++echo "configure:13672: 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 -@@ -13650,19 +13713,19 @@ fi +@@ -13650,19 +13712,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:13654: checking for pango >= 1.1.0" >&5 -+echo "configure:13717: checking for pango >= 1.1.0" >&5 ++echo "configure:13716: 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:13661: checking _PANGOCHK_CFLAGS" >&5 -+echo "configure:13724: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13723: 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:13666: checking _PANGOCHK_LIBS" >&5 -+echo "configure:13729: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13728: 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\"`" -@@ -13722,7 +13785,7 @@ EOF +@@ -13722,7 +13784,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:13726: checking for $ac_word" >&5 -+echo "configure:13789: checking for $ac_word" >&5 ++echo "configure:13788: 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 -@@ -13766,19 +13829,19 @@ fi +@@ -13766,19 +13828,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6 -echo "configure:13770: checking for pangoxft >= 1.6.0" >&5 -+echo "configure:13833: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13832: checking for pangoxft >= 1.6.0" >&5 if $PKG_CONFIG --exists "pangoxft >= 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:13777: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13840: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13839: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:13782: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13845: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13844: 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 \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`" -@@ -13846,7 +13909,7 @@ then +@@ -13846,7 +13908,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:13850: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13913: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13912: 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 -@@ -13854,7 +13917,7 @@ else +@@ -13854,7 +13916,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:13932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13931: \"$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 -@@ -13938,7 +14001,7 @@ fi +@@ -13938,7 +14000,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:13942: checking for $ac_word" >&5 -+echo "configure:14005: checking for $ac_word" >&5 ++echo "configure:14004: 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 -@@ -13982,19 +14045,19 @@ fi +@@ -13982,19 +14044,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:13986: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14049: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14048: 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:13993: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14056: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14055: 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:13998: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14061: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14060: 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\"`" -@@ -14045,7 +14108,7 @@ echo "configure:13998: checking MOZ_GNOMEVFS_LIBS" >&5 +@@ -14045,7 +14107,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:14049: checking for $ac_word" >&5 -+echo "configure:14112: checking for $ac_word" >&5 ++echo "configure:14111: 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 -@@ -14089,19 +14152,19 @@ fi +@@ -14089,19 +14151,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:14093: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14156: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14155: 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:14100: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14163: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14162: 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:14105: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14168: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14167: 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\"`" -@@ -14148,7 +14211,7 @@ echo "configure:14105: checking MOZ_GCONF_LIBS" >&5 +@@ -14148,7 +14210,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:14152: checking for $ac_word" >&5 -+echo "configure:14215: checking for $ac_word" >&5 ++echo "configure:14214: 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 -@@ -14192,19 +14255,19 @@ fi +@@ -14192,19 +14254,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:14196: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14259: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14258: 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:14203: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14266: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14265: 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:14208: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14271: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14270: 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\"`" -@@ -14282,7 +14345,7 @@ fi +@@ -14282,7 +14344,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:14286: checking for $ac_word" >&5 -+echo "configure:14349: checking for $ac_word" >&5 ++echo "configure:14348: 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 -@@ -14326,19 +14389,19 @@ fi +@@ -14326,19 +14388,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:14330: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14393: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14392: 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:14337: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14400: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14399: 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:14342: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14405: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14404: 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\"`" -@@ -14824,7 +14887,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then +@@ -14824,7 +14886,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:14828: checking for $ac_word" >&5 -+echo "configure:14891: checking for $ac_word" >&5 ++echo "configure:14890: 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 -@@ -14860,7 +14923,7 @@ fi +@@ -14860,7 +14922,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:14864: checking for $ac_word" >&5 -+echo "configure:14927: checking for $ac_word" >&5 ++echo "configure:14926: 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 -@@ -15107,7 +15170,7 @@ fi +@@ -15107,7 +15169,7 @@ gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:15111: checking for Gdiplus.h" >&5 -+echo "configure:15174: checking for Gdiplus.h" >&5 ++echo "configure:15173: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -15117,7 +15180,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes +@@ -15117,7 +15179,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include -@@ -15126,7 +15189,7 @@ int main() { +@@ -15126,7 +15188,7 @@ ; return 0; } EOF -if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else -@@ -15206,7 +15269,7 @@ do +@@ -15206,7 +15268,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:15210: checking for $ac_word" >&5 -+echo "configure:15273: checking for $ac_word" >&5 ++echo "configure:15272: 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 -@@ -15251,7 +15314,7 @@ do +@@ -15251,7 +15313,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:15255: checking for $ac_word" >&5 -+echo "configure:15318: checking for $ac_word" >&5 ++echo "configure:15317: 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 -@@ -15320,13 +15383,13 @@ case "$target_os" in +@@ -15320,13 +15382,13 @@ msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:15324: checking for iconv" >&5 -+echo "configure:15387: checking for iconv" >&5 ++echo "configure:15386: 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:15330: checking for $ac_word" >&5 -+echo "configure:15393: checking for $ac_word" >&5 ++echo "configure:15392: 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 -@@ -15469,6 +15532,21 @@ if test "${enable_tests+set}" = set; then +@@ -15469,6 +15531,21 @@ fi @@ -5226,7 +5243,7 @@ # Individual module options # Check whether --enable-xpcom-lea or --disable-xpcom-lea was given. -@@ -15611,6 +15689,84 @@ if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ +@@ -15611,6 +15688,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:15720: checking for readline in -lreadline" >&5 ++echo "configure:15719: 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:15738: \"$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 -@@ -15672,18 +15828,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" +@@ -15672,18 +15827,18 @@ if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -echo "configure:15676: checking for valid debug flags" >&5 -+echo "configure:15832: checking for valid debug flags" >&5 ++echo "configure:15831: 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:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15724,18 +15880,18 @@ fi +@@ -15724,18 +15879,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:15728: checking for valid optimization flags" >&5 -+echo "configure:15884: checking for valid optimization flags" >&5 ++echo "configure:15883: 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:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15952,7 +16108,7 @@ fi +@@ -15952,7 +16107,7 @@ if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:15956: checking for malloc in -lefence" >&5 -+echo "configure:16112: checking for malloc in -lefence" >&5 ++echo "configure:16111: 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 -@@ -15960,7 +16116,7 @@ else +@@ -15960,7 +16115,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:16131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16130: \"$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 -@@ -16072,12 +16228,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -16072,12 +16227,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:16076: checking for $ac_func" >&5 -+echo "configure:16232: checking for $ac_func" >&5 ++echo "configure:16231: 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:16263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16262: \"$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 -@@ -16346,12 +16502,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -16346,12 +16501,12 @@ for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16350: checking for $ac_func" >&5 -+echo "configure:16506: checking for $ac_func" >&5 ++echo "configure:16505: 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:16537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16536: \"$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 -@@ -16456,6 +16612,53 @@ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && +@@ -16456,6 +16611,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:16623: checking for $ac_word" >&5 ++echo "configure:16622: 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" -@@ -16515,7 +16718,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then +@@ -16515,7 +16717,7 @@ # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:16519: checking for gcc -pipe support" >&5 -+echo "configure:16722: checking for gcc -pipe support" >&5 ++echo "configure:16721: 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 -@@ -16530,14 +16733,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then +@@ -16530,14 +16732,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { @@ -5506,19 +5523,19 @@ ; return 0; } EOF -if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else -@@ -16579,16 +16782,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then +@@ -16579,16 +16781,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:16583: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:16786: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16785: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16794: \"$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" -@@ -16609,16 +16812,16 @@ _SAVE_CFLAGS="$CFLAGS" +@@ -16609,16 +16811,16 @@ CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:16613: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:16816: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16815: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" -@@ -16636,16 +16839,16 @@ if test $result = "yes"; then +@@ -16636,16 +16838,16 @@ else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 -echo "configure:16640: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:16843: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16842: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" -@@ -16691,16 +16894,16 @@ if test "$_PEDANTIC"; then +@@ -16691,16 +16893,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:16695: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:16898: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16897: 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:16907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="no" else -@@ -16725,13 +16928,16 @@ rm -f conftest* +@@ -16725,13 +16927,16 @@ fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:16729: checking for correct temporary object destruction order" >&5 -+echo "configure:16932: checking for correct temporary object destruction order" >&5 ++echo "configure:16931: 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:16960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -16771,12 +16977,12 @@ fi +@@ -16771,12 +16976,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:16775: checking for correct overload resolution with const and templates" >&5 -+echo "configure:16981: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16980: 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 < -@@ -16806,7 +17012,7 @@ int main() { +@@ -16806,7 +17011,7 @@ ; return 0; } EOF -if { (eval echo configure:16810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else -@@ -17098,7 +17304,7 @@ then +@@ -17098,7 +17303,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:17102: checking for $ac_word" >&5 -+echo "configure:17308: checking for $ac_word" >&5 ++echo "configure:17307: 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 -@@ -17142,19 +17348,19 @@ fi +@@ -17142,19 +17347,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:17146: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17352: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17351: 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:17153: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17359: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17358: 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:17158: checking LIBIDL_LIBS" >&5 -+echo "configure:17364: checking LIBIDL_LIBS" >&5 ++echo "configure:17363: 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\"`" -@@ -17277,7 +17483,7 @@ fi +@@ -17277,7 +17482,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:17281: checking for $ac_word" >&5 -+echo "configure:17487: checking for $ac_word" >&5 ++echo "configure:17486: 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 -@@ -17312,7 +17518,7 @@ fi +@@ -17312,7 +17517,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17522: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17521: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17335,7 +17541,7 @@ echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5 +@@ -17335,7 +17540,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17411,7 +17617,7 @@ main () +@@ -17411,7 +17616,7 @@ } EOF -if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17445,7 +17651,7 @@ fi +@@ -17445,7 +17650,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17455,7 +17661,7 @@ int main() { +@@ -17455,7 +17660,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:17459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17664: \"$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" -@@ -17499,7 +17705,7 @@ rm -f conftest* +@@ -17499,7 +17704,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:17503: checking for $ac_word" >&5 -+echo "configure:17709: checking for $ac_word" >&5 ++echo "configure:17708: 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 -@@ -17534,7 +17740,7 @@ fi +@@ -17534,7 +17739,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17744: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17743: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -17561,7 +17767,7 @@ echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5 +@@ -17561,7 +17766,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17647,7 +17853,7 @@ main () +@@ -17647,7 +17852,7 @@ } EOF -if { (eval echo configure:17651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17681,7 +17887,7 @@ fi +@@ -17681,7 +17886,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -17692,7 +17898,7 @@ int main() { +@@ -17692,7 +17897,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17901: \"$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" -@@ -17820,7 +18026,7 @@ fi +@@ -17820,7 +18025,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:17824: checking for $ac_word" >&5 -+echo "configure:18030: checking for $ac_word" >&5 ++echo "configure:18029: 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 -@@ -17855,7 +18061,7 @@ fi +@@ -17855,7 +18060,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18065: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18064: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17878,7 +18084,7 @@ echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5 +@@ -17878,7 +18083,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17954,7 +18160,7 @@ main () +@@ -17954,7 +18159,7 @@ } EOF -if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17988,7 +18194,7 @@ fi +@@ -17988,7 +18193,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17998,7 +18204,7 @@ int main() { +@@ -17998,7 +18203,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:18002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18207: \"$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" -@@ -18042,7 +18248,7 @@ rm -f conftest* +@@ -18042,7 +18247,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:18046: checking for $ac_word" >&5 -+echo "configure:18252: checking for $ac_word" >&5 ++echo "configure:18251: 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 -@@ -18077,7 +18283,7 @@ fi +@@ -18077,7 +18282,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18287: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18286: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -18104,7 +18310,7 @@ echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5 +@@ -18104,7 +18309,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18190,7 +18396,7 @@ main () +@@ -18190,7 +18395,7 @@ } EOF -if { (eval echo configure:18194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18224,7 +18430,7 @@ fi +@@ -18224,7 +18429,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -18235,7 +18441,7 @@ int main() { +@@ -18235,7 +18440,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:18239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18444: \"$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" -@@ -18276,7 +18482,7 @@ rm -f conftest* +@@ -18276,7 +18481,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:18280: checking for $ac_word" >&5 -+echo "configure:18486: checking for $ac_word" >&5 ++echo "configure:18485: 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 -@@ -18320,19 +18526,19 @@ fi +@@ -18320,19 +18525,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:18324: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18530: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18529: 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:18331: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18537: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18536: 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:18336: checking LIBIDL_LIBS" >&5 -+echo "configure:18542: checking LIBIDL_LIBS" >&5 ++echo "configure:18541: 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\"`" -@@ -18368,7 +18574,7 @@ do +@@ -18368,7 +18573,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:18372: checking for $ac_word" >&5 -+echo "configure:18578: checking for $ac_word" >&5 ++echo "configure:18577: 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 -@@ -18405,7 +18611,7 @@ done +@@ -18405,7 +18610,7 @@ if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:18409: checking for ORBit libIDL usability" >&5 -+echo "configure:18615: checking for ORBit libIDL usability" >&5 ++echo "configure:18614: 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}` -@@ -18422,7 +18628,7 @@ echo "configure:18409: checking for ORBit libIDL usability" >&5 +@@ -18422,7 +18627,7 @@ result="maybe" else cat > conftest.$ac_ext < -@@ -18437,7 +18643,7 @@ int main() { +@@ -18437,7 +18642,7 @@ } EOF -if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18646: \"$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" -@@ -18494,7 +18700,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then +@@ -18494,7 +18699,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:18498: checking for $ac_word" >&5 -+echo "configure:18704: checking for $ac_word" >&5 ++echo "configure:18703: 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 -@@ -18538,19 +18744,19 @@ fi +@@ -18538,19 +18743,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:18542: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:18748: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18747: 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:18549: checking GLIB_CFLAGS" >&5 -+echo "configure:18755: checking GLIB_CFLAGS" >&5 ++echo "configure:18754: 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:18554: checking GLIB_LIBS" >&5 -+echo "configure:18760: checking GLIB_LIBS" >&5 ++echo "configure:18759: 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\"`" -@@ -18634,7 +18840,7 @@ fi +@@ -18634,7 +18839,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:18638: checking for $ac_word" >&5 -+echo "configure:18844: checking for $ac_word" >&5 ++echo "configure:18843: 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 -@@ -18669,7 +18875,7 @@ fi +@@ -18669,7 +18874,7 @@ min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18879: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18878: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -18692,7 +18898,7 @@ echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5 +@@ -18692,7 +18897,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18768,7 +18974,7 @@ main () +@@ -18768,7 +18973,7 @@ } EOF -if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18802,7 +19008,7 @@ fi +@@ -18802,7 +19007,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -18812,7 +19018,7 @@ int main() { +@@ -18812,7 +19017,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19021: \"$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" -@@ -18892,19 +19098,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl" 1>&2; exit 1; } +@@ -18892,19 +19097,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:18896: checking for working alloca.h" >&5 -+echo "configure:19102: checking for working alloca.h" >&5 ++echo "configure:19101: 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:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19113: \"$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 -@@ -18925,12 +19131,12 @@ EOF +@@ -18925,12 +19130,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18929: checking for alloca" >&5 -+echo "configure:19135: checking for alloca" >&5 ++echo "configure:19134: 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:19168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19167: \"$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 -@@ -18990,12 +19196,12 @@ EOF +@@ -18990,12 +19195,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18994: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19200: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19199: 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 +@@ -19020,12 +19225,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:19024: checking for $ac_func" >&5 -+echo "configure:19230: checking for $ac_func" >&5 ++echo "configure:19229: 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:19258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19257: \"$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 -@@ -19075,7 +19281,7 @@ done +@@ -19075,7 +19280,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:19079: checking stack direction for C alloca" >&5 -+echo "configure:19285: checking stack direction for C alloca" >&5 ++echo "configure:19284: 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 -@@ -19083,7 +19289,7 @@ else +@@ -19083,7 +19288,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:19312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19311: \"$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 -@@ -19151,17 +19357,17 @@ fi +@@ -19151,17 +19356,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19155: checking for $ac_hdr" >&5 -+echo "configure:19361: checking for $ac_hdr" >&5 ++echo "configure:19360: 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:19165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19370: \"$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* -@@ -19252,7 +19458,7 @@ EOF +@@ -19252,7 +19457,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:19256: checking for $ac_word" >&5 -+echo "configure:19462: checking for $ac_word" >&5 ++echo "configure:19461: 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 -@@ -19296,19 +19502,19 @@ fi +@@ -19296,19 +19501,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:19300: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:19506: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19505: checking for cairo >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 @@ -6200,31 +6217,242 @@ echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:19307: checking CAIRO_CFLAGS" >&5 -+echo "configure:19513: checking CAIRO_CFLAGS" >&5 ++echo "configure:19512: 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:19312: checking CAIRO_LIBS" >&5 -+echo "configure:19518: checking CAIRO_LIBS" >&5 ++echo "configure:19517: 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\"`" -@@ -19373,7 +19579,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then +@@ -19338,6 +19543,199 @@ + + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # 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:19557: 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 ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ 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:19601: 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:19608: 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:19613: 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\"`" ++ echo "$ac_t""$CAIRO_XLIB_LIBS" 1>&6 ++ else ++ CAIRO_XLIB_CFLAGS="" ++ CAIRO_XLIB_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ : ++ fi ++ ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # 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:19652: 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 ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ 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:19696: 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:19703: 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:19708: 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\"`" ++ echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 ++ else ++ CAIRO_XRENDER_CFLAGS="" ++ CAIRO_XRENDER_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ : ++ fi ++ ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + +@@ -19345,6 +19743,10 @@ + + + ++ ++ ++ ++ + # Check whether --enable-xul or --disable-xul was given. + if test "${enable_xul+set}" = set; then + enableval="$enable_xul" +@@ -19373,7 +19775,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:19377: checking for $ac_word" >&5 -+echo "configure:19583: checking for $ac_word" >&5 ++echo "configure:19779: 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 -@@ -19649,14 +19855,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a +@@ -19649,14 +20051,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { @@ -6232,11 +6460,11 @@ ; return 0; } EOF -if { (eval echo configure:19660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -19840,6 +20046,7 @@ fi # COMPILE_ENVIRONMENT +@@ -19840,6 +20242,7 @@ @@ -6244,7 +6472,7 @@ CFLAGS=`echo \ $_WARNINGS_CFLAGS \ $CFLAGS` -@@ -19936,6 +20143,9 @@ COMPILE_CXXFLAGS=`echo \ +@@ -19936,6 +20339,9 @@ @@ -6254,25 +6482,25 @@ cat >> confdefs.h < conftest.$ac_ext < -@@ -19979,7 +20189,7 @@ int main() { +@@ -19979,7 +20385,7 @@ ; return 0; } EOF -if { (eval echo configure:19983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -20197,34 +20407,15 @@ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h +@@ -20197,34 +20603,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. @@ -6316,7 +6544,7 @@ MOZ_DEFINES=$DEFS -@@ -20427,7 +20618,6 @@ s%@DOXYGEN@%$DOXYGEN%g +@@ -20427,7 +20814,6 @@ s%@WHOAMI@%$WHOAMI%g s%@AUTOCONF@%$AUTOCONF%g s%@UNZIP@%$UNZIP%g @@ -6324,7 +6552,7 @@ s%@SYSTEM_MAKEDEPEND@%$SYSTEM_MAKEDEPEND%g s%@XARGS@%$XARGS%g s%@PBBUILD@%$PBBUILD%g -@@ -20464,10 +20654,13 @@ s%@NSPR_LIBS@%$NSPR_LIBS%g +@@ -20464,10 +20850,13 @@ s%@NSS_CONFIG@%$NSS_CONFIG%g s%@NSS_CFLAGS@%$NSS_CFLAGS%g s%@NSS_LIBS@%$NSS_LIBS%g @@ -6339,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 -@@ -20541,6 +20734,9 @@ s%@MOZ_ACTIVEX_SCRIPTING_SUPPORT@%$MOZ_ACTIVEX_SCRIPTING_SUPPORT%g +@@ -20541,6 +20930,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 @@ -6349,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 -@@ -20548,6 +20744,7 @@ s%@DETECT_WEBSHELL_LEAKS@%$DETECT_WEBSHELL_LEAKS%g +@@ -20548,6 +20940,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 @@ -6357,7 +6585,25 @@ 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 -@@ -20699,6 +20896,7 @@ s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g +@@ -20588,9 +20981,17 @@ + s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g + s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g + s%@CAIRO_LIBS@%$CAIRO_LIBS%g ++s%@CAIRO_XLIB_CFLAGS@%$CAIRO_XLIB_CFLAGS%g ++s%@CAIRO_XLIB_LIBS@%$CAIRO_XLIB_LIBS%g ++s%@CAIRO_XRENDER_CFLAGS@%$CAIRO_XRENDER_CFLAGS%g ++s%@CAIRO_XRENDER_LIBS@%$CAIRO_XRENDER_LIBS%g + s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g + s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g + s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g ++s%@MOZ_CAIRO_XLIB_CFLAGS@%$MOZ_CAIRO_XLIB_CFLAGS%g ++s%@MOZ_CAIRO_XLIB_LIBS@%$MOZ_CAIRO_XLIB_LIBS%g ++s%@MOZ_CAIRO_XRENDER_CFLAGS@%$MOZ_CAIRO_XRENDER_CFLAGS%g ++s%@MOZ_CAIRO_XRENDER_LIBS@%$MOZ_CAIRO_XRENDER_LIBS%g + s%@MOZ_XUL@%$MOZ_XUL%g + s%@MOZ_PYTHON@%$MOZ_PYTHON%g + s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g +@@ -20699,6 +21100,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 @@ -6365,7 +6611,7 @@ s%@IBMBIDI@%$IBMBIDI%g s%@SUNCTL@%$SUNCTL%g s%@ACCESSIBILITY@%$ACCESSIBILITY%g -@@ -20748,6 +20946,7 @@ s%@AS_PERL@%$AS_PERL%g +@@ -20748,6 +21150,7 @@ s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g s%@SYSTEM_PNG@%$SYSTEM_PNG%g s%@SYSTEM_ZLIB@%$SYSTEM_ZLIB%g @@ -6373,7 +6619,7 @@ s%@JPEG_CFLAGS@%$JPEG_CFLAGS%g s%@JPEG_LIBS@%$JPEG_LIBS%g s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g -@@ -20758,6 +20957,8 @@ s%@MOZ_JPEG_CFLAGS@%$MOZ_JPEG_CFLAGS%g +@@ -20758,6 +21161,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 @@ -6382,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 -@@ -21163,7 +21364,7 @@ if test "$no_recursion" != yes; then +@@ -21163,7 +21568,7 @@ fi fi @@ -6391,7 +6637,7 @@ done fi -@@ -21306,7 +21507,7 @@ if test "$no_recursion" != yes; then +@@ -21306,7 +21711,7 @@ fi fi @@ -6403,13 +6648,0 @@ -diff --git a/nsprpub/configure b/nsprpub/configure -index f53e929..e2108bf 100755 ---- a/nsprpub/configure -+++ b/nsprpub/configure -@@ -5981,7 +5981,7 @@ s%\[%\\&%g - s%\]%\\&%g - s%\$%$$%g - EOF --DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` - rm -f conftest.defs - - diff -u xulrunner-1.8.1.9/debian/changelog xulrunner-1.8.1.9/debian/changelog --- xulrunner-1.8.1.9/debian/changelog +++ xulrunner-1.8.1.9/debian/changelog @@ -1,3 +1,28 @@ +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 and xulrunner.prerm) + - 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) @@ -60,6 +85,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 @@ -82,6 +179,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) @@ -156,6 +270,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 @@ -249,6 +371,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, @@ -266,6 +398,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) @@ -326,6 +469,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) @@ -1166,0 +1318 @@ + diff -u xulrunner-1.8.1.9/debian/control xulrunner-1.8.1.9/debian/control --- xulrunner-1.8.1.9/debian/control +++ xulrunner-1.8.1.9/debian/control @@ -1,8 +1,9 @@ Source: xulrunner Section: devel Priority: optional -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) +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), ecj Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.56) Standards-Version: 3.7.2.2 only in patch2: unchanged: --- xulrunner-1.8.1.9.orig/debian/xulrunner.postinst +++ xulrunner-1.8.1.9/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.9.orig/debian/xulrunner.prerm +++ xulrunner-1.8.1.9/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.9.orig/debian/patches/88_bz399589_fix_missing_symbol_with_new_nss.dpatch +++ xulrunner-1.8.1.9/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.9.orig/debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch +++ xulrunner-1.8.1.9/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.9.orig/debian/patches/88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch +++ xulrunner-1.8.1.9/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 only in patch2: unchanged: --- xulrunner-1.8.1.9.orig/debian/patches/88_bz344818_missing_library_check.dpatch +++ xulrunner-1.8.1.9/debian/patches/88_bz344818_missing_library_check.dpatch @@ -0,0 +1,121 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 88_bz344818_missing_library_check.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~/config/autoconf.mk.in xulrunner-1.8.1.9-1ubuntu1/config/autoconf.mk.in +--- xulrunner-1.8.1.9-1ubuntu1~/config/autoconf.mk.in 2007-11-17 00:55:46.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/config/autoconf.mk.in 2007-11-17 00:56:43.000000000 +0000 +@@ -207,6 +207,8 @@ + MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ + MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ + MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ ++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@ ++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@ + TX_EXE = @TX_EXE@ + + # Mac's don't like / in a #include, so we include the libart +@@ -218,6 +220,8 @@ + endif + MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@ + MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@ ++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@ ++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@ + + MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@ + MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ +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 00:55:46.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/configure.in 2007-11-17 00:56:43.000000000 +0000 +@@ -6800,12 +6800,29 @@ + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; then ++ PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; then ++ PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + + AC_SUBST(MOZ_TREE_CAIRO) + AC_SUBST(MOZ_CAIRO_CFLAGS) + AC_SUBST(MOZ_CAIRO_LIBS) ++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XLIB_LIBS) ++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS) + + dnl ======================================================== + dnl disable xul +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/content/canvas/src/Makefile.in xulrunner-1.8.1.9-1ubuntu1/content/canvas/src/Makefile.in +--- xulrunner-1.8.1.9-1ubuntu1~/content/canvas/src/Makefile.in 2007-11-01 22:37:18.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/content/canvas/src/Makefile.in 2007-11-17 00:56:43.000000000 +0000 +@@ -94,7 +94,7 @@ + + include $(topsrcdir)/config/rules.mk + +-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS) + + ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT))) + # needed for nsDrawingSurfaceMac.h +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/layout/build/Makefile.in xulrunner-1.8.1.9-1ubuntu1/layout/build/Makefile.in +--- xulrunner-1.8.1.9-1ubuntu1~/layout/build/Makefile.in 2007-11-17 00:55:45.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/layout/build/Makefile.in 2007-11-17 00:56:43.000000000 +0000 +@@ -234,6 +234,17 @@ + $(NULL) + endif + ++ifdef MOZ_X11 ++ifdef MOZ_SVG_RENDERER_CAIRO ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \ ++ $(NULL) ++endif ++ifdef MOZ_ENABLE_CANVAS ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \ ++ $(NULL) ++endif ++endif ++ + ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT))) + EXTRA_DSO_LDOPTS += \ + $(TK_LIBS) \ +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/layout/svg/renderer/src/cairo/Makefile.in xulrunner-1.8.1.9-1ubuntu1/layout/svg/renderer/src/cairo/Makefile.in +--- xulrunner-1.8.1.9-1ubuntu1~/layout/svg/renderer/src/cairo/Makefile.in 2007-11-01 22:27:54.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/layout/svg/renderer/src/cairo/Makefile.in 2007-11-17 00:56:43.000000000 +0000 +@@ -95,6 +95,11 @@ + -I$(topsrcdir)/gfx/src \ + $(NULL) + ++ifdef MOZ_X11 ++CFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++endif ++ + ifdef MOZ_ENABLE_GTK + LOCAL_INCLUDES += -I$(topsrcdir)/gfx/src/gtk + CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +diff -urNad xulrunner-1.8.1.9-1ubuntu1~/toolkit/library/Makefile.in xulrunner-1.8.1.9-1ubuntu1/toolkit/library/Makefile.in +--- xulrunner-1.8.1.9-1ubuntu1~/toolkit/library/Makefile.in 2007-11-17 15:06:16.000000000 +0000 ++++ xulrunner-1.8.1.9-1ubuntu1/toolkit/library/Makefile.in 2007-11-17 15:10:09.000000000 +0000 +@@ -400,7 +400,7 @@ + endif + + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) +-EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) $(MOZ_CAIRO_XRENDER_LIBS) + endif + + export:: dlldeps.cpp dlldeps-obs.cpp