diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 74e3b55..75c3204 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Oct 19 02:04:45 CEST 2007 - maw@suse.de + +- Security update to version 2.0.0.8 (#332512) (thanks, Wolfgang) + * MFSA 2007-29 Crashes with evidence of memory corruption + * MFSA 2007-30 onUnload Tailgating + * MFSA 2007-31 Digest authentication request splitting + * MFSA 2007-32 File input focus stealing vulnerability + * MFSA 2007-33 XUL pages can hide the window titlebar + * MFSA 2007-34 Possible file stealing through sftp protocol + * MFSA 2007-35 XPCNativeWraper pollution using Script object + complete advisories on + http://www.mozilla.org/projects/security/known-vulnerabilities.html + ------------------------------------------------------------------- Sun Sep 23 19:49:12 CEST 2007 - maw@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 0eb304c..f524374 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.0.0.6) +# spec file for package MozillaFirefox (Version 2.0.0.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ BuildRequires: dbus-1-glib-devel %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL v2 or later, LGPL v2 or later, We have explicit permission to use the trademark. +License: GPL v2 or later; LGPL v2 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox Provides: MozillaFirebird @@ -28,8 +28,8 @@ Obsoletes: MozillaFirebird <= 1.0.7 %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 2.0.0.6 -Release: 24 +Version: 2.0.0.8 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -59,7 +59,6 @@ Source18: firefox.schemas Patch1: visibility.patch Patch2: rpath.patch Patch3: gcc-undefined-ops.patch -Patch4: pango-cairo.patch Patch5: abuild.patch # NSPR bmo #270502 Patch6: nspr-prdtoa.patch @@ -94,7 +93,7 @@ Patch34: skin-selection.patch Patch36: greasemonkey.patch Patch38: tango-maxversion.patch Patch39: x11-session.patch -# pango-cairo.patch dbus.patch startup.patch +# gconf.patch dbus.patch startup.patch Patch100: configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh gconf2 @@ -188,7 +187,6 @@ cd $RPM_BUILD_DIR/mozilla %patch1 %patch2 %patch3 -%patch4 %patch5 %patch6 %patch7 @@ -556,6 +554,17 @@ exit 0 %defattr(-,root,root) %endif %changelog +* Fri Oct 19 2007 - maw@suse.de +- Security update to version 2.0.0.8 (#332512) (thanks, Wolfgang) + * MFSA 2007-29 Crashes with evidence of memory corruption + * MFSA 2007-30 onUnload Tailgating + * MFSA 2007-31 Digest authentication request splitting + * MFSA 2007-32 File input focus stealing vulnerability + * MFSA 2007-33 XUL pages can hide the window titlebar + * MFSA 2007-34 Possible file stealing through sftp protocol + * MFSA 2007-35 XPCNativeWraper pollution using Script object + complete advisories on + http://www.mozilla.org/projects/security/known-vulnerabilities.html * Sun Sep 23 2007 - maw@suse.de - Don't explicitly require libaoss.so (#326751). * Fri Sep 14 2007 - maw@suse.de diff --git a/configure.patch b/configure.patch index 38c2af9..43e1ab7 100644 --- a/configure.patch +++ b/configure.patch @@ -1,5 +1,10 @@ ---- configure.orig 2007-05-16 13:50:39.000000000 -0400 -+++ configure 2007-05-16 14:05:29.000000000 -0400 +Index: configure +=================================================================== +RCS file: /cvsroot/mozilla/configure,v +retrieving revision 1.1492.2.124 +diff -u -r1.1492.2.124 configure +--- configure 13 Sep 2007 03:52:47 -0000 1.1492.2.124 ++++ configure 15 Oct 2007 09:13:46 -0000 @@ -83,6 +83,8 @@ ac_help="$ac_help --with-qtdir=\$dir Specify Qt directory " @@ -72,265 +77,274 @@ if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1241,13 +1246,13 @@ +@@ -1214,7 +1219,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:1218: checking for $ac_word" >&5 ++echo "configure:1223: 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 +@@ -1285,13 +1290,13 @@ _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 --echo "configure:1245: checking for host c compiler" >&5 -+echo "configure:1250: checking for host c compiler" >&5 +-echo "configure:1289: checking for host c compiler" >&5 ++echo "configure:1294: checking for host c compiler" >&5 for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc 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:1251: checking for $ac_word" >&5 -+echo "configure:1256: checking for $ac_word" >&5 +-echo "configure:1295: checking for $ac_word" >&5 ++echo "configure:1300: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1282,13 +1287,13 @@ +@@ -1326,13 +1331,13 @@ fi echo "$ac_t""$HOST_CC" 1>&6 echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 --echo "configure:1286: checking for host c++ compiler" >&5 -+echo "configure:1291: checking for host c++ compiler" >&5 +-echo "configure:1330: checking for host c++ compiler" >&5 ++echo "configure:1335: checking for host c++ compiler" >&5 for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc 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:1292: checking for $ac_word" >&5 -+echo "configure:1297: checking for $ac_word" >&5 +-echo "configure:1336: checking for $ac_word" >&5 ++echo "configure:1341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1337,7 +1342,7 @@ +@@ -1381,7 +1386,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:1341: checking for $ac_word" >&5 -+echo "configure:1346: checking for $ac_word" >&5 +-echo "configure:1385: checking for $ac_word" >&5 ++echo "configure:1390: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1372,7 +1377,7 @@ +@@ -1416,7 +1421,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:1376: checking for $ac_word" >&5 -+echo "configure:1381: checking for $ac_word" >&5 +-echo "configure:1420: checking for $ac_word" >&5 ++echo "configure:1425: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1407,16 +1412,16 @@ +@@ -1451,16 +1456,16 @@ LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1411: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1416: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +-echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1460: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 else -@@ -1431,16 +1436,16 @@ +@@ -1475,16 +1480,16 @@ CFLAGS="$HOST_CXXFLAGS" echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1435: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1440: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +-echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1484: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 else -@@ -1469,7 +1474,7 @@ +@@ -1513,7 +1518,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:1473: checking for $ac_word" >&5 -+echo "configure:1478: checking for $ac_word" >&5 +-echo "configure:1517: checking for $ac_word" >&5 ++echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1503,7 +1508,7 @@ +@@ -1547,7 +1552,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1507: checking for $ac_word" >&5 -+echo "configure:1512: checking for $ac_word" >&5 +-echo "configure:1551: checking for $ac_word" >&5 ++echo "configure:1556: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1533,7 +1538,7 @@ +@@ -1577,7 +1582,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1537: checking for $ac_word" >&5 -+echo "configure:1542: checking for $ac_word" >&5 +-echo "configure:1581: checking for $ac_word" >&5 ++echo "configure:1586: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1584,7 +1589,7 @@ +@@ -1628,7 +1633,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1588: checking for $ac_word" >&5 -+echo "configure:1593: checking for $ac_word" >&5 +-echo "configure:1632: checking for $ac_word" >&5 ++echo "configure:1637: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1616,7 +1621,7 @@ +@@ -1660,7 +1665,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1625: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1669: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1627,12 +1632,12 @@ +@@ -1671,12 +1676,12 @@ cat > conftest.$ac_ext << EOF --#line 1631 "configure" -+#line 1636 "configure" +-#line 1675 "configure" ++#line 1680 "configure" #include "confdefs.h" main(){return(0);} EOF --if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -1658,12 +1663,12 @@ +@@ -1702,12 +1707,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1667: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1667: checking whether we are using GNU C" >&5 -+echo "configure:1672: checking whether we are using GNU C" >&5 +-echo "configure:1711: checking whether we are using GNU C" >&5 ++echo "configure:1716: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1672,7 +1677,7 @@ +@@ -1716,7 +1721,7 @@ yes; #endif EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -@@ -1691,7 +1696,7 @@ +@@ -1735,7 +1740,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1695: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1700: checking whether ${CC-cc} accepts -g" >&5 +-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1744: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1727,7 +1732,7 @@ +@@ -1771,7 +1776,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:1731: checking for $ac_word" >&5 -+echo "configure:1736: checking for $ac_word" >&5 +-echo "configure:1775: checking for $ac_word" >&5 ++echo "configure:1780: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1763,7 +1768,7 @@ +@@ -1807,7 +1812,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:1767: checking for $ac_word" >&5 -+echo "configure:1772: checking for $ac_word" >&5 +-echo "configure:1811: checking for $ac_word" >&5 ++echo "configure:1816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1795,7 +1800,7 @@ +@@ -1839,7 +1844,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1799: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1804: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1848: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1806,12 +1811,12 @@ +@@ -1850,12 +1855,12 @@ cat > conftest.$ac_ext << EOF --#line 1810 "configure" -+#line 1815 "configure" +-#line 1854 "configure" ++#line 1859 "configure" #include "confdefs.h" int main(){return(0);} EOF --if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -1837,12 +1842,12 @@ +@@ -1881,12 +1886,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1846: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1890: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:1846: checking whether we are using GNU C++" >&5 -+echo "configure:1851: checking whether we are using GNU C++" >&5 +-echo "configure:1890: checking whether we are using GNU C++" >&5 ++echo "configure:1895: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1851,7 +1856,7 @@ +@@ -1895,7 +1900,7 @@ yes; #endif EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -@@ -1870,7 +1875,7 @@ +@@ -1914,7 +1919,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1874: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1879: checking whether ${CXX-g++} accepts -g" >&5 +-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1923: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1901,57 +1906,6 @@ +@@ -1945,57 +1950,6 @@ fi fi @@ -344,7 +358,7 @@ - 'void exit (int);' -do - cat > conftest.$ac_ext < -$ac_declaration @@ -352,7 +366,7 @@ -exit (42); -; return 0; } -EOF --if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 @@ -362,14 +376,14 @@ -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else @@ -388,211 +402,211 @@ case "$build:$target" in powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -1965,7 +1919,7 @@ +@@ -2009,7 +1963,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:1969: checking for $ac_word" >&5 -+echo "configure:1923: checking for $ac_word" >&5 +-echo "configure:2013: checking for $ac_word" >&5 ++echo "configure:1967: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2000,7 +1954,7 @@ +@@ -2044,7 +1998,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:2004: checking for $ac_word" >&5 -+echo "configure:1958: checking for $ac_word" >&5 +-echo "configure:2048: checking for $ac_word" >&5 ++echo "configure:2002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2035,7 +1989,7 @@ +@@ -2079,7 +2033,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:2039: checking for $ac_word" >&5 -+echo "configure:1993: checking for $ac_word" >&5 +-echo "configure:2083: checking for $ac_word" >&5 ++echo "configure:2037: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2076,7 +2030,7 @@ +@@ -2120,7 +2074,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:2080: checking for $ac_word" >&5 -+echo "configure:2034: checking for $ac_word" >&5 +-echo "configure:2124: checking for $ac_word" >&5 ++echo "configure:2078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2111,7 +2065,7 @@ +@@ -2155,7 +2109,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:2115: checking for $ac_word" >&5 -+echo "configure:2069: checking for $ac_word" >&5 +-echo "configure:2159: checking for $ac_word" >&5 ++echo "configure:2113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2146,7 +2100,7 @@ +@@ -2190,7 +2144,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:2150: checking for $ac_word" >&5 -+echo "configure:2104: checking for $ac_word" >&5 +-echo "configure:2194: checking for $ac_word" >&5 ++echo "configure:2148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2184,7 +2138,7 @@ +@@ -2228,7 +2182,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2188: checking for $ac_word" >&5 -+echo "configure:2142: checking for $ac_word" >&5 +-echo "configure:2232: checking for $ac_word" >&5 ++echo "configure:2186: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2214,7 +2168,7 @@ +@@ -2258,7 +2212,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2218: checking for $ac_word" >&5 -+echo "configure:2172: checking for $ac_word" >&5 +-echo "configure:2262: checking for $ac_word" >&5 ++echo "configure:2216: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2265,7 +2219,7 @@ +@@ -2309,7 +2263,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2269: checking for $ac_word" >&5 -+echo "configure:2223: checking for $ac_word" >&5 +-echo "configure:2313: checking for $ac_word" >&5 ++echo "configure:2267: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2297,7 +2251,7 @@ +@@ -2341,7 +2295,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2255: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2299: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2308,12 +2262,12 @@ +@@ -2352,12 +2306,12 @@ cat > conftest.$ac_ext << EOF --#line 2312 "configure" -+#line 2266 "configure" +-#line 2356 "configure" ++#line 2310 "configure" #include "confdefs.h" main(){return(0);} EOF --if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -2339,12 +2293,12 @@ +@@ -2383,12 +2337,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2343: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2341: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:2348: checking whether we are using GNU C" >&5 -+echo "configure:2302: checking whether we are using GNU C" >&5 +-echo "configure:2392: checking whether we are using GNU C" >&5 ++echo "configure:2346: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2353,7 +2307,7 @@ +@@ -2397,7 +2351,7 @@ yes; #endif EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -@@ -2372,7 +2326,7 @@ +@@ -2416,7 +2370,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2376: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2330: checking whether ${CC-cc} accepts -g" >&5 +-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2374: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2408,7 +2362,7 @@ +@@ -2452,7 +2406,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:2412: checking for $ac_word" >&5 -+echo "configure:2366: checking for $ac_word" >&5 +-echo "configure:2456: checking for $ac_word" >&5 ++echo "configure:2410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2440,7 +2394,7 @@ +@@ -2484,7 +2438,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2444: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2442: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2451,12 +2405,12 @@ +@@ -2495,12 +2449,12 @@ cat > conftest.$ac_ext << EOF --#line 2455 "configure" -+#line 2409 "configure" +-#line 2499 "configure" ++#line 2453 "configure" #include "confdefs.h" int main(){return(0);} EOF --if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then -@@ -2482,12 +2436,12 @@ +@@ -2526,12 +2480,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2486: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2484: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:2491: checking whether we are using GNU C++" >&5 -+echo "configure:2445: checking whether we are using GNU C++" >&5 +-echo "configure:2535: checking whether we are using GNU C++" >&5 ++echo "configure:2489: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2496,7 +2450,7 @@ +@@ -2540,7 +2494,7 @@ yes; #endif EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -@@ -2515,7 +2469,7 @@ +@@ -2559,7 +2513,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2519: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2473: checking whether ${CXX-g++} accepts -g" >&5 +-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2517: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2546,61 +2500,10 @@ +@@ -2590,61 +2544,10 @@ fi fi @@ -606,7 +620,7 @@ - 'void exit (int);' -do - cat > conftest.$ac_ext < -$ac_declaration @@ -614,7 +628,7 @@ -exit (42); -; return 0; } -EOF --if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 @@ -624,14 +638,14 @@ -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:2629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else @@ -650,621 +664,594 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2604: checking for $ac_word" >&5 -+echo "configure:2507: checking for $ac_word" >&5 +-echo "configure:2648: checking for $ac_word" >&5 ++echo "configure:2551: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2632,7 +2535,7 @@ +@@ -2676,7 +2579,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:2636: checking for $ac_word" >&5 -+echo "configure:2539: checking for $ac_word" >&5 +-echo "configure:2680: checking for $ac_word" >&5 ++echo "configure:2583: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2673,7 +2576,7 @@ +@@ -2717,7 +2620,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:2677: checking for $ac_word" >&5 -+echo "configure:2580: checking for $ac_word" >&5 +-echo "configure:2721: checking for $ac_word" >&5 ++echo "configure:2624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2708,7 +2611,7 @@ +@@ -2752,7 +2655,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:2712: checking for $ac_word" >&5 -+echo "configure:2615: checking for $ac_word" >&5 +-echo "configure:2756: checking for $ac_word" >&5 ++echo "configure:2659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2743,7 +2646,7 @@ +@@ -2787,7 +2690,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:2747: checking for $ac_word" >&5 -+echo "configure:2650: checking for $ac_word" >&5 +-echo "configure:2791: checking for $ac_word" >&5 ++echo "configure:2694: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2778,7 +2681,7 @@ +@@ -2822,7 +2725,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:2782: checking for $ac_word" >&5 -+echo "configure:2685: checking for $ac_word" >&5 +-echo "configure:2826: checking for $ac_word" >&5 ++echo "configure:2729: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2867,7 +2770,7 @@ +@@ -2911,7 +2814,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:2871: checking for $ac_word" >&5 -+echo "configure:2774: checking for $ac_word" >&5 +-echo "configure:2915: checking for $ac_word" >&5 ++echo "configure:2818: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2909,14 +2812,14 @@ +@@ -2953,14 +2856,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -2934,14 +2837,14 @@ +@@ -2978,14 +2881,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { unsigned *test = new unsigned(42); ; return 0; } EOF --if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -2997,7 +2900,7 @@ +@@ -3041,7 +2944,7 @@ _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 --echo "configure:3001: checking for midl flags" >&5 -+echo "configure:2904: checking for midl flags" >&5 +-echo "configure:3045: checking for midl flags" >&5 ++echo "configure:2948: checking for midl flags" >&5 if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then # Starting with MIDL version 6.0.359, the MIDL compiler # generates /Oicf /robust stubs by default, which is not -@@ -3019,9 +2922,9 @@ +@@ -3063,9 +2966,9 @@ _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 --echo "configure:3023: checking for w32api version >= $W32API_VERSION" >&5 -+echo "configure:2926: checking for w32api version >= $W32API_VERSION" >&5 +-echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2970: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { -@@ -3033,7 +2936,7 @@ +@@ -3077,7 +2980,7 @@ ; return 0; } EOF --if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else -@@ -3049,7 +2952,7 @@ +@@ -3093,7 +2996,7 @@ fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 --echo "configure:3053: checking for windres version >= $WINDRES_VERSION" >&5 -+echo "configure:2956: checking for windres version >= $WINDRES_VERSION" >&5 +-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:3000: checking for windres version >= $WINDRES_VERSION" >&5 _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` echo "$ac_t""$_WINDRES_VERSION" 1>&6 _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` -@@ -3076,7 +2979,7 @@ +@@ -3120,7 +3023,7 @@ SKIP_COMPILER_CHECKS=1 SKIP_LIBRARY_CHECKS=1 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3080: checking how to run the C preprocessor" >&5 -+echo "configure:2983: checking how to run the C preprocessor" >&5 +-echo "configure:3124: checking how to run the C preprocessor" >&5 ++echo "configure:3027: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -3091,13 +2994,13 @@ +@@ -3135,13 +3038,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3048: \"$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 : -@@ -3108,13 +3011,13 @@ +@@ -3152,13 +3055,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3065: \"$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 : -@@ -3125,13 +3028,13 @@ +@@ -3169,13 +3072,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3082: \"$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 : -@@ -3159,17 +3062,17 @@ +@@ -3203,17 +3106,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3163: checking for $ac_hdr" >&5 -+echo "configure:3066: checking for $ac_hdr" >&5 +-echo "configure:3207: checking for $ac_hdr" >&5 ++echo "configure:3110: 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:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3120: \"$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* -@@ -3200,10 +3103,10 @@ +@@ -3244,10 +3147,10 @@ if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 --echo "configure:3204: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:3107: checking whether $CC and cc understand -c and -o together" >&5 +-echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3151: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 --echo "configure:3207: checking whether cc understands -c and -o together" >&5 -+echo "configure:3110: checking whether cc understands -c and -o together" >&5 +-echo "configure:3251: checking whether cc understands -c and -o together" >&5 ++echo "configure:3154: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -3215,16 +3118,16 @@ +@@ -3259,16 +3162,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' --if { (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +-if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. -- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' -- if { (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +- if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : -@@ -3260,7 +3163,7 @@ +@@ -3304,7 +3207,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3264: checking how to run the C preprocessor" >&5 -+echo "configure:3167: checking how to run the C preprocessor" >&5 +-echo "configure:3308: checking how to run the C preprocessor" >&5 ++echo "configure:3211: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -3275,13 +3178,13 @@ +@@ -3319,13 +3222,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3232: \"$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 : -@@ -3292,13 +3195,13 @@ +@@ -3336,13 +3239,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3249: \"$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 : -@@ -3309,13 +3212,13 @@ +@@ -3353,13 +3256,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3222: \"$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 - : -@@ -3340,7 +3243,7 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:3344: checking how to run the C++ preprocessor" >&5 -+echo "configure:3247: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3353,12 +3256,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < + #include + Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3266: \"$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 : -@@ -3405,7 +3308,7 @@ +@@ -3384,7 +3287,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3388: checking how to run the C++ preprocessor" >&5 ++echo "configure:3291: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3397,12 +3300,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3309: \"$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 + : +@@ -3449,7 +3352,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3409: checking for a BSD compatible install" >&5 -+echo "configure:3312: checking for a BSD compatible install" >&5 +-echo "configure:3453: checking for a BSD compatible install" >&5 ++echo "configure:3356: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3458,7 +3361,7 @@ +@@ -3502,7 +3405,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3462: checking whether ln -s works" >&5 -+echo "configure:3365: checking whether ln -s works" >&5 +-echo "configure:3506: checking whether ln -s works" >&5 ++echo "configure:3409: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3483,7 +3386,7 @@ +@@ -3527,7 +3430,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:3487: checking for $ac_word" >&5 -+echo "configure:3390: checking for $ac_word" >&5 +-echo "configure:3531: checking for $ac_word" >&5 ++echo "configure:3434: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3523,7 +3426,7 @@ +@@ -3567,7 +3470,7 @@ fi echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 --echo "configure:3527: checking for minimum required perl version >= $PERL_VERSION" >&5 -+echo "configure:3430: checking for minimum required perl version >= $PERL_VERSION" >&5 +-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3474: checking for minimum required perl version >= $PERL_VERSION" >&5 _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? echo "$ac_t""$_perl_version" 1>&6 -@@ -3533,7 +3436,7 @@ +@@ -3577,7 +3480,7 @@ fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 --echo "configure:3537: checking for full perl installation" >&5 -+echo "configure:3440: checking for full perl installation" >&5 +-echo "configure:3581: checking for full perl installation" >&5 ++echo "configure:3484: checking for full perl installation" >&5 _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? if test "$_perl_res" != 0; then -@@ -3546,7 +3449,7 @@ +@@ -3590,7 +3493,7 @@ # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3550: checking for $ac_word" >&5 -+echo "configure:3453: checking for $ac_word" >&5 +-echo "configure:3594: checking for $ac_word" >&5 ++echo "configure:3497: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3582,7 +3485,7 @@ +@@ -3626,7 +3529,7 @@ # Extract the first word of "whoami", so it can be a program name with args. set dummy whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3586: checking for $ac_word" >&5 -+echo "configure:3489: checking for $ac_word" >&5 +-echo "configure:3630: checking for $ac_word" >&5 ++echo "configure:3533: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3618,7 +3521,7 @@ +@@ -3662,7 +3565,7 @@ # Extract the first word of "autoconf", so it can be a program name with args. set dummy autoconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3622: checking for $ac_word" >&5 -+echo "configure:3525: checking for $ac_word" >&5 +-echo "configure:3666: checking for $ac_word" >&5 ++echo "configure:3569: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3654,7 +3557,7 @@ +@@ -3698,7 +3601,7 @@ # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3658: checking for $ac_word" >&5 -+echo "configure:3561: checking for $ac_word" >&5 +-echo "configure:3702: checking for $ac_word" >&5 ++echo "configure:3605: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3692,7 +3595,7 @@ +@@ -3736,7 +3639,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:3696: checking for $ac_word" >&5 -+echo "configure:3599: checking for $ac_word" >&5 +-echo "configure:3740: checking for $ac_word" >&5 ++echo "configure:3643: 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 -@@ -3733,7 +3636,7 @@ +@@ -3777,7 +3680,7 @@ # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3737: checking for $ac_word" >&5 -+echo "configure:3640: checking for $ac_word" >&5 +-echo "configure:3781: checking for $ac_word" >&5 ++echo "configure:3684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3768,7 +3671,7 @@ +@@ -3812,7 +3715,7 @@ # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3772: checking for $ac_word" >&5 -+echo "configure:3675: checking for $ac_word" >&5 +-echo "configure:3816: checking for $ac_word" >&5 ++echo "configure:3719: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3831,7 +3734,7 @@ +@@ -3875,7 +3778,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:3835: checking for $ac_word" >&5 -+echo "configure:3738: checking for $ac_word" >&5 +-echo "configure:3879: checking for $ac_word" >&5 ++echo "configure:3782: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3881,7 +3784,7 @@ +@@ -3925,7 +3828,7 @@ # Extract the first word of "sdp", so it can be a program name with args. set dummy sdp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3885: checking for $ac_word" >&5 -+echo "configure:3788: checking for $ac_word" >&5 +-echo "configure:3929: checking for $ac_word" >&5 ++echo "configure:3832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3977,7 +3880,7 @@ +@@ -4021,7 +3924,7 @@ fi echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 --echo "configure:3981: checking for valid compiler/Mac OS X SDK combination" >&5 -+echo "configure:3884: checking for valid compiler/Mac OS X SDK combination" >&5 +-echo "configure:4025: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3928: checking for valid compiler/Mac OS X SDK combination" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -@@ -3986,7 +3889,7 @@ +@@ -4030,7 +3933,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { return 0; } -@@ -3994,7 +3897,7 @@ +@@ -4038,7 +3941,7 @@ result=yes ; return 0; } EOF --if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=no else -@@ -4019,7 +3922,7 @@ +@@ -4063,7 +3966,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:4023: checking for $ac_word" >&5 -+echo "configure:3926: checking for $ac_word" >&5 +-echo "configure:4067: checking for $ac_word" >&5 ++echo "configure:3970: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4062,7 +3965,7 @@ +@@ -4106,7 +4009,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:4066: checking for $ac_word" >&5 -+echo "configure:3969: checking for $ac_word" >&5 +-echo "configure:4110: checking for $ac_word" >&5 ++echo "configure:4013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -4130,7 +4033,7 @@ +@@ -4174,7 +4077,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:4134: checking for X" >&5 -+echo "configure:4037: checking for X" >&5 +-echo "configure:4178: checking for X" >&5 ++echo "configure:4081: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then -@@ -4192,12 +4095,12 @@ +@@ -4236,12 +4139,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:4245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4148: \"$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* -@@ -4266,14 +4169,14 @@ +@@ -4310,14 +4213,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. -@@ -4379,17 +4282,17 @@ +@@ -4423,17 +4326,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:4383: checking whether -R must be followed by a space" >&5 -+echo "configure:4286: checking whether -R must be followed by a space" >&5 +-echo "configure:4427: checking whether -R must be followed by a space" >&5 ++echo "configure:4330: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else -@@ -4405,14 +4308,14 @@ +@@ -4449,14 +4352,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else -@@ -4444,7 +4347,7 @@ +@@ -4488,7 +4391,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:4448: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:4351: checking for dnet_ntoa in -ldnet" >&5 +-echo "configure:4492: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4395: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4452,7 +4355,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4373: \"$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 -@@ -4488,7 +4391,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:4492: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:4395: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 @@ -4496,7 +4399,7 @@ ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" + LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&6 +-echo "configure:4536: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4439: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4540,7 +4443,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4461: \"$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 +@@ -4583,12 +4486,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4543: checking for gethostbyname" >&5 -+echo "configure:4446: checking for gethostbyname" >&5 +-echo "configure:4587: checking for gethostbyname" >&5 ++echo "configure:4490: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else -@@ -4591,7 +4494,7 @@ +@@ -4635,7 +4538,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4595: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4498: checking for gethostbyname in -lnsl" >&5 +-echo "configure:4639: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4542: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4599,7 +4502,7 @@ +@@ -4643,7 +4546,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4564: \"$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 -@@ -4643,12 +4546,12 @@ +@@ -4687,12 +4590,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4647: checking for connect" >&5 -+echo "configure:4550: checking for connect" >&5 +-echo "configure:4691: checking for connect" >&5 ++echo "configure:4594: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else -@@ -4695,7 +4598,7 @@ +@@ -4739,7 +4642,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4699: checking for connect in -lsocket" >&5 -+echo "configure:4602: checking for connect in -lsocket" >&5 +-echo "configure:4743: checking for connect in -lsocket" >&5 ++echo "configure:4646: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4703,7 +4606,7 @@ +@@ -4747,7 +4650,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4668: \"$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 -@@ -4741,12 +4644,12 @@ +@@ -4785,12 +4688,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:4745: checking for remove" >&5 -+echo "configure:4648: checking for remove" >&5 +-echo "configure:4789: checking for remove" >&5 ++echo "configure:4692: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else -@@ -4793,7 +4696,7 @@ +@@ -4837,7 +4740,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:4797: checking for remove in -lposix" >&5 -+echo "configure:4700: checking for remove in -lposix" >&5 +-echo "configure:4841: checking for remove in -lposix" >&5 ++echo "configure:4744: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4801,7 +4704,7 @@ +@@ -4845,7 +4748,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4766: \"$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 -@@ -4839,12 +4742,12 @@ +@@ -4883,12 +4786,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:4843: checking for shmat" >&5 -+echo "configure:4746: checking for shmat" >&5 +-echo "configure:4887: checking for shmat" >&5 ++echo "configure:4790: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else -@@ -4891,7 +4794,7 @@ +@@ -4935,7 +4838,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:4895: checking for shmat in -lipc" >&5 -+echo "configure:4798: checking for shmat in -lipc" >&5 +-echo "configure:4939: checking for shmat in -lipc" >&5 ++echo "configure:4842: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4899,7 +4802,7 @@ +@@ -4943,7 +4846,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4864: \"$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 -@@ -4946,7 +4849,7 @@ +@@ -4990,7 +4893,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:4950: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:4853: checking for IceConnectionNumber in -lICE" >&5 +-echo "configure:4994: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4897: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4954,7 +4857,7 @@ +@@ -4998,7 +4901,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4919: \"$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 -@@ -5406,7 +5309,7 @@ +@@ -5450,7 +5353,7 @@ if test "$COMPILE_ENVIRONMENT"; then if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:5410: checking whether ld has archive extraction flags" >&5 -+echo "configure:5313: checking whether ld has archive extraction flags" >&5 +-echo "configure:5454: checking whether ld has archive extraction flags" >&5 ++echo "configure:5357: checking whether ld has archive extraction flags" >&5 if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5423,14 +5326,14 @@ +@@ -5467,14 +5370,14 @@ LDFLAGS=$force LIBS=$unforce cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_mkshlib_force_and_unforce=$line; break else -@@ -5463,7 +5366,7 @@ +@@ -5507,7 +5410,7 @@ ' echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:5467: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:5370: checking that static assertion macros used in autoconf tests work" >&5 +-echo "configure:5511: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5414: checking that static assertion macros used in autoconf tests work" >&5 if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5477,14 +5380,14 @@ +@@ -5521,14 +5424,14 @@ ac_cv_static_assertion_macros_work="yes" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -5494,14 +5397,14 @@ +@@ -5538,14 +5441,14 @@ fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else -@@ -5517,14 +5420,14 @@ +@@ -5561,14 +5464,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -5534,14 +5437,14 @@ +@@ -5578,14 +5481,14 @@ fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else -@@ -5576,16 +5479,16 @@ +@@ -5620,16 +5523,16 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5580: checking for 64-bit OS" >&5 -+echo "configure:5483: checking for 64-bit OS" >&5 +-echo "configure:5624: checking for 64-bit OS" >&5 ++echo "configure:5527: checking for 64-bit OS" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else -@@ -5743,9 +5646,9 @@ +@@ -5787,9 +5690,9 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 --echo "configure:5747: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5650: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +-echo "configure:5791: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5694: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else -@@ -5792,17 +5695,17 @@ +@@ -5836,17 +5739,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5796: checking for $ac_hdr" >&5 -+echo "configure:5699: checking for $ac_hdr" >&5 +-echo "configure:5840: checking for $ac_hdr" >&5 ++echo "configure:5743: 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:5806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:5850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5753: \"$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* -@@ -5844,7 +5747,7 @@ +@@ -5888,7 +5791,7 @@ LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5848: checking for main in -lbind" >&5 -+echo "configure:5751: checking for main in -lbind" >&5 +-echo "configure:5892: checking for main in -lbind" >&5 ++echo "configure:5795: checking for main in -lbind" >&5 ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5852,14 +5755,14 @@ +@@ -5896,14 +5799,14 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5810: \"$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 -@@ -5880,7 +5783,7 @@ +@@ -5924,7 +5827,7 @@ fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:5884: checking for main in -lzeta" >&5 -+echo "configure:5787: checking for main in -lzeta" >&5 +-echo "configure:5928: checking for main in -lzeta" >&5 ++echo "configure:5831: checking for main in -lzeta" >&5 ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5888,14 +5791,14 @@ +@@ -5932,14 +5835,14 @@ ac_save_LIBS="$LIBS" LIBS="-lzeta $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5846: \"$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 -@@ -5959,18 +5862,18 @@ +@@ -6003,18 +5906,18 @@ MACOSX=1 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:5963: checking for -dead_strip option to ld" >&5 -+echo "configure:5866: checking for -dead_strip option to ld" >&5 +-echo "configure:6007: checking for -dead_strip option to ld" >&5 ++echo "configure:5910: checking for -dead_strip option to ld" >&5 _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-dead_strip" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* _HAVE_DEAD_STRIP=1 else -@@ -6838,14 +6741,14 @@ +@@ -6882,14 +6785,14 @@ _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:6849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 -@@ -6873,7 +6776,7 @@ +@@ -6917,7 +6820,7 @@ CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 --echo "configure:6877: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:6780: checking for Forte compiler version >= WS6U2" >&5 +-echo "configure:6921: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6824: checking for Forte compiler version >= WS6U2" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -6883,7 +6786,7 @@ +@@ -6927,7 +6830,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:6940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else -@@ -7021,7 +6924,7 @@ +@@ -7065,7 +6968,7 @@ ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 --echo "configure:7025: checking for -exported_symbols_list option to ld" >&5 -+echo "configure:6928: checking for -exported_symbols_list option to ld" >&5 +-echo "configure:7069: checking for -exported_symbols_list option to ld" >&5 ++echo "configure:6972: checking for -exported_symbols_list option to ld" >&5 if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7061,12 +6964,12 @@ +@@ -7105,12 +7008,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:7065: checking for ANSI C header files" >&5 -+echo "configure:6968: checking for ANSI C header files" >&5 +-echo "configure:7109: checking for ANSI C header files" >&5 ++echo "configure:7012: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7074,7 +6977,7 @@ +@@ -7118,7 +7021,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:7122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7025: \"$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* -@@ -7091,7 +6994,7 @@ +@@ -7135,7 +7038,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 -@@ -7109,7 +7012,7 @@ +@@ -7153,7 +7056,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 -@@ -7130,7 +7033,7 @@ +@@ -7174,7 +7077,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7141,7 +7044,7 @@ +@@ -7185,7 +7088,7 @@ exit (0); } EOF --if { (eval echo configure:7145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -7165,12 +7068,12 @@ +@@ -7209,12 +7112,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:7169: checking for working const" >&5 -+echo "configure:7072: checking for working const" >&5 +-echo "configure:7213: checking for working const" >&5 ++echo "configure:7116: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else -@@ -7240,12 +7143,12 @@ +@@ -7284,12 +7187,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7244: checking for mode_t" >&5 -+echo "configure:7147: checking for mode_t" >&5 +-echo "configure:7288: checking for mode_t" >&5 ++echo "configure:7191: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -7273,12 +7176,12 @@ +@@ -7317,12 +7220,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7277: checking for off_t" >&5 -+echo "configure:7180: checking for off_t" >&5 +-echo "configure:7321: checking for off_t" >&5 ++echo "configure:7224: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -7306,12 +7209,12 @@ +@@ -7350,12 +7253,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7310: checking for pid_t" >&5 -+echo "configure:7213: checking for pid_t" >&5 +-echo "configure:7354: checking for pid_t" >&5 ++echo "configure:7257: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -7339,12 +7242,12 @@ +@@ -7383,12 +7286,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7343: checking for size_t" >&5 -+echo "configure:7246: checking for size_t" >&5 +-echo "configure:7387: checking for size_t" >&5 ++echo "configure:7290: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -7372,12 +7275,12 @@ +@@ -7416,12 +7319,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7376: checking for st_blksize in struct stat" >&5 -+echo "configure:7279: checking for st_blksize in struct stat" >&5 +-echo "configure:7420: checking for st_blksize in struct stat" >&5 ++echo "configure:7323: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7385,7 +7288,7 @@ +@@ -7429,7 +7332,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF --if { (eval echo configure:7389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -7406,12 +7309,12 @@ +@@ -7450,12 +7353,12 @@ fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7410: checking for siginfo_t" >&5 -+echo "configure:7313: checking for siginfo_t" >&5 +-echo "configure:7454: checking for siginfo_t" >&5 ++echo "configure:7357: checking for siginfo_t" >&5 if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -7419,7 +7322,7 @@ +@@ -7463,7 +7366,7 @@ siginfo_t* info; ; return 0; } EOF --if { (eval echo configure:7423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else -@@ -7453,12 +7356,12 @@ +@@ -7497,12 +7400,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7457: checking for int16_t" >&5 -+echo "configure:7360: checking for int16_t" >&5 +-echo "configure:7501: checking for int16_t" >&5 ++echo "configure:7404: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7466,7 +7369,7 @@ +@@ -7510,7 +7413,7 @@ int16_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else -@@ -7488,12 +7391,12 @@ +@@ -7532,12 +7435,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7492: checking for int32_t" >&5 -+echo "configure:7395: checking for int32_t" >&5 +-echo "configure:7536: checking for int32_t" >&5 ++echo "configure:7439: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7501,7 +7404,7 @@ +@@ -7545,7 +7448,7 @@ int32_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else -@@ -7523,12 +7426,12 @@ +@@ -7567,12 +7470,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7527: checking for int64_t" >&5 -+echo "configure:7430: checking for int64_t" >&5 +-echo "configure:7571: checking for int64_t" >&5 ++echo "configure:7474: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7536,7 +7439,7 @@ +@@ -7580,7 +7483,7 @@ int64_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else -@@ -7558,12 +7461,12 @@ +@@ -7602,12 +7505,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7562: checking for int64" >&5 -+echo "configure:7465: checking for int64" >&5 +-echo "configure:7606: checking for int64" >&5 ++echo "configure:7509: checking for int64" >&5 if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7571,7 +7474,7 @@ +@@ -7615,7 +7518,7 @@ int64 foo = 0; ; return 0; } EOF --if { (eval echo configure:7575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else -@@ -7593,12 +7496,12 @@ +@@ -7637,12 +7540,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7597: checking for uint" >&5 -+echo "configure:7500: checking for uint" >&5 +-echo "configure:7641: checking for uint" >&5 ++echo "configure:7544: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7606,7 +7509,7 @@ +@@ -7650,7 +7553,7 @@ uint foo = 0; ; return 0; } EOF --if { (eval echo configure:7610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else -@@ -7628,12 +7531,12 @@ +@@ -7672,12 +7575,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7632: checking for uint_t" >&5 -+echo "configure:7535: checking for uint_t" >&5 +-echo "configure:7676: checking for uint_t" >&5 ++echo "configure:7579: checking for uint_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -7641,7 +7544,7 @@ +@@ -7685,7 +7588,7 @@ uint_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else -@@ -7663,12 +7566,12 @@ +@@ -7707,12 +7610,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7667: checking for uint16_t" >&5 -+echo "configure:7570: checking for uint16_t" >&5 +-echo "configure:7711: checking for uint16_t" >&5 ++echo "configure:7614: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < - #include -@@ -7676,7 +7579,7 @@ - uint16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint16_t=true - else -@@ -7707,12 +7610,12 @@ - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7711: checking for uname.domainname" >&5 -+echo "configure:7614: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { + #include + #include @@ -7720,7 +7623,7 @@ - (void)uname(res); if (res != 0) { domain = res->domainname; } + uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7751,12 +7654,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7755: checking for uname.domainname" >&5 ++echo "configure:7658: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7764,7 +7667,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else -@@ -7744,12 +7647,12 @@ +@@ -7788,12 +7691,12 @@ fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:7748: checking for uname.__domainname" >&5 -+echo "configure:7651: checking for uname.__domainname" >&5 +-echo "configure:7792: checking for uname.__domainname" >&5 ++echo "configure:7695: checking for uname.__domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { -@@ -7757,7 +7660,7 @@ +@@ -7801,7 +7704,7 @@ (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF --if { (eval echo configure:7761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else -@@ -7790,12 +7693,12 @@ +@@ -7834,12 +7737,12 @@ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:7794: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7697: checking for usable wchar_t (2 bytes, unsigned)" >&5 +-echo "configure:7838: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7741: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros -@@ -7804,7 +7707,7 @@ +@@ -7848,7 +7751,7 @@ CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF --if { (eval echo configure:7808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_wchar_v2="yes" else -@@ -7837,12 +7740,12 @@ +@@ -7881,12 +7784,12 @@ CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:7841: checking for compiler -fshort-wchar option" >&5 -+echo "configure:7744: checking for compiler -fshort-wchar option" >&5 +-echo "configure:7885: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7788: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros -@@ -7851,7 +7754,7 @@ +@@ -7895,7 +7798,7 @@ CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF --if { (eval echo configure:7855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_wchar_option_v2="yes" else -@@ -7885,7 +7788,7 @@ +@@ -7929,7 +7832,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:7889: checking for visibility(hidden) attribute" >&5 -+echo "configure:7792: checking for visibility(hidden) attribute" >&5 +-echo "configure:7933: checking for visibility(hidden) attribute" >&5 ++echo "configure:7836: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7910,7 +7813,7 @@ +@@ -7954,7 +7857,7 @@ echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:7914: checking for visibility(default) attribute" >&5 -+echo "configure:7817: checking for visibility(default) attribute" >&5 +-echo "configure:7958: checking for visibility(default) attribute" >&5 ++echo "configure:7861: checking for visibility(default) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7935,7 +7838,7 @@ +@@ -7979,7 +7882,7 @@ echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:7939: checking for visibility pragma support" >&5 -+echo "configure:7842: checking for visibility pragma support" >&5 +-echo "configure:7983: checking for visibility pragma support" >&5 ++echo "configure:7886: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7960,7 +7863,7 @@ +@@ -8004,7 +7907,7 @@ echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 if test "$ac_cv_visibility_pragma" = "yes"; then echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 --echo "configure:7964: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:7867: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 +-echo "configure:8008: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:7911: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7988,7 +7891,7 @@ +@@ -8032,7 +7935,7 @@ echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 --echo "configure:7992: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:7895: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 +-echo "configure:8036: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7939: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8036,12 +7939,12 @@ +@@ -8080,12 +7983,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:8040: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:7943: checking for $ac_hdr that defines DIR" >&5 +-echo "configure:8084: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7987: 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> -@@ -8049,7 +7952,7 @@ +@@ -8093,7 +7996,7 @@ DIR *dirp = 0; ; return 0; } EOF --if { (eval echo configure:8053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -8074,7 +7977,7 @@ +@@ -8118,7 +8021,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:8078: checking for opendir in -ldir" >&5 -+echo "configure:7981: checking for opendir in -ldir" >&5 +-echo "configure:8122: checking for opendir in -ldir" >&5 ++echo "configure:8025: 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 -@@ -8082,7 +7985,7 @@ +@@ -8126,7 +8029,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:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8044: \"$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 -@@ -8115,7 +8018,7 @@ +@@ -8159,7 +8062,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:8119: checking for opendir in -lx" >&5 -+echo "configure:8022: checking for opendir in -lx" >&5 +-echo "configure:8163: checking for opendir in -lx" >&5 ++echo "configure:8066: 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 -@@ -8123,7 +8026,7 @@ +@@ -8167,7 +8070,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:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8085: \"$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 -@@ -8166,17 +8069,17 @@ +@@ -8210,17 +8113,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8170: checking for $ac_hdr" >&5 -+echo "configure:8073: checking for $ac_hdr" >&5 +-echo "configure:8214: checking for $ac_hdr" >&5 ++echo "configure:8117: 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:8180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8127: \"$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* -@@ -8206,17 +8109,17 @@ +@@ -8250,17 +8153,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8210: checking for $ac_hdr" >&5 -+echo "configure:8113: checking for $ac_hdr" >&5 +-echo "configure:8254: checking for $ac_hdr" >&5 ++echo "configure:8157: 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:8220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8167: \"$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* -@@ -8246,17 +8149,17 @@ +@@ -8290,17 +8193,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8250: checking for $ac_hdr" >&5 -+echo "configure:8153: checking for $ac_hdr" >&5 +-echo "configure:8294: checking for $ac_hdr" >&5 ++echo "configure:8197: 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:8260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8207: \"$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* -@@ -8286,17 +8189,17 @@ +@@ -8330,17 +8233,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8290: checking for $ac_hdr" >&5 -+echo "configure:8193: checking for $ac_hdr" >&5 +-echo "configure:8334: checking for $ac_hdr" >&5 ++echo "configure:8237: 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:8300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8247: \"$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* -@@ -8326,17 +8229,17 @@ +@@ -8370,17 +8273,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8330: checking for $ac_hdr" >&5 -+echo "configure:8233: checking for $ac_hdr" >&5 +-echo "configure:8374: checking for $ac_hdr" >&5 ++echo "configure:8277: 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:8340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8287: \"$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* -@@ -8367,17 +8270,17 @@ +@@ -8411,17 +8314,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8371: checking for $ac_hdr" >&5 -+echo "configure:8274: checking for $ac_hdr" >&5 +-echo "configure:8415: checking for $ac_hdr" >&5 ++echo "configure:8318: 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:8381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8328: \"$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* -@@ -8408,17 +8311,17 @@ +@@ -8452,17 +8355,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8412: checking for $ac_hdr" >&5 -+echo "configure:8315: checking for $ac_hdr" >&5 +-echo "configure:8456: checking for $ac_hdr" >&5 ++echo "configure:8359: 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:8422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8369: \"$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* -@@ -8455,17 +8358,17 @@ +@@ -8499,17 +8402,17 @@ NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8459: checking for new" >&5 -+echo "configure:8362: checking for new" >&5 +-echo "configure:8503: checking for new" >&5 ++echo "configure:8406: 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:8469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8416: \"$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* -@@ -8506,17 +8409,17 @@ +@@ -8550,17 +8453,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8510: checking for $ac_hdr" >&5 -+echo "configure:8413: checking for $ac_hdr" >&5 +-echo "configure:8554: checking for $ac_hdr" >&5 ++echo "configure:8457: 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:8520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8467: \"$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,7 +8453,7 @@ +@@ -8594,7 +8497,7 @@ ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8554: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8457: checking for gethostbyname_r in -lc_r" >&5 +-echo "configure:8598: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8501: 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 -@@ -8558,7 +8461,7 @@ +@@ -8602,7 +8505,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:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8520: \"$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 -@@ -8599,7 +8502,7 @@ +@@ -8643,7 +8546,7 @@ ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8603: checking for atan in -lm" >&5 -+echo "configure:8506: checking for atan in -lm" >&5 +-echo "configure:8647: checking for atan in -lm" >&5 ++echo "configure:8550: 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 -@@ -8607,7 +8510,7 @@ +@@ -8651,7 +8554,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:8525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8569: \"$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 -@@ -8652,7 +8555,7 @@ +@@ -8696,7 +8599,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8656: checking for dlopen in -ldl" >&5 -+echo "configure:8559: checking for dlopen in -ldl" >&5 +-echo "configure:8700: checking for dlopen in -ldl" >&5 ++echo "configure:8603: 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 -@@ -8660,7 +8563,7 @@ +@@ -8704,7 +8607,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:8578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8622: \"$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 -@@ -8688,17 +8591,17 @@ +@@ -8732,17 +8635,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:8692: checking for dlfcn.h" >&5 -+echo "configure:8595: checking for dlfcn.h" >&5 +-echo "configure:8736: checking for dlfcn.h" >&5 ++echo "configure:8639: 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:8702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8649: \"$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* -@@ -8734,7 +8637,7 @@ +@@ -8778,7 +8681,7 @@ case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:8738: checking for demangle in -lC_r" >&5 -+echo "configure:8641: checking for demangle in -lC_r" >&5 +-echo "configure:8782: checking for demangle in -lC_r" >&5 ++echo "configure:8685: 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 -@@ -8742,7 +8645,7 @@ +@@ -8786,7 +8689,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:8660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8704: \"$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 -@@ -8783,7 +8686,7 @@ +@@ -8827,7 +8730,7 @@ ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:8787: checking for demangle in -lC" >&5 -+echo "configure:8690: checking for demangle in -lC" >&5 +-echo "configure:8831: checking for demangle in -lC" >&5 ++echo "configure:8734: 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 -@@ -8791,7 +8694,7 @@ +@@ -8835,7 +8738,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:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8753: \"$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 -@@ -8833,7 +8736,7 @@ +@@ -8877,7 +8780,7 @@ esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:8837: checking for socket in -lsocket" >&5 -+echo "configure:8740: checking for socket in -lsocket" >&5 +-echo "configure:8881: checking for socket in -lsocket" >&5 ++echo "configure:8784: 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 -@@ -8841,7 +8744,7 @@ +@@ -8885,7 +8788,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:8759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8803: \"$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 -@@ -8897,7 +8800,7 @@ +@@ -8941,7 +8844,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:8901: checking for XDrawLines in -lX11" >&5 -+echo "configure:8804: checking for XDrawLines in -lX11" >&5 +-echo "configure:8945: checking for XDrawLines in -lX11" >&5 ++echo "configure:8848: 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 -@@ -8905,7 +8808,7 @@ +@@ -8949,7 +8852,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:8823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8867: \"$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 -@@ -8938,7 +8841,7 @@ +@@ -8982,7 +8885,7 @@ fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:8942: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8845: checking for XextAddDisplay in -lXext" >&5 +-echo "configure:8986: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8889: 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 -@@ -8946,7 +8849,7 @@ +@@ -8990,7 +8893,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:8864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8908: \"$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 -@@ -8981,7 +8884,7 @@ +@@ -9025,7 +8928,7 @@ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:8985: checking for XtFree in -lXt" >&5 -+echo "configure:8888: checking for XtFree in -lXt" >&5 +-echo "configure:9029: checking for XtFree in -lXt" >&5 ++echo "configure:8932: 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 -@@ -8989,7 +8892,7 @@ +@@ -9033,7 +8936,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:8907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8951: \"$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 -@@ -9021,7 +8924,7 @@ +@@ -9065,7 +8968,7 @@ unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:9025: checking for IceFlush in -lICE" >&5 -+echo "configure:8928: checking for IceFlush in -lICE" >&5 +-echo "configure:9069: checking for IceFlush in -lICE" >&5 ++echo "configure:8972: 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 -@@ -9029,7 +8932,7 @@ +@@ -9073,7 +8976,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:8947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8991: \"$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 -@@ -9061,7 +8964,7 @@ +@@ -9105,7 +9008,7 @@ fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:9065: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:8968: checking for SmcCloseConnection in -lSM" >&5 +-echo "configure:9109: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9012: 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 -@@ -9069,7 +8972,7 @@ +@@ -9113,7 +9016,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:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9031: \"$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 -@@ -9101,7 +9004,7 @@ +@@ -9145,7 +9048,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9105: checking for XtFree in -lXt" >&5 -+echo "configure:9008: checking for XtFree in -lXt" >&5 +-echo "configure:9149: checking for XtFree in -lXt" >&5 ++echo "configure:9052: 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 -@@ -9109,7 +9012,7 @@ +@@ -9153,7 +9056,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:9027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9071: \"$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 -@@ -9154,7 +9057,7 @@ +@@ -9198,7 +9101,7 @@ esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 --echo "configure:9158: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:9061: checking for XineramaIsActive in -lXinerama" >&5 +-echo "configure:9202: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9105: 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 -@@ -9162,7 +9065,7 @@ +@@ -9206,7 +9109,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:9080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9124: \"$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 -@@ -9195,17 +9098,17 @@ +@@ -9239,17 +9142,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:9199: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:9102: checking for X11/extensions/Xinerama.h" >&5 +-echo "configure:9243: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9146: 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:9209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9156: \"$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* -@@ -9228,7 +9131,7 @@ +@@ -9272,7 +9175,7 @@ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:9232: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9135: checking for XShmCreateImage in -lXext" >&5 +-echo "configure:9276: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9179: 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 -@@ -9236,7 +9139,7 @@ +@@ -9280,7 +9183,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:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9198: \"$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 -@@ -9269,17 +9172,17 @@ +@@ -9313,17 +9216,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:9273: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9176: checking for X11/extensions/XShm.h" >&5 +-echo "configure:9317: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9220: 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:9283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9230: \"$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* -@@ -9309,7 +9212,7 @@ +@@ -9353,7 +9256,7 @@ fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9313: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9216: checking for XieFloGeometry in -lXIE" >&5 +-echo "configure:9357: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9260: 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 -@@ -9317,7 +9220,7 @@ +@@ -9361,7 +9264,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:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9279: \"$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 -@@ -9350,17 +9253,17 @@ +@@ -9394,17 +9297,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:9354: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9257: checking for X11/extensions/XIElib.h" >&5 +-echo "configure:9398: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9301: 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:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9311: \"$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* -@@ -9434,7 +9337,7 @@ +@@ -9478,7 +9381,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:9438: checking for $ac_word" >&5 -+echo "configure:9341: checking for $ac_word" >&5 +-echo "configure:9482: checking for $ac_word" >&5 ++echo "configure:9385: 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 -@@ -9470,7 +9373,7 @@ +@@ -9514,7 +9417,7 @@ min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9474: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9377: checking for FreeType - version >= $min_ft_version" >&5 +-echo "configure:9518: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9421: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes -@@ -9518,7 +9421,7 @@ +@@ -9562,7 +9465,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -9544,7 +9447,7 @@ +@@ -9588,7 +9491,7 @@ } EOF --if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -9596,7 +9499,7 @@ +@@ -9640,7 +9543,7 @@ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:9600: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9503: checking for pthread_create in -lpthreads" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9618,7 +9521,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:9622: checking for pthread_create in -lpthread" >&5 -+echo "configure:9525: checking for pthread_create in -lpthread" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9640,7 +9543,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:9644: checking for pthread_create in -lc_r" >&5 -+echo "configure:9547: checking for pthread_create in -lc_r" >&5 +-echo "configure:9644: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9547: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -9662,7 +9565,7 @@ echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:9666: checking for pthread_create in -lc" >&5 -+echo "configure:9569: checking for pthread_create in -lc" >&5 + 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:9569: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9718,7 +9621,7 @@ +@@ -9684,7 +9587,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:9591: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9706,7 +9609,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:9613: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9762,7 +9665,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:9722: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9625: checking whether ${CC-cc} accepts -pthread" >&5 +-echo "configure:9766: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9669: 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 -@@ -9741,7 +9644,7 @@ +@@ -9785,7 +9688,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:9745: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9648: checking whether ${CC-cc} accepts -pthreads" >&5 +-echo "configure:9789: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9692: 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 -@@ -9863,7 +9766,7 @@ +@@ -9907,7 +9810,7 @@ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:9867: checking whether mmap() sees write()s" >&5 -+echo "configure:9770: checking whether mmap() sees write()s" >&5 +-echo "configure:9911: checking whether mmap() sees write()s" >&5 ++echo "configure:9814: checking whether mmap() sees write()s" >&5 mmap_test_prog=' -@@ -9902,11 +9805,11 @@ +@@ -9946,11 +9849,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:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:9954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -9931,13 +9834,13 @@ +@@ -9975,13 +9878,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:9935: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9838: checking whether ${CC-cc} needs -traditional" >&5 +-echo "configure:9979: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9882: 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 -@@ -9955,7 +9858,7 @@ +@@ -9999,7 +9902,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA -@@ -9977,7 +9880,7 @@ +@@ -10021,7 +9924,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:9981: checking for 8-bit clean memcmp" >&5 -+echo "configure:9884: checking for 8-bit clean memcmp" >&5 +-echo "configure:10025: checking for 8-bit clean memcmp" >&5 ++echo "configure:9928: 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 -@@ -9985,7 +9888,7 @@ +@@ -10029,7 +9932,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:9902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9946: \"$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 -@@ -10015,12 +9918,12 @@ +@@ -10059,12 +9962,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:10019: checking for $ac_func" >&5 -+echo "configure:9922: checking for $ac_func" >&5 +-echo "configure:10063: checking for $ac_func" >&5 ++echo "configure:9966: 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:9950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9994: \"$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 -@@ -10070,12 +9973,12 @@ +@@ -10114,12 +10017,12 @@ for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10074: checking for $ac_func" >&5 -+echo "configure:9977: checking for $ac_func" >&5 +-echo "configure:10118: checking for $ac_func" >&5 ++echo "configure:10021: 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:10005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10049: \"$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 -@@ -10127,12 +10030,12 @@ +@@ -10171,12 +10074,12 @@ for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10131: checking for $ac_func" >&5 -+echo "configure:10034: checking for $ac_func" >&5 +-echo "configure:10175: checking for $ac_func" >&5 ++echo "configure:10078: 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:10062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10106: \"$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 -@@ -10191,19 +10094,19 @@ +@@ -10235,19 +10138,19 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:10195: checking for wcrtomb" >&5 -+echo "configure:10098: checking for wcrtomb" >&5 +-echo "configure:10239: checking for wcrtomb" >&5 ++echo "configure:10142: 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() { mbstate_t ps={0};wcrtomb(0,'f',&ps); ; return 0; } EOF --if { (eval echo configure:10207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else -@@ -10223,19 +10126,19 @@ +@@ -10267,19 +10170,19 @@ fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:10227: checking for mbrtowc" >&5 -+echo "configure:10130: checking for mbrtowc" >&5 +-echo "configure:10271: checking for mbrtowc" >&5 ++echo "configure:10174: 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() { mbstate_t ps={0};mbrtowc(0,0,0,&ps); ; return 0; } EOF --if { (eval echo configure:10239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else -@@ -10264,12 +10167,12 @@ +@@ -10308,12 +10211,12 @@ fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:10268: checking for res_ninit()" >&5 -+echo "configure:10171: checking for res_ninit()" >&5 +-echo "configure:10312: checking for res_ninit()" >&5 ++echo "configure:10215: 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:10188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10232: \"$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 -@@ -10311,12 +10214,12 @@ +@@ -10355,12 +10258,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10315: checking for gnu_get_libc_version()" >&5 -+echo "configure:10218: checking for gnu_get_libc_version()" >&5 +-echo "configure:10359: checking for gnu_get_libc_version()" >&5 ++echo "configure:10262: 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:10234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10278: \"$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 -@@ -10356,7 +10259,7 @@ +@@ -10400,7 +10303,7 @@ *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10360: checking for iconv in -lc" >&5 -+echo "configure:10263: checking for iconv in -lc" >&5 +-echo "configure:10404: checking for iconv in -lc" >&5 ++echo "configure:10307: 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 -@@ -10364,7 +10267,7 @@ +@@ -10408,7 +10311,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:10285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10329: \"$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 -@@ -10397,7 +10300,7 @@ +@@ -10441,7 +10344,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10401: checking for iconv in -liconv" >&5 -+echo "configure:10304: checking for iconv in -liconv" >&5 +-echo "configure:10445: checking for iconv in -liconv" >&5 ++echo "configure:10348: 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 -@@ -10405,7 +10308,7 @@ +@@ -10449,7 +10352,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:10326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10370: \"$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 -@@ -10438,7 +10341,7 @@ +@@ -10482,7 +10385,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10442: checking for libiconv in -liconv" >&5 -+echo "configure:10345: checking for libiconv in -liconv" >&5 +-echo "configure:10486: checking for libiconv in -liconv" >&5 ++echo "configure:10389: 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 -@@ -10446,7 +10349,7 @@ +@@ -10490,7 +10393,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:10367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10411: \"$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 -@@ -10487,12 +10390,12 @@ +@@ -10531,12 +10434,12 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10491: checking for iconv()" >&5 -+echo "configure:10394: checking for iconv()" >&5 +-echo "configure:10535: checking for iconv()" >&5 ++echo "configure:10438: 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 < -@@ -10506,7 +10409,7 @@ +@@ -10550,7 +10453,7 @@ ; return 0; } EOF --if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else -@@ -10530,12 +10433,12 @@ +@@ -10574,12 +10477,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:10534: checking for iconv() with const input" >&5 -+echo "configure:10437: checking for iconv() with const input" >&5 +-echo "configure:10578: checking for iconv() with const input" >&5 ++echo "configure:10481: 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 < -@@ -10550,7 +10453,7 @@ +@@ -10594,7 +10497,7 @@ ; return 0; } EOF --if { (eval echo configure:10554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else -@@ -10579,19 +10482,19 @@ +@@ -10623,19 +10526,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10583: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10486: checking for nl_langinfo and CODESET" >&5 +-echo "configure:10627: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10530: 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() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF --if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else -@@ -10623,7 +10526,7 @@ +@@ -10667,7 +10570,7 @@ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:10627: checking for an implementation of va_copy()" >&5 -+echo "configure:10530: checking for an implementation of va_copy()" >&5 +-echo "configure:10671: checking for an implementation of va_copy()" >&5 ++echo "configure:10574: 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 -@@ -10633,7 +10536,7 @@ +@@ -10677,7 +10580,7 @@ else cat > conftest.$ac_ext < -@@ -10647,7 +10550,7 @@ +@@ -10691,7 +10594,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:10598: \"$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 -@@ -10664,7 +10567,7 @@ +@@ -10708,7 +10611,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:10668: checking for an implementation of __va_copy()" >&5 -+echo "configure:10571: checking for an implementation of __va_copy()" >&5 +-echo "configure:10712: checking for an implementation of __va_copy()" >&5 ++echo "configure:10615: 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 -@@ -10674,7 +10577,7 @@ +@@ -10718,7 +10621,7 @@ else cat > conftest.$ac_ext < -@@ -10688,7 +10591,7 @@ +@@ -10732,7 +10635,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:10639: \"$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 -@@ -10705,7 +10608,7 @@ +@@ -10749,7 +10652,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:10709: checking whether va_lists can be copied by value" >&5 -+echo "configure:10612: checking whether va_lists can be copied by value" >&5 +-echo "configure:10753: checking whether va_lists can be copied by value" >&5 ++echo "configure:10656: 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 -@@ -10715,7 +10618,7 @@ +@@ -10759,7 +10662,7 @@ else cat > conftest.$ac_ext < -@@ -10729,7 +10632,7 @@ +@@ -10773,7 +10676,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:10680: \"$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 -@@ -10828,7 +10731,7 @@ +@@ -10872,7 +10775,7 @@ if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:10832: checking for C++ exceptions flag" >&5 -+echo "configure:10735: checking for C++ exceptions flag" >&5 +-echo "configure:10876: checking for C++ exceptions flag" >&5 ++echo "configure:10779: 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 -@@ -10863,12 +10766,12 @@ +@@ -10907,12 +10810,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:10867: checking for gcc 3.0 ABI" >&5 -+echo "configure:10770: checking for gcc 3.0 ABI" >&5 +-echo "configure:10911: checking for gcc 3.0 ABI" >&5 ++echo "configure:10814: 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:10788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else -@@ -10905,12 +10808,12 @@ +@@ -10949,12 +10852,12 @@ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:10909: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10812: checking for C++ \"explicit\" keyword" >&5 +-echo "configure:10953: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10856: 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:10827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else -@@ -10941,12 +10844,12 @@ +@@ -10985,12 +10888,12 @@ fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:10945: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10848: checking for C++ \"typename\" keyword" >&5 +-echo "configure:10989: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10892: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else -@@ -10986,12 +10889,12 @@ +@@ -11030,12 +10933,12 @@ fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:10990: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10893: checking for modern C++ template specialization syntax support" >&5 +-echo "configure:11034: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10937: 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 {}; -@@ -11001,7 +10904,7 @@ +@@ -11045,7 +10948,7 @@ X y_x; ; return 0; } EOF --if { (eval echo configure:11005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else -@@ -11023,12 +10926,12 @@ +@@ -11067,12 +10970,12 @@ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11027: checking whether partial template specialization works" >&5 -+echo "configure:10930: checking whether partial template specialization works" >&5 +-echo "configure:11071: checking whether partial template specialization works" >&5 ++echo "configure:10974: 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 {}; -@@ -11036,7 +10939,7 @@ +@@ -11080,7 +10983,7 @@ return 0; ; return 0; } EOF --if { (eval echo configure:11040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else -@@ -11057,12 +10960,12 @@ +@@ -11101,12 +11004,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:11061: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:10964: checking whether operators must be re-defined for templates derived from templates" >&5 +-echo "configure:11105: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:11008: 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 -@@ -11074,7 +10977,7 @@ +@@ -11118,7 +11021,7 @@ return 0; ; return 0; } EOF --if { (eval echo configure:11078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10981: \"$ac_compile\") 1>&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:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else -@@ -11096,12 +10999,12 @@ +@@ -11140,12 +11043,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:11100: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11003: checking whether we need to cast a derived template to pass as its base class" >&5 +-echo "configure:11144: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11047: 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 { }; -@@ -11110,7 +11013,7 @@ +@@ -11154,7 +11057,7 @@ Derived bar; return foo(bar); ; return 0; } EOF --if { (eval echo configure:11114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else -@@ -11131,12 +11034,12 @@ +@@ -11175,12 +11078,12 @@ fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:11135: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11038: checking whether the compiler can resolve const ambiguities for templates" >&5 +-echo "configure:11179: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11082: 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 { -@@ -11157,7 +11060,7 @@ +@@ -11201,7 +11104,7 @@ a(&i); ; return 0; } EOF --if { (eval echo configure:11161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else -@@ -11179,12 +11082,12 @@ +@@ -11223,12 +11126,12 @@ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:11183: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11086: checking whether the C++ \"using\" keyword can change access" >&5 +-echo "configure:11227: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11130: 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:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11143: \"$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:11110: \"$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:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else -@@ -11231,12 +11134,12 @@ +@@ -11275,12 +11178,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11235: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11138: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +-echo "configure:11279: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11182: 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:11159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else -@@ -11273,19 +11176,19 @@ +@@ -11317,19 +11220,19 @@ fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:11277: checking for \"std::\" namespace" >&5 -+echo "configure:11180: checking for \"std::\" namespace" >&5 +-echo "configure:11321: checking for \"std::\" namespace" >&5 ++echo "configure:11224: 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() { return std::min(0, 1); ; return 0; } EOF --if { (eval echo configure:11289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else -@@ -11306,12 +11209,12 @@ +@@ -11350,12 +11253,12 @@ fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11310: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11213: checking whether standard template operator!=() is ambiguous" >&5 +-echo "configure:11354: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11257: 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 {}; -@@ -11321,7 +11224,7 @@ +@@ -11365,7 +11268,7 @@ T1 a,b; return a != b; ; return 0; } EOF --if { (eval echo configure:11325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else -@@ -11343,12 +11246,12 @@ +@@ -11387,12 +11290,12 @@ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11347: checking for C++ reinterpret_cast" >&5 -+echo "configure:11250: checking for C++ reinterpret_cast" >&5 +-echo "configure:11391: checking for C++ reinterpret_cast" >&5 ++echo "configure:11294: 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:11360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else -@@ -11377,7 +11280,7 @@ +@@ -11421,7 +11324,7 @@ fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11381: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11284: checking for C++ dynamic_cast to void*" >&5 +-echo "configure:11425: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11328: 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 -@@ -11385,8 +11288,11 @@ +@@ -11429,8 +11332,11 @@ ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF --if { (eval echo configure:11405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:11355: \"$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 -@@ -11425,19 +11331,19 @@ +@@ -11469,19 +11375,19 @@ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11429: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11335: checking whether C++ requires implementation of unused virtual methods" >&5 +-echo "configure:11473: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11379: 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:11347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11391: \"$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 -@@ -11460,12 +11366,12 @@ +@@ -11504,12 +11410,12 @@ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11464: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11370: checking for trouble comparing to zero near std::operator!=()" >&5 +-echo "configure:11508: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11414: 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 {}; -@@ -11476,7 +11382,7 @@ +@@ -11520,7 +11426,7 @@ Foo f; return (0 != f); ; return 0; } EOF --if { (eval echo configure:11480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else -@@ -11508,19 +11414,19 @@ +@@ -11552,19 +11458,19 @@ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11512: checking for LC_MESSAGES" >&5 -+echo "configure:11418: checking for LC_MESSAGES" >&5 +-echo "configure:11556: checking for LC_MESSAGES" >&5 ++echo "configure:11462: 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() { int category = LC_MESSAGES; ; return 0; } EOF --if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else -@@ -11601,7 +11507,7 @@ +@@ -11645,7 +11551,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:11605: checking for $ac_word" >&5 -+echo "configure:11511: checking for $ac_word" >&5 +-echo "configure:11649: checking for $ac_word" >&5 ++echo "configure:11555: 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 -@@ -11636,7 +11542,7 @@ +@@ -11680,7 +11586,7 @@ min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 --echo "configure:11640: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11546: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 +-echo "configure:11684: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11590: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then -@@ -11738,7 +11644,7 @@ +@@ -11782,7 +11688,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:11742: checking for $ac_word" >&5 -+echo "configure:11648: checking for $ac_word" >&5 +-echo "configure:11786: checking for $ac_word" >&5 ++echo "configure:11692: 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 -@@ -11773,7 +11679,7 @@ +@@ -11817,7 +11723,7 @@ min_nss_version=3.0.0 echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 --echo "configure:11777: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+echo "configure:11683: checking for NSS - version >= $min_nss_version (skipping)" >&5 +-echo "configure:11821: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11727: checking for NSS - version >= $min_nss_version (skipping)" >&5 no_nss="" if test "$NSS_CONFIG" = "no"; then -@@ -11846,7 +11752,7 @@ +@@ -11890,7 +11796,7 @@ SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:11850: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11756: checking for jpeg_destroy_compress in -ljpeg" >&5 +-echo "configure:11894: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11800: 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 -@@ -11854,7 +11760,7 @@ +@@ -11898,7 +11804,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:11775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11819: \"$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 -@@ -11894,7 +11800,7 @@ +@@ -11938,7 +11844,7 @@ SYSTEM_JPEG= else cat > conftest.$ac_ext < #include -@@ -11908,7 +11814,7 @@ +@@ -11952,7 +11858,7 @@ } EOF --if { (eval echo configure:11912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:11862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else -@@ -11949,7 +11855,7 @@ +@@ -11993,7 +11899,7 @@ SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:11953: checking for gzread in -lz" >&5 -+echo "configure:11859: checking for gzread in -lz" >&5 +-echo "configure:11997: checking for gzread in -lz" >&5 ++echo "configure:11903: 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 -@@ -11957,7 +11863,7 @@ +@@ -12001,7 +11907,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:11878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11922: \"$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 -@@ -11996,7 +11902,7 @@ +@@ -12040,7 +11946,7 @@ SYSTEM_ZLIB= else cat > conftest.$ac_ext < -@@ -12017,7 +11923,7 @@ +@@ -12061,7 +11967,7 @@ } EOF --if { (eval echo configure:12021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:11971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else -@@ -12060,7 +11966,7 @@ +@@ -12104,7 +12010,7 @@ SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:12064: checking for png_get_valid in -lpng" >&5 -+echo "configure:11970: checking for png_get_valid in -lpng" >&5 +-echo "configure:12108: checking for png_get_valid in -lpng" >&5 ++echo "configure:12014: 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 -@@ -12068,7 +11974,7 @@ +@@ -12112,7 +12018,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:11989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12033: \"$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 -@@ -12107,7 +12013,7 @@ +@@ -12151,7 +12057,7 @@ SYSTEM_PNG= else cat > conftest.$ac_ext < #include -@@ -12121,7 +12027,7 @@ +@@ -12165,7 +12071,7 @@ } EOF --if { (eval echo configure:12125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:12075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else -@@ -12221,8 +12127,8 @@ - MOZ_ENABLE_GTK2=1 - MOZ_ENABLE_XREMOTE=1 - MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} -- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' -- TK_LIBS='$(MOZ_GTK2_LIBS)' -+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' -+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' - cat >> confdefs.h <<\EOF - #define MOZ_WIDGET_GTK2 1 - EOF -@@ -12371,7 +12277,7 @@ +@@ -12415,7 +12321,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:12375: checking for $ac_word" >&5 -+echo "configure:12281: checking for $ac_word" >&5 +-echo "configure:12419: checking for $ac_word" >&5 ++echo "configure:12325: 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 -@@ -12406,7 +12312,7 @@ +@@ -12450,7 +12356,7 @@ min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 --echo "configure:12410: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:12316: checking for GTK - version >= $min_gtk_version" >&5 +-echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12360: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes -@@ -12429,7 +12335,7 @@ +@@ -12473,7 +12379,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -12507,7 +12413,7 @@ +@@ -12551,7 +12457,7 @@ } EOF --if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:12461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -12542,7 +12448,7 @@ +@@ -12586,7 +12492,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < -@@ -12552,7 +12458,7 @@ +@@ -12596,7 +12502,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF --if { (eval echo configure:12556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12506: \"$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" -@@ -12604,7 +12510,7 @@ +@@ -12648,7 +12554,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:12608: checking for $ac_word" >&5 -+echo "configure:12514: checking for $ac_word" >&5 +-echo "configure:12652: checking for $ac_word" >&5 ++echo "configure:12558: 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 -@@ -12648,19 +12554,19 @@ +@@ -12692,19 +12598,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:12652: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12558: checking for gtk+-2.0 >= 1.3.7" >&5 +-echo "configure:12696: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12602: 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 succeeded=yes echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 --echo "configure:12659: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12565: checking MOZ_GTK2_CFLAGS" >&5 +-echo "configure:12703: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12609: 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:12664: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12570: checking MOZ_GTK2_LIBS" >&5 +-echo "configure:12708: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12614: 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\"`" -@@ -12725,7 +12631,7 @@ +@@ -12769,7 +12675,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:12729: checking for $ac_word" >&5 -+echo "configure:12635: checking for $ac_word" >&5 +-echo "configure:12773: checking for $ac_word" >&5 ++echo "configure:12679: 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 -@@ -12777,7 +12683,7 @@ +@@ -12821,7 +12727,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 --echo "configure:12781: checking for main in -lqt" >&5 -+echo "configure:12687: checking for main in -lqt" >&5 +-echo "configure:12825: checking for main in -lqt" >&5 ++echo "configure:12731: 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 -@@ -12785,14 +12691,14 @@ +@@ -12829,14 +12735,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:12702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12746: \"$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 -@@ -12811,7 +12717,7 @@ +@@ -12855,7 +12761,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 --echo "configure:12815: checking for main in -lqt-mt" >&5 -+echo "configure:12721: checking for main in -lqt-mt" >&5 +-echo "configure:12859: checking for main in -lqt-mt" >&5 ++echo "configure:12765: 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 -@@ -12819,14 +12725,14 @@ +@@ -12863,14 +12769,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:12736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12780: \"$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 -@@ -12862,9 +12768,9 @@ +@@ -12906,9 +12812,9 @@ LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 --echo "configure:12866: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12772: checking Qt - version >= $QT_VERSION" >&5 +-echo "configure:12910: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12816: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { -@@ -12875,7 +12781,7 @@ +@@ -12919,7 +12825,7 @@ ; return 0; } EOF --if { (eval echo configure:12879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else -@@ -12906,6 +12812,138 @@ +@@ -12950,6 +12856,138 @@ @@ -4438,7 +4441,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:12842: checking for $ac_word" >&5 ++echo "configure:12886: 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 @@ -4482,19 +4485,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 -+echo "configure:12886: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 ++echo "configure:12930: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 + + if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 -+echo "configure:12893: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 ++echo "configure:12937: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 + MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` + echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 -+echo "configure:12898: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ++echo "configure:12942: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`" @@ -4547,411 +4550,266 @@ -@@ -13471,7 +13509,7 @@ +@@ -13515,7 +13553,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:13475: checking for $ac_word" >&5 -+echo "configure:13513: checking for $ac_word" >&5 +-echo "configure:13519: checking for $ac_word" >&5 ++echo "configure:13557: 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 -@@ -13515,19 +13553,19 @@ +@@ -13559,19 +13597,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:13519: checking for xft" >&5 -+echo "configure:13557: checking for xft" >&5 +-echo "configure:13563: checking for xft" >&5 ++echo "configure:13601: checking for xft" >&5 if $PKG_CONFIG --exists "xft" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 --echo "configure:13526: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13564: checking MOZ_XFT_CFLAGS" >&5 +-echo "configure:13570: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13608: 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:13531: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13569: checking MOZ_XFT_LIBS" >&5 +-echo "configure:13575: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13613: 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\"`" -@@ -13562,7 +13600,7 @@ +@@ -13606,7 +13644,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:13566: checking for $ac_word" >&5 -+echo "configure:13604: checking for $ac_word" >&5 +-echo "configure:13610: checking for $ac_word" >&5 ++echo "configure:13648: 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 -@@ -13605,31 +13643,31 @@ - else +@@ -13650,19 +13688,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:13610: checking for pango >= 1.1.0" >&5 -+ echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6 -+echo "configure:13648: checking for pangoxft >= 1.1.0 pangox" >&5 + 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:13692: checking for pango >= 1.1.0" >&5 -- if $PKG_CONFIG --exists "pango >= 1.1.0" ; then -+ if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then + if $PKG_CONFIG --exists "pango >= 1.1.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes -- echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13617: checking _PANGOCHK_CFLAGS" >&5 -- _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` -- echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 -+ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -+echo "configure:13655: checking MOZ_PANGO_CFLAGS" >&5 -+ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"` -+ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13661: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13699: 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:13622: checking _PANGOCHK_LIBS" >&5 -+ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -+echo "configure:13660: checking MOZ_PANGO_LIBS" >&5 + echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13666: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13704: 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\"`" -- echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 -+ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`" -+ echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 - else -- _PANGOCHK_CFLAGS="" -- _PANGOCHK_LIBS="" -+ MOZ_PANGO_CFLAGS="" -+ MOZ_PANGO_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"` -- echo $_PANGOCHK_PKG_ERRORS -+ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"` -+ echo $MOZ_PANGO_PKG_ERRORS - fi - - -@@ -13643,7 +13681,7 @@ - if test $succeeded = yes; then - : - else -- { echo "configure: error: Library requirements (pango >= 1.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -+ { echo "configure: error: Library requirements (pangoxft >= 1.1.0 pangox) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } - fi - - fi -@@ -13652,6 +13690,8 @@ - - - -+ -+ - # Check whether --enable-pango or --disable-pango was given. - if test "${enable_pango+set}" = set; then - enableval="$enable_pango" -@@ -13678,7 +13718,7 @@ + _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" +@@ -13722,7 +13760,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:13682: checking for $ac_word" >&5 -+echo "configure:13722: checking for $ac_word" >&5 +-echo "configure:13726: checking for $ac_word" >&5 ++echo "configure:13764: 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 -@@ -13722,19 +13762,19 @@ +@@ -13766,19 +13804,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:13726: checking for pangoxft >= 1.6.0" >&5 -+echo "configure:13766: checking for pangoxft >= 1.6.0" >&5 +-echo "configure:13770: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13808: checking for pangoxft >= 1.6.0" >&5 if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 --echo "configure:13733: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13773: checking MOZ_PANGO_CFLAGS" >&5 +-echo "configure:13777: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13815: 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:13738: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13778: checking MOZ_PANGO_LIBS" >&5 +-echo "configure:13782: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13820: 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\"`" -@@ -13762,10 +13802,110 @@ - { echo "configure: error: Library requirements (pangoxft >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } - fi - -+ -+ 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:13813: 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 pangocairo >= 1.10.0""... $ac_c" 1>&6 -+echo "configure:13857: checking for pangocairo >= 1.10.0" >&5 -+ -+ if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then -+ echo "$ac_t""yes" 1>&6 -+ succeeded=yes -+ -+ echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6 -+echo "configure:13864: checking PANGOCAIRO_CHK_CFLAGS" >&5 -+ PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"` -+ echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6 -+ -+ echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6 -+echo "configure:13869: checking PANGOCAIRO_CHK_LIBS" >&5 -+ ## don't use --libs since that can do evil things like add -+ ## -Wl,--export-dynamic -+ PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`" -+ echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6 -+ else -+ PANGOCAIRO_CHK_CFLAGS="" -+ PANGOCAIRO_CHK_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"` -+ -+ 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 -+ -+ MOZ_PANGOCAIRO=1 -+ cat >> confdefs.h <<\EOF -+#define MOZ_PANGOCAIRO 1 -+EOF -+ -+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" -+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" -+ -+ else -+ : -+ fi -+ - - - - -+ - fi - - if test "$MOZ_X11" -@@ -13802,7 +13942,7 @@ +@@ -13846,7 +13884,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 --echo "configure:13806: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13946: checking for XpGetPrinterList in -lXp" >&5 +-echo "configure:13850: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13888: 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 -@@ -13810,7 +13950,7 @@ +@@ -13854,7 +13892,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:13965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:13869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13907: \"$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 -@@ -13894,7 +14034,7 @@ +@@ -13938,7 +13976,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:13898: checking for $ac_word" >&5 -+echo "configure:14038: checking for $ac_word" >&5 +-echo "configure:13942: checking for $ac_word" >&5 ++echo "configure:13980: 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 -@@ -13938,19 +14078,19 @@ +@@ -13982,19 +14020,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:13942: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14082: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +-echo "configure:13986: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14024: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 --echo "configure:13949: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14089: checking MOZ_GNOMEVFS_CFLAGS" >&5 +-echo "configure:13993: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14031: 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:13954: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14094: checking MOZ_GNOMEVFS_LIBS" >&5 +-echo "configure:13998: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14036: 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\"`" -@@ -14001,7 +14141,7 @@ +@@ -14045,7 +14083,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:14005: checking for $ac_word" >&5 -+echo "configure:14145: checking for $ac_word" >&5 +-echo "configure:14049: checking for $ac_word" >&5 ++echo "configure:14087: 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 -@@ -14045,19 +14185,19 @@ +@@ -14089,19 +14127,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:14049: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14189: checking for gconf-2.0 >= $GCONF_VERSION" >&5 +-echo "configure:14093: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14131: checking for gconf-2.0 >= $GCONF_VERSION" >&5 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 --echo "configure:14056: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14196: checking MOZ_GCONF_CFLAGS" >&5 +-echo "configure:14100: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14138: 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:14061: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14201: checking MOZ_GCONF_LIBS" >&5 +-echo "configure:14105: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14143: 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\"`" -@@ -14104,7 +14244,7 @@ +@@ -14138,6 +14176,7 @@ + + + ++ + + if test "$MOZ_ENABLE_LIBGNOME" + then +@@ -14148,7 +14187,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:14108: checking for $ac_word" >&5 -+echo "configure:14248: checking for $ac_word" >&5 +-echo "configure:14152: checking for $ac_word" >&5 ++echo "configure:14191: 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 -@@ -14148,19 +14288,19 @@ +@@ -14192,19 +14231,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:14152: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14292: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 +-echo "configure:14196: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14235: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 --echo "configure:14159: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14299: checking MOZ_LIBGNOME_CFLAGS" >&5 +-echo "configure:14203: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14242: 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:14164: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14304: checking MOZ_LIBGNOME_LIBS" >&5 +-echo "configure:14208: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14247: 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\"`" -@@ -14238,7 +14378,7 @@ +@@ -14282,7 +14321,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:14242: checking for $ac_word" >&5 -+echo "configure:14382: checking for $ac_word" >&5 +-echo "configure:14286: checking for $ac_word" >&5 ++echo "configure:14325: 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 -@@ -14282,19 +14422,19 @@ +@@ -14326,19 +14365,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:14286: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14426: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 +-echo "configure:14330: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14369: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 --echo "configure:14293: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14433: checking MOZ_GNOMEUI_CFLAGS" >&5 +-echo "configure:14337: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14376: 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:14298: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14438: checking MOZ_GNOMEUI_LIBS" >&5 +-echo "configure:14342: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14381: 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\"`" -@@ -14345,6 +14485,221 @@ +@@ -14389,6 +14428,221 @@ @@ -4979,7 +4837,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:14513: checking for $ac_word" >&5 ++echo "configure:14456: 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 @@ -5023,19 +4881,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for dbus-glib-1""... $ac_c" 1>&6 -+echo "configure:14557: checking for dbus-glib-1" >&5 ++echo "configure:14500: checking for dbus-glib-1" >&5 + + if $PKG_CONFIG --exists "dbus-glib-1" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 -+echo "configure:14564: checking MOZ_DBUS_GLIB_CFLAGS" >&5 ++echo "configure:14507: checking MOZ_DBUS_GLIB_CFLAGS" >&5 + MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` + echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 -+echo "configure:14569: checking MOZ_DBUS_GLIB_LIBS" >&5 ++echo "configure:14512: checking MOZ_DBUS_GLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"dbus-glib-1\"` `$PKG_CONFIG --libs-only-l \"dbus-glib-1\"`" @@ -5070,7 +4928,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:14604: checking for $ac_word" >&5 ++echo "configure:14547: 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 @@ -5114,19 +4972,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 -+echo "configure:14648: checking for gthread-2.0" >&5 ++echo "configure:14591: checking for gthread-2.0" >&5 + + if $PKG_CONFIG --exists "gthread-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 -+echo "configure:14655: checking MOZ_GTHREAD_CFLAGS" >&5 ++echo "configure:14598: checking MOZ_GTHREAD_CFLAGS" >&5 + MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` + echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 -+echo "configure:14660: checking MOZ_GTHREAD_LIBS" >&5 ++echo "configure:14603: checking MOZ_GTHREAD_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs-only-L \"gthread-2.0\"` `$PKG_CONFIG --libs-only-l \"gthread-2.0\"`" @@ -5173,25 +5031,25 @@ if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \ && test "$MOZ_ENABLE_COREXFONTS" \ || test "$MOZ_ENABLE_XLIB" \ -@@ -14780,7 +15135,7 @@ +@@ -14824,7 +15078,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:14784: checking for $ac_word" >&5 -+echo "configure:15139: checking for $ac_word" >&5 +-echo "configure:14828: checking for $ac_word" >&5 ++echo "configure:15082: 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 -@@ -14816,7 +15171,7 @@ +@@ -14860,7 +15114,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:14820: checking for $ac_word" >&5 -+echo "configure:15175: checking for $ac_word" >&5 +-echo "configure:14864: checking for $ac_word" >&5 ++echo "configure:15118: 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 -@@ -14891,6 +15246,13 @@ +@@ -14935,6 +15189,13 @@ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` fi @@ -5205,304 +5063,304 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2 MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` -@@ -15063,7 +15425,7 @@ +@@ -15107,7 +15368,7 @@ gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 --echo "configure:15067: checking for Gdiplus.h" >&5 -+echo "configure:15429: checking for Gdiplus.h" >&5 +-echo "configure:15111: checking for Gdiplus.h" >&5 ++echo "configure:15372: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -15073,7 +15435,7 @@ +@@ -15117,7 +15378,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include -@@ -15082,7 +15444,7 @@ +@@ -15126,7 +15387,7 @@ ; return 0; } EOF --if { (eval echo configure:15086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else -@@ -15162,7 +15524,7 @@ +@@ -15206,7 +15467,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:15166: checking for $ac_word" >&5 -+echo "configure:15528: checking for $ac_word" >&5 +-echo "configure:15210: checking for $ac_word" >&5 ++echo "configure:15471: 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 -@@ -15207,7 +15569,7 @@ +@@ -15251,7 +15512,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:15211: checking for $ac_word" >&5 -+echo "configure:15573: checking for $ac_word" >&5 +-echo "configure:15255: checking for $ac_word" >&5 ++echo "configure:15516: 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 -@@ -15276,13 +15638,13 @@ +@@ -15320,13 +15581,13 @@ msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:15280: checking for iconv" >&5 -+echo "configure:15642: checking for iconv" >&5 +-echo "configure:15324: checking for iconv" >&5 ++echo "configure:15585: 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:15286: checking for $ac_word" >&5 -+echo "configure:15648: checking for $ac_word" >&5 +-echo "configure:15330: checking for $ac_word" >&5 ++echo "configure:15591: 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 -@@ -15628,18 +15990,18 @@ +@@ -15672,18 +15933,18 @@ if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:15632: checking for valid debug flags" >&5 -+echo "configure:15994: checking for valid debug flags" >&5 +-echo "configure:15676: checking for valid debug flags" >&5 ++echo "configure:15937: checking for valid debug flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:15643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15680,18 +16042,18 @@ +@@ -15724,18 +15985,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:15684: checking for valid optimization flags" >&5 -+echo "configure:16046: checking for valid optimization flags" >&5 +-echo "configure:15728: checking for valid optimization flags" >&5 ++echo "configure:15989: checking for valid optimization flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:15695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else -@@ -15908,7 +16270,7 @@ +@@ -15952,7 +16213,7 @@ if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:15912: checking for malloc in -lefence" >&5 -+echo "configure:16274: checking for malloc in -lefence" >&5 +-echo "configure:15956: checking for malloc in -lefence" >&5 ++echo "configure:16217: 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 -@@ -15916,7 +16278,7 @@ +@@ -15960,7 +16221,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:16293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16236: \"$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 -@@ -16028,12 +16390,12 @@ +@@ -16072,12 +16333,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:16032: checking for $ac_func" >&5 -+echo "configure:16394: checking for $ac_func" >&5 +-echo "configure:16076: checking for $ac_func" >&5 ++echo "configure:16337: 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:16425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16368: \"$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 -@@ -16302,12 +16664,12 @@ +@@ -16346,12 +16607,12 @@ for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:16306: checking for $ac_func" >&5 -+echo "configure:16668: checking for $ac_func" >&5 +-echo "configure:16350: checking for $ac_func" >&5 ++echo "configure:16611: 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:16699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16642: \"$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 -@@ -16471,7 +16833,7 @@ +@@ -16515,7 +16776,7 @@ # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:16475: checking for gcc -pipe support" >&5 -+echo "configure:16837: checking for gcc -pipe support" >&5 +-echo "configure:16519: checking for gcc -pipe support" >&5 ++echo "configure:16780: 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 -@@ -16486,14 +16848,14 @@ +@@ -16530,14 +16791,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:16497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else -@@ -16535,16 +16897,16 @@ +@@ -16579,16 +16840,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:16539: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:16901: checking whether compiler supports -Wno-long-long" >&5 +-echo "configure:16583: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16844: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16853: \"$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" -@@ -16565,16 +16927,16 @@ +@@ -16609,16 +16870,16 @@ CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:16569: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:16931: checking whether C compiler supports -fprofile-generate" >&5 +-echo "configure:16613: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16874: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" -@@ -16592,16 +16954,16 @@ +@@ -16636,16 +16897,16 @@ else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:16596: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:16958: checking whether C compiler supports -fprofile-arcs" >&5 +-echo "configure:16640: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16901: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" -@@ -16647,16 +17009,16 @@ +@@ -16691,16 +16952,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:16651: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:17013: checking whether C++ compiler has -pedantic long long bug" >&5 +-echo "configure:16695: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16956: 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:17022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="no" else -@@ -16681,13 +17043,16 @@ +@@ -16725,13 +16986,16 @@ fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:16685: checking for correct temporary object destruction order" >&5 -+echo "configure:17047: checking for correct temporary object destruction order" >&5 +-echo "configure:16729: checking for correct temporary object destruction order" >&5 ++echo "configure:16990: 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:17075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else -@@ -16727,12 +17092,12 @@ +@@ -16771,12 +17035,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:16731: checking for correct overload resolution with const and templates" >&5 -+echo "configure:17096: checking for correct overload resolution with const and templates" >&5 +-echo "configure:16775: checking for correct overload resolution with const and templates" >&5 ++echo "configure:17039: 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 < -@@ -16762,7 +17127,7 @@ +@@ -16806,7 +17070,7 @@ ; return 0; } EOF --if { (eval echo configure:16766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else -@@ -17054,7 +17419,7 @@ +@@ -17098,7 +17362,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:17058: checking for $ac_word" >&5 -+echo "configure:17423: checking for $ac_word" >&5 +-echo "configure:17102: checking for $ac_word" >&5 ++echo "configure:17366: 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 -@@ -17098,19 +17463,19 @@ +@@ -17142,19 +17406,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:17102: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17467: checking for libIDL-2.0 >= 0.8.0" >&5 +-echo "configure:17146: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17410: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:17109: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17474: checking LIBIDL_CFLAGS" >&5 +-echo "configure:17153: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17417: 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:17114: checking LIBIDL_LIBS" >&5 -+echo "configure:17479: checking LIBIDL_LIBS" >&5 +-echo "configure:17158: checking LIBIDL_LIBS" >&5 ++echo "configure:17422: 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\"`" -@@ -17233,7 +17598,7 @@ +@@ -17277,7 +17541,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:17237: checking for $ac_word" >&5 -+echo "configure:17602: checking for $ac_word" >&5 +-echo "configure:17281: checking for $ac_word" >&5 ++echo "configure:17545: 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 -@@ -17268,7 +17633,7 @@ +@@ -17312,7 +17576,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17272: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17637: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17580: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17291,7 +17656,7 @@ +@@ -17335,7 +17599,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17367,7 +17732,7 @@ +@@ -17411,7 +17675,7 @@ } EOF --if { (eval echo configure:17371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:17679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17401,7 +17766,7 @@ +@@ -17445,7 +17709,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17411,7 +17776,7 @@ +@@ -17455,7 +17719,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17723: \"$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" -@@ -17455,7 +17820,7 @@ +@@ -17499,7 +17763,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:17459: checking for $ac_word" >&5 -+echo "configure:17824: checking for $ac_word" >&5 +-echo "configure:17503: checking for $ac_word" >&5 ++echo "configure:17767: 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 -@@ -17490,7 +17855,7 @@ +@@ -17534,7 +17798,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:17494: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17859: checking for libIDL - version >= $min_libIDL_version" >&5 +-echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17802: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -17517,7 +17882,7 @@ +@@ -17561,7 +17825,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17603,7 +17968,7 @@ +@@ -17647,7 +17911,7 @@ } EOF --if { (eval echo configure:17607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:17915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17637,7 +18002,7 @@ +@@ -17681,7 +17945,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -17648,7 +18013,7 @@ +@@ -17692,7 +17956,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF --if { (eval echo configure:17652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17960: \"$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" -@@ -17776,7 +18141,7 @@ +@@ -17820,7 +18084,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:17780: checking for $ac_word" >&5 -+echo "configure:18145: checking for $ac_word" >&5 +-echo "configure:17824: checking for $ac_word" >&5 ++echo "configure:18088: 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 -@@ -17811,7 +18176,7 @@ +@@ -17855,7 +18119,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17815: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18180: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18123: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17834,7 +18199,7 @@ +@@ -17878,7 +18142,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17910,7 +18275,7 @@ +@@ -17954,7 +18218,7 @@ } EOF --if { (eval echo configure:17914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -17944,7 +18309,7 @@ +@@ -17988,7 +18252,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17954,7 +18319,7 @@ +@@ -17998,7 +18262,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18266: \"$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" -@@ -17998,7 +18363,7 @@ +@@ -18042,7 +18306,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:18002: checking for $ac_word" >&5 -+echo "configure:18367: checking for $ac_word" >&5 +-echo "configure:18046: checking for $ac_word" >&5 ++echo "configure:18310: 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 -@@ -18033,7 +18398,7 @@ +@@ -18077,7 +18341,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:18037: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18402: checking for libIDL - version >= $min_libIDL_version" >&5 +-echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18345: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -18060,7 +18425,7 @@ +@@ -18104,7 +18368,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18146,7 +18511,7 @@ +@@ -18190,7 +18454,7 @@ } EOF --if { (eval echo configure:18150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18180,7 +18545,7 @@ +@@ -18224,7 +18488,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -18191,7 +18556,7 @@ +@@ -18235,7 +18499,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF --if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18503: \"$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" -@@ -18232,7 +18597,7 @@ +@@ -18276,7 +18540,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:18236: checking for $ac_word" >&5 -+echo "configure:18601: checking for $ac_word" >&5 +-echo "configure:18280: checking for $ac_word" >&5 ++echo "configure:18544: 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 -@@ -18276,19 +18641,19 @@ +@@ -18320,19 +18584,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:18280: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18645: checking for libIDL-2.0 >= 0.8.0" >&5 +-echo "configure:18324: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18588: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 --echo "configure:18287: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18652: checking LIBIDL_CFLAGS" >&5 +-echo "configure:18331: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18595: 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:18292: checking LIBIDL_LIBS" >&5 -+echo "configure:18657: checking LIBIDL_LIBS" >&5 +-echo "configure:18336: checking LIBIDL_LIBS" >&5 ++echo "configure:18600: 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\"`" -@@ -18324,7 +18689,7 @@ +@@ -18368,7 +18632,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:18328: checking for $ac_word" >&5 -+echo "configure:18693: checking for $ac_word" >&5 +-echo "configure:18372: checking for $ac_word" >&5 ++echo "configure:18636: 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 -@@ -18361,7 +18726,7 @@ +@@ -18405,7 +18669,7 @@ if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:18365: checking for ORBit libIDL usability" >&5 -+echo "configure:18730: checking for ORBit libIDL usability" >&5 +-echo "configure:18409: checking for ORBit libIDL usability" >&5 ++echo "configure:18673: 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}` -@@ -18378,7 +18743,7 @@ +@@ -18422,7 +18686,7 @@ result="maybe" else cat > conftest.$ac_ext < -@@ -18393,7 +18758,7 @@ +@@ -18437,7 +18701,7 @@ } EOF --if { (eval echo configure:18397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:18705: \"$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" -@@ -18450,7 +18815,7 @@ +@@ -18494,7 +18758,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:18454: checking for $ac_word" >&5 -+echo "configure:18819: checking for $ac_word" >&5 +-echo "configure:18498: checking for $ac_word" >&5 ++echo "configure:18762: 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 -@@ -18494,19 +18859,19 @@ +@@ -18538,19 +18802,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:18498: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:18863: checking for glib-2.0 >= 1.3.7" >&5 +-echo "configure:18542: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18806: 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 succeeded=yes echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 --echo "configure:18505: checking GLIB_CFLAGS" >&5 -+echo "configure:18870: checking GLIB_CFLAGS" >&5 +-echo "configure:18549: checking GLIB_CFLAGS" >&5 ++echo "configure:18813: 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:18510: checking GLIB_LIBS" >&5 -+echo "configure:18875: checking GLIB_LIBS" >&5 +-echo "configure:18554: checking GLIB_LIBS" >&5 ++echo "configure:18818: 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\"`" -@@ -18590,7 +18955,7 @@ +@@ -18634,7 +18898,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:18594: checking for $ac_word" >&5 -+echo "configure:18959: checking for $ac_word" >&5 +-echo "configure:18638: checking for $ac_word" >&5 ++echo "configure:18902: 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 -@@ -18625,7 +18990,7 @@ +@@ -18669,7 +18933,7 @@ min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:18629: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18994: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18937: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -18648,7 +19013,7 @@ +@@ -18692,7 +18956,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18724,7 +19089,7 @@ +@@ -18768,7 +19032,7 @@ } EOF --if { (eval echo configure:18728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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:19036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -18758,7 +19123,7 @@ +@@ -18802,7 +19066,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -18768,7 +19133,7 @@ +@@ -18812,7 +19076,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19080: \"$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" -@@ -18848,19 +19213,19 @@ +@@ -18892,19 +19156,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:18852: checking for working alloca.h" >&5 -+echo "configure:19217: checking for working alloca.h" >&5 +-echo "configure:18896: checking for working alloca.h" >&5 ++echo "configure:19160: 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() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF --if { (eval echo configure:18864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19172: \"$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 -@@ -18881,12 +19246,12 @@ +@@ -18925,12 +19189,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:18885: checking for alloca" >&5 -+echo "configure:19250: checking for alloca" >&5 +-echo "configure:18929: checking for alloca" >&5 ++echo "configure:19193: 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:19283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19226: \"$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 -@@ -18946,12 +19311,12 @@ +@@ -18990,12 +19254,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:18950: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19315: checking whether alloca needs Cray hooks" >&5 +-echo "configure:18994: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19258: 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 --echo "configure:18980: checking for $ac_func" >&5 -+echo "configure:19345: checking for $ac_func" >&5 +-echo "configure:19024: checking for $ac_func" >&5 ++echo "configure:19288: 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:19373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19316: \"$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 -@@ -19031,7 +19396,7 @@ +@@ -19075,7 +19339,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19035: checking stack direction for C alloca" >&5 -+echo "configure:19400: checking stack direction for C alloca" >&5 +-echo "configure:19079: checking stack direction for C alloca" >&5 ++echo "configure:19343: 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 -@@ -19039,7 +19404,7 @@ +@@ -19083,7 +19347,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:19427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19370: \"$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 -@@ -19107,17 +19472,17 @@ +@@ -19151,17 +19415,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:19111: checking for $ac_hdr" >&5 -+echo "configure:19476: checking for $ac_hdr" >&5 +-echo "configure:19155: checking for $ac_hdr" >&5 ++echo "configure:19419: 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:19121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:19165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19429: \"$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* -@@ -19208,7 +19573,7 @@ +@@ -19252,7 +19516,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:19212: checking for $ac_word" >&5 -+echo "configure:19577: checking for $ac_word" >&5 +-echo "configure:19256: checking for $ac_word" >&5 ++echo "configure:19520: 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 -@@ -19252,19 +19617,19 @@ +@@ -19296,19 +19560,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:19256: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:19621: checking for cairo >= $CAIRO_VERSION" >&5 +-echo "configure:19300: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19564: checking for cairo >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 --echo "configure:19263: checking CAIRO_CFLAGS" >&5 -+echo "configure:19628: checking CAIRO_CFLAGS" >&5 +-echo "configure:19307: checking CAIRO_CFLAGS" >&5 ++echo "configure:19571: 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:19268: checking CAIRO_LIBS" >&5 -+echo "configure:19633: checking CAIRO_LIBS" >&5 +-echo "configure:19312: checking CAIRO_LIBS" >&5 ++echo "configure:19576: 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\"`" -@@ -19329,7 +19694,7 @@ +@@ -19373,7 +19637,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:19333: checking for $ac_word" >&5 -+echo "configure:19698: checking for $ac_word" >&5 +-echo "configure:19377: checking for $ac_word" >&5 ++echo "configure:19641: 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 -@@ -19605,14 +19970,14 @@ +@@ -19649,14 +19913,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { int x = 1; x++; ; return 0; } EOF --if { (eval echo configure:19616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -19919,7 +20284,7 @@ +@@ -19963,7 +20227,7 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < -@@ -19935,7 +20300,7 @@ +@@ -19979,7 +20243,7 @@ ; return 0; } EOF --if { (eval echo configure:19939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 -@@ -20152,34 +20517,15 @@ +@@ -20197,34 +20461,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. @@ -6199,7 +6057,7 @@ MOZ_DEFINES=$DEFS -@@ -20426,6 +20772,9 @@ +@@ -20472,6 +20717,9 @@ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@HOST_MOC@%$HOST_MOC%g s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g @@ -6209,24 +6067,14 @@ s%@TK_CFLAGS@%$TK_CFLAGS%g s%@TK_LIBS@%$TK_LIBS%g s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g -@@ -20462,12 +20811,13 @@ - s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g - s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g - s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g --s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g --s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g --s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g - s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g - s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g -+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g -+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g -+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g - s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g -+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g - s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g - s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g +@@ -20519,12 +20767,18 @@ s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g -@@ -20479,6 +20829,11 @@ + s%@MOZ_GCONF_CFLAGS@%$MOZ_GCONF_CFLAGS%g + s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g ++s%@MOZ_ENABLE_GCONF@%$MOZ_ENABLE_GCONF%g + s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g + s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g + s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g @@ -6238,21 +6086,3 @@ s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g -@@ -21118,7 +21473,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -21261,7 +21616,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - diff --git a/firefox-2.0.0.6-source.tar.bz2 b/firefox-2.0.0.6-source.tar.bz2 deleted file mode 100644 index 8ec2da5..0000000 --- a/firefox-2.0.0.6-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5ce09c6e3a31f419bd3117a9cb569d5ebfab7dab9221dbca0a73eaedee80197 -size 37624026 diff --git a/firefox-2.0.0.8-source.tar.bz2 b/firefox-2.0.0.8-source.tar.bz2 new file mode 100644 index 0000000..acfe97b --- /dev/null +++ b/firefox-2.0.0.8-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c75b8dc9fcec51a3d5d7a6af9e199cc532813ae93262840ec8402a34e64d785 +size 37685739 diff --git a/l10n-2.0.0.6.tar.bz2 b/l10n-2.0.0.6.tar.bz2 deleted file mode 100644 index 0b4257f..0000000 --- a/l10n-2.0.0.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e8d2aed30c2163ea932c012d9f992a411c145696408dca628ddaf1ca9912f7b -size 10101106 diff --git a/l10n-2.0.0.8.tar.bz2 b/l10n-2.0.0.8.tar.bz2 new file mode 100644 index 0000000..ae79513 --- /dev/null +++ b/l10n-2.0.0.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a09d1e74961a06afe93d34c59f239060fc2b96e8c4d704b7a774084244204b1d +size 10104949 diff --git a/pango-cairo.patch b/pango-cairo.patch deleted file mode 100644 index eaac5ef..0000000 --- a/pango-cairo.patch +++ /dev/null @@ -1,134 +0,0 @@ -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.363.2.1 -diff -u -p -6 -r3.363.2.1 autoconf.mk.in ---- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 -+++ config/autoconf.mk.in 27 Aug 2005 19:57:29 -0000 -@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@ - MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ - MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ - - MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@ - MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ - MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ -+MOZ_PANGOCAIRO = @MOZ_PANGOCAIRO@ - - MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@ - - MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ - MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@ - -Index: gfx/src/gtk/mozilla-decoder.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v -retrieving revision 1.3 -diff -u -p -6 -r1.3 mozilla-decoder.cpp ---- gfx/src/gtk/mozilla-decoder.cpp 7 Nov 2004 23:59:23 -0000 1.3 -+++ gfx/src/gtk/mozilla-decoder.cpp 27 Aug 2005 19:57:49 -0000 -@@ -37,13 +37,17 @@ - * ***** END LICENSE BLOCK ***** */ - - #define PANGO_ENABLE_BACKEND - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" -+#ifdef MOZ_PANGOCAIRO -+#include -+#else - #include -+#endif - #include - #include - #include - - #include "nsString.h" - #include "nsIPersistentProperties2.h" -@@ -205,13 +209,17 @@ mozilla_decoders_init(void) - } - else { - printf("unknown suffix used for mapping\n"); - } - } - -+#ifdef MOZ_PANGOCAIRO -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), -+#else - pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+#endif - mozilla_find_decoder, - NULL, - NULL); - - initialized = PR_TRUE; - -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1503.2.6 -diff -u -p -6 -r1.1503.2.6 configure.in ---- configure.in 25 Aug 2005 19:05:34 -0000 1.1503.2.6 -+++ configure.in 29 Aug 2005 08:03:32 -0000 -@@ -3707,14 +3707,14 @@ gtk) - ;; - - gtk2) - MOZ_ENABLE_GTK2=1 - MOZ_ENABLE_XREMOTE=1 - MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} -- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' -- TK_LIBS='$(MOZ_GTK2_LIBS)' -+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' -+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' - AC_DEFINE(MOZ_WIDGET_GTK2) - ;; - - xlib) - MOZ_ENABLE_XLIB=1 - if test "$_HAVE_FREETYPE2"; then -@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_ - fi - - if test "$MOZ_ENABLE_XFT" - then - AC_DEFINE(MOZ_ENABLE_XFT) - PKG_CHECK_MODULES(MOZ_XFT, xft) -- PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox) - fi - - AC_SUBST(MOZ_ENABLE_XFT) - AC_SUBST(MOZ_XFT_CFLAGS) - AC_SUBST(MOZ_XFT_LIBS) -+AC_SUBST(MOZ_PANGO_CFLAGS) -+AC_SUBST(MOZ_PANGO_LIBS) - - dnl ======================================================== - dnl = pango font rendering - dnl ======================================================== - MOZ_ARG_ENABLE_BOOL(pango, - [ --enable-pango Enable Pango font rendering support], - MOZ_ENABLE_PANGO=1, - MOZ_ENABLE_PANGO=) - - if test "$MOZ_ENABLE_PANGO" - then - AC_DEFINE(MOZ_ENABLE_PANGO) - PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0) -+ PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0, -+ [ -+ MOZ_PANGOCAIRO=1 -+ AC_DEFINE(MOZ_PANGOCAIRO) -+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" -+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" -+ ], -+ [:]) - - AC_SUBST(MOZ_ENABLE_PANGO) -+ AC_SUBST(MOZ_PANGOCAIRO) - AC_SUBST(MOZ_PANGO_CFLAGS) - AC_SUBST(MOZ_PANGO_LIBS) - fi - - dnl ======================================================== - dnl = x11 core font support (default and ability to enable depend on toolkit) diff --git a/startup.patch b/startup.patch index 865d088..f42fee0 100644 --- a/startup.patch +++ b/startup.patch @@ -735,283 +735,6 @@ Index: configure.in char **aResponse, PRBool *aSucceeded) = 0; }; -Index: toolkit/xre/nsAppRunner.cpp -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v -retrieving revision 1.113.2.19 -diff -u -p -6 -r1.113.2.19 nsAppRunner.cpp ---- toolkit/xre/nsAppRunner.cpp 8 Feb 2007 02:31:56 -0000 1.113.2.19 -+++ toolkit/xre/nsAppRunner.cpp 19 Feb 2007 09:39:38 -0000 -@@ -96,12 +96,13 @@ - #include "nsIWindowWatcher.h" - #include "nsIXULAppInfo.h" - #include "nsIXULRuntime.h" - #ifdef XP_WIN - #include "nsIWinAppHelper.h" - #endif -+#include "nsIScriptGlobalObject.h" - - #include "nsCRT.h" - #include "nsCOMPtr.h" - #include "nsDirectoryServiceDefs.h" - #include "nsDirectoryServiceUtils.h" - #include "nsEmbedCID.h" -@@ -112,12 +113,18 @@ - #include "nsXPFEComponentsCID.h" - - #include "nsAppDirectoryServiceDefs.h" - #include "nsXULAppAPI.h" - #include "nsXREDirProvider.h" - #include "nsToolkitCompsCID.h" -+#include "nsPIDOMWindow.h" -+#include "nsIDOMWindowInternal.h" -+#include "nsIBaseWindow.h" -+#include "nsIWidget.h" -+#include "nsIDocShell.h" -+#include "nsAppShellCID.h" - - #include "nsINIParser.h" - - #include "InstallCleanupDefines.h" - - #include -@@ -259,12 +266,15 @@ char **gArgv; - static int gRestartArgc; - static char **gRestartArgv; - - #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) - #include - #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 -+#if defined(MOZ_WIDGET_GTK2) -+#include "nsGTKToolkit.h" -+#endif - - #if defined(MOZ_WIDGET_QT) - #include - #endif - - // Save the path of the given file to the specified environment variable. -@@ -1102,13 +1112,13 @@ DumpVersion() - } - - #ifdef MOZ_ENABLE_XREMOTE - // use int here instead of a PR type since it will be returned - // from main - just to keep types consistent - static int --HandleRemoteArgument(const char* remote) -+HandleRemoteArgument(const char* remote, const char* aDesktopStartupID) - { - nsresult rv; - ArgResult ar; - - const char *profile = 0; - nsCAutoString program(gAppData->name); -@@ -1143,13 +1153,13 @@ HandleRemoteArgument(const char* remote) - return 1; - } - - nsXPIDLCString response; - PRBool success = PR_FALSE; - rv = client.SendCommand(program.get(), username, profile, remote, -- getter_Copies(response), &success); -+ aDesktopStartupID, getter_Copies(response), &success); - // did the command fail? - if (NS_FAILED(rv)) { - PR_fprintf(PR_STDERR, "Error: Failed to send command: %s\n", - response ? response.get() : "No response included"); - return 1; - } -@@ -1160,13 +1170,13 @@ HandleRemoteArgument(const char* remote) - } - - return 0; - } - - static PRBool --RemoteCommandLine() -+RemoteCommandLine(const char* aDesktopStartupID) - { - nsresult rv; - ArgResult ar; - - nsCAutoString program(gAppData->name); - ToLowerCase(program); -@@ -1192,13 +1202,13 @@ RemoteCommandLine() - if (NS_FAILED(rv)) - return PR_FALSE; - - nsXPIDLCString response; - PRBool success = PR_FALSE; - rv = client.SendCommandLine(program.get(), username, nsnull, -- gArgc, gArgv, -+ gArgc, gArgv, aDesktopStartupID, - getter_Copies(response), &success); - // did the command fail? - if (NS_FAILED(rv) || !success) - return PR_FALSE; - - return PR_TRUE; -@@ -2077,12 +2087,47 @@ public: - }; - #endif - - #ifdef MOZ_WIDGET_GTK2 - #include "prlink.h" - typedef void (*_g_set_application_name_fn)(const gchar *application_name); -+ -+static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow) -+{ -+ // get the native window for this instance -+ nsCOMPtr scriptObject -+ (do_QueryInterface(aWindow)); -+ NS_ENSURE_TRUE(scriptObject, nsnull); -+ -+ nsCOMPtr baseWindow -+ (do_QueryInterface(scriptObject->GetDocShell())); -+ NS_ENSURE_TRUE(baseWindow, nsnull); -+ -+ nsCOMPtr mainWidget; -+ baseWindow->GetMainWidget(getter_AddRefs(mainWidget)); -+ return mainWidget; -+} -+ -+static nsGTKToolkit* GetGTKToolkit() -+{ -+ nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); -+ if (!svc) -+ return nsnull; -+ nsCOMPtr window; -+ svc->GetHiddenDOMWindow(getter_AddRefs(window)); -+ if (!window) -+ return nsnull; -+ nsIWidget* widget = GetMainWidget(window); -+ if (!widget) -+ return nsnull; -+ nsIToolkit* toolkit = widget->GetToolkit(); -+ if (!toolkit) -+ return nsnull; -+ return NS_STATIC_CAST(nsGTKToolkit*, toolkit); -+} -+ - #endif - - int - XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) - { - nsresult rv; -@@ -2245,12 +2290,25 @@ XRE_main(int argc, char* argv[], const n - - chromeReg->CheckForNewChrome(); - } - return 0; - } - -+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE) -+ // Stash DESKTOP_STARTUP_ID becaus gtk_init will clear it. -+#define HAVE_DESKTOP_STARTUP_ID -+ char* desktopStartupID = PR_GetEnv("DESKTOP_STARTUP_ID"); -+ if (desktopStartupID) { -+ if (desktopStartupID[0] == 0) { -+ desktopStartupID = nsnull; -+ } else { -+ desktopStartupID = strdup(desktopStartupID); -+ } -+ } -+#endif -+ - #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) - // setup for private colormap. Ideally we'd like to do this - // in nsAppShell::Create, but we need to get in before gtk - // has been initialized to make sure everything is running - // consistently. - if (CheckArg("install")) -@@ -2270,12 +2328,13 @@ XRE_main(int argc, char* argv[], const n - if (_g_set_application_name) { - _g_set_application_name(gAppData->name); - } - if (glib2) { - PR_UnloadLibrary(glib2); - } -+ gtk_window_set_auto_startup_notification(PR_FALSE); - #endif - - gtk_widget_set_default_visual(gdk_rgb_get_visual()); - gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); - #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */ - -@@ -2334,18 +2393,18 @@ XRE_main(int argc, char* argv[], const n - ArgResult ar = CheckArg("remote", &xremotearg); - if (ar == ARG_BAD) { - PR_fprintf(PR_STDERR, "Error: -remote requires an argument\n"); - return 1; - } - if (ar) { -- return HandleRemoteArgument(xremotearg); -+ return HandleRemoteArgument(xremotearg, desktopStartupID); - } - - if (!PR_GetEnv("MOZ_NO_REMOTE")) { - // Try to remote the entire command line. If this fails, start up normally. -- if (RemoteCommandLine()) -+ if (RemoteCommandLine(desktopStartupID)) - return 0; - } - #endif - - #if defined(MOZ_UPDATER) - // If this is a XULRunner app then the updater needs to know the base -@@ -2583,12 +2642,19 @@ XRE_main(int argc, char* argv[], const n - - NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); - rv = appStartup->CreateHiddenWindow(); - NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); - NS_ENSURE_SUCCESS(rv, 1); - -+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -+ nsRefPtr toolkit = GetGTKToolkit(); -+ if (toolkit && desktopStartupID) { -+ toolkit->SetDesktopStartupID(nsDependentCString(desktopStartupID)); -+ } -+#endif -+ - // Extension Compatibility Checking and Startup - if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { - nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); - NS_ENSURE_TRUE(em, 1); - - if (CheckArg("install-global-extension") || CheckArg("install-global-theme")) { -@@ -2763,12 +2829,31 @@ XRE_main(int argc, char* argv[], const n - static char kEnvVar[MAXPATHLEN]; - sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath); - PR_SetEnv(kEnvVar); - } - #endif - -+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2) -+ nsGTKToolkit* toolkit = GetGTKToolkit(); -+ if (toolkit) { -+ nsCAutoString currentDesktopStartupID; -+ toolkit->GetDesktopStartupID(¤tDesktopStartupID); -+ if (!currentDesktopStartupID.IsEmpty()) { -+ nsCAutoString desktopStartupEnv; -+ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); -+ desktopStartupEnv.Append(currentDesktopStartupID); -+ // Leak it with extreme prejudice! -+ PR_SetEnv(ToNewCString(desktopStartupEnv)); -+ } -+ } -+#endif -+ - rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0); - return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1; - } - -+#ifdef HAVE_DESKTOP_STARTUP_ID -+ free(desktopStartupID); -+#endif -+ - return NS_FAILED(rv) ? 1 : 0; - } Index: widget/src/gtk2/nsWindow.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWindow.cpp,v @@ -1190,3 +913,283 @@ diff -u -p -6 -r1.145.2.12 nsWindow.cpp gtk_widget_show(GTK_WIDGET(mContainer)); } else if (mDrawingarea) { +Index: toolkit/xre/nsAppRunner.cpp +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v +retrieving revision 1.113.2.23 +diff -u -p -6 -r1.113.2.23 nsAppRunner.cpp +--- toolkit/xre/nsAppRunner.cpp 9 Sep 2007 06:08:37 -0000 1.113.2.23 ++++ toolkit/xre/nsAppRunner.cpp 15 Oct 2007 08:01:52 -0000 +@@ -96,12 +96,13 @@ + #include "nsIWindowWatcher.h" + #include "nsIXULAppInfo.h" + #include "nsIXULRuntime.h" + #ifdef XP_WIN + #include "nsIWinAppHelper.h" + #endif ++#include "nsIScriptGlobalObject.h" + + #include "nsCRT.h" + #include "nsCOMPtr.h" + #include "nsDirectoryServiceDefs.h" + #include "nsDirectoryServiceUtils.h" + #include "nsEmbedCID.h" +@@ -112,12 +113,18 @@ + #include "nsXPFEComponentsCID.h" + + #include "nsAppDirectoryServiceDefs.h" + #include "nsXULAppAPI.h" + #include "nsXREDirProvider.h" + #include "nsToolkitCompsCID.h" ++#include "nsPIDOMWindow.h" ++#include "nsIDOMWindowInternal.h" ++#include "nsIBaseWindow.h" ++#include "nsIWidget.h" ++#include "nsIDocShell.h" ++#include "nsAppShellCID.h" + + #include "nsINIParser.h" + + #include "InstallCleanupDefines.h" + + #include +@@ -260,12 +267,16 @@ static int gRestartArgc; + static char **gRestartArgv; + + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) + #include + #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 + ++#if defined(MOZ_WIDGET_GTK2) ++#include "nsGTKToolkit.h" ++#endif ++ + #if defined(MOZ_WIDGET_QT) + #include + #endif + + // Save the path of the given file to the specified environment variable. + static void +@@ -1121,13 +1132,13 @@ DumpVersion() + } + + #ifdef MOZ_ENABLE_XREMOTE + // use int here instead of a PR type since it will be returned + // from main - just to keep types consistent + static int +-HandleRemoteArgument(const char* remote) ++HandleRemoteArgument(const char* remote, const char* aDesktopStartupID) + { + nsresult rv; + ArgResult ar; + + const char *profile = 0; + nsCAutoString program(gAppData->name); +@@ -1162,13 +1173,13 @@ HandleRemoteArgument(const char* remote) + return 1; + } + + nsXPIDLCString response; + PRBool success = PR_FALSE; + rv = client.SendCommand(program.get(), username, profile, remote, +- getter_Copies(response), &success); ++ aDesktopStartupID, getter_Copies(response), &success); + // did the command fail? + if (NS_FAILED(rv)) { + PR_fprintf(PR_STDERR, "Error: Failed to send command: %s\n", + response ? response.get() : "No response included"); + return 1; + } +@@ -1179,13 +1190,13 @@ HandleRemoteArgument(const char* remote) + } + + return 0; + } + + static RemoteResult +-RemoteCommandLine() ++RemoteCommandLine(const char* aDesktopStartupID) + { + nsresult rv; + ArgResult ar; + + nsCAutoString program(gAppData->name); + ToLowerCase(program); +@@ -1211,13 +1222,13 @@ RemoteCommandLine() + if (NS_FAILED(rv)) + return REMOTE_NOT_FOUND; + + nsXPIDLCString response; + PRBool success = PR_FALSE; + rv = client.SendCommandLine(program.get(), username, nsnull, +- gArgc, gArgv, ++ gArgc, gArgv, aDesktopStartupID, + getter_Copies(response), &success); + // did the command fail? + if (NS_FAILED(rv) || !success) + return REMOTE_NOT_FOUND; + + return REMOTE_FOUND; +@@ -2101,13 +2112,48 @@ public: + }; + #endif + + #ifdef MOZ_WIDGET_GTK2 + #include "prlink.h" + typedef void (*_g_set_application_name_fn)(const gchar *application_name); +-#endif ++ ++static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow) ++{ ++ // get the native window for this instance ++ nsCOMPtr scriptObject ++ (do_QueryInterface(aWindow)); ++ NS_ENSURE_TRUE(scriptObject, nsnull); ++ ++ nsCOMPtr baseWindow ++ (do_QueryInterface(scriptObject->GetDocShell())); ++ NS_ENSURE_TRUE(baseWindow, nsnull); ++ ++ nsCOMPtr mainWidget; ++ baseWindow->GetMainWidget(getter_AddRefs(mainWidget)); ++ return mainWidget; ++} ++ ++static nsGTKToolkit* GetGTKToolkit() ++{ ++ nsCOMPtr svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID); ++ if (!svc) ++ return nsnull; ++ nsCOMPtr window; ++ svc->GetHiddenDOMWindow(getter_AddRefs(window)); ++ if (!window) ++ return nsnull; ++ nsIWidget* widget = GetMainWidget(window); ++ if (!widget) ++ return nsnull; ++ nsIToolkit* toolkit = widget->GetToolkit(); ++ if (!toolkit) ++ return nsnull; ++ return NS_STATIC_CAST(nsGTKToolkit*, toolkit); ++} ++ ++#endif // MOZ_WIDGET_GTK2 + + int + XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) + { + nsresult rv; + ArgResult ar; +@@ -2285,12 +2331,25 @@ XRE_main(int argc, char* argv[], const n + + chromeReg->CheckForNewChrome(); + } + return 0; + } + ++#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE) ++ // Stash DESKTOP_STARTUP_ID becaus gtk_init will clear it. ++#define HAVE_DESKTOP_STARTUP_ID ++ char* desktopStartupID = PR_GetEnv("DESKTOP_STARTUP_ID"); ++ if (desktopStartupID) { ++ if (desktopStartupID[0] == 0) { ++ desktopStartupID = nsnull; ++ } else { ++ desktopStartupID = strdup(desktopStartupID); ++ } ++ } ++#endif ++ + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) + // setup for private colormap. Ideally we'd like to do this + // in nsAppShell::Create, but we need to get in before gtk + // has been initialized to make sure everything is running + // consistently. + #if defined(MOZ_WIDGET_GTK2) +@@ -2313,12 +2372,13 @@ XRE_main(int argc, char* argv[], const n + if (_g_set_application_name) { + _g_set_application_name(gAppData->name); + } + if (glib2) { + PR_UnloadLibrary(glib2); + } ++ gtk_window_set_auto_startup_notification(PR_FALSE); + #endif + + gtk_widget_set_default_visual(gdk_rgb_get_visual()); + gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); + #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */ + +@@ -2377,18 +2437,18 @@ XRE_main(int argc, char* argv[], const n + ar = CheckArg("remote", PR_TRUE, &xremotearg); + if (ar == ARG_BAD) { + PR_fprintf(PR_STDERR, "Error: -remote requires an argument\n"); + return 1; + } + if (ar) { +- return HandleRemoteArgument(xremotearg); ++ return HandleRemoteArgument(xremotearg, desktopStartupID); + } + + if (!PR_GetEnv("MOZ_NO_REMOTE")) { + // Try to remote the entire command line. If this fails, start up normally. +- RemoteResult rr = RemoteCommandLine(); ++ RemoteResult rr = RemoteCommandLine(desktopStartupID); + if (rr == REMOTE_FOUND) + return 0; + else if (rr == REMOTE_ARG_BAD) + return 1; + } + #endif +@@ -2597,12 +2657,19 @@ XRE_main(int argc, char* argv[], const n + + NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); + rv = appStartup->CreateHiddenWindow(); + NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); + NS_ENSURE_SUCCESS(rv, 1); + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ nsRefPtr toolkit = GetGTKToolkit(); ++ if (toolkit && desktopStartupID) { ++ toolkit->SetDesktopStartupID(nsDependentCString(desktopStartupID)); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); + NS_ENSURE_TRUE(em, 1); + + ar = CheckArg("install-global-extension", PR_TRUE); +@@ -2791,12 +2858,31 @@ XRE_main(int argc, char* argv[], const n + static char kEnvVar[MAXPATHLEN]; + sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath); + PR_SetEnv(kEnvVar); + } + #endif + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2) ++ nsGTKToolkit* toolkit = GetGTKToolkit(); ++ if (toolkit) { ++ nsCAutoString currentDesktopStartupID; ++ toolkit->GetDesktopStartupID(¤tDesktopStartupID); ++ if (!currentDesktopStartupID.IsEmpty()) { ++ nsCAutoString desktopStartupEnv; ++ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); ++ desktopStartupEnv.Append(currentDesktopStartupID); ++ // Leak it with extreme prejudice! ++ PR_SetEnv(ToNewCString(desktopStartupEnv)); ++ } ++ } ++#endif ++ + rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0); + return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1; + } + ++#ifdef HAVE_DESKTOP_STARTUP_ID ++ free(desktopStartupID); ++#endif ++ + return NS_FAILED(rv) ? 1 : 0; + }