diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e8fa3f2..dfaae6c 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 4 19:53:35 CDT 2007 - maw@suse.de + +- Security update to version 2.0.0.4 +- Refresh configure.patch, startup.patch, and visibility.patch +- Now use l10n-%{version}.tar.bz2 instead of l10n.tar.bz2. + ------------------------------------------------------------------- Mon Apr 30 16:49:55 CEST 2007 - ro@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index e908584..cc82a8e 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.0.0.2) +# spec file for package MozillaFirefox (Version 2.0.0.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,7 +17,7 @@ BuildRequires: dbus-1-devel %else BuildRequires: dbus-1-glib-devel %endif -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL), We have explicit permission to use the trademark. Provides: web_browser Provides: firefox Provides: MozillaFirebird @@ -25,8 +25,8 @@ Obsoletes: MozillaFirebird <= 1.0.7 %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 2.0.0.2 -Release: 16 +Version: 2.0.0.4 +Release: 1 Summary: Mozilla Firefox Web Browser URL: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -37,7 +37,7 @@ Group: Productivity/Networking/Web/Browsers # export MOZ_CO_LOCALES=all # make -f client.mk checkout # cd .. -# tar cjf l10n.tar.bz2 l10n; tar cjf firefox-2.0-source.tar.bz2 mozilla +# tar cjf l10n.tar.bz2 l10n; tar cjf firefox-%{version}-source.tar.bz2 mozilla Source: firefox-%{version}-source.tar.bz2 Source1: MozillaFirefox.desktop Source2: add-plugins.sh.in @@ -45,7 +45,7 @@ Source3: mozilla.sh.in Source4: tango-theme.tar.bz2 Source5: search-addons.tar.bz2 Source6: MozillaFirefox.desktop.nld -Source7: l10n.tar.bz2 +Source7: l10n-%{version}.tar.bz2 Source8: plastikfox-theme.tar.bz2 Source9: bookmarks.html.nld Source10: bookmarks.html.suse @@ -551,6 +551,10 @@ exit 0 %endif %changelog +* Mon Jun 04 2007 - maw@suse.de +- Security update to version 2.0.0.4 +- Refresh configure.patch, startup.patch, and visibility.patch +- Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2. * Mon Apr 30 2007 - ro@suse.de - added unzip to BuildRequires * Wed Apr 18 2007 - mfabian@suse.de diff --git a/configure.patch b/configure.patch index 9fabf63..38c2af9 100644 --- a/configure.patch +++ b/configure.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- configure.orig 2007-05-16 13:50:39.000000000 -0400 ++++ configure 2007-05-16 14:05:29.000000000 -0400 @@ -83,6 +83,8 @@ ac_help="$ac_help --with-qtdir=\$dir Specify Qt directory " @@ -1537,2363 +1537,2441 @@ rm -rf conftest* ac_cv_mkshlib_force_and_unforce=$line; break else -@@ -5465,17 +5368,17 @@ +@@ -5463,7 +5366,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 + 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 @@ + + 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 + : + else + echo "configure: failed program was:" >&5 +@@ -5494,14 +5397,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 + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5517,14 +5420,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 + : + else + echo "configure: failed program was:" >&5 +@@ -5534,14 +5437,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 + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5576,16 +5479,16 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5469: checking for 64-bit OS" >&5 -+echo "configure:5372: checking for 64-bit OS" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <&5 ++echo "configure:5483: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - 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* result="yes" else -@@ -5635,9 +5538,9 @@ +@@ -5743,9 +5646,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:5639: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5542: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +-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 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else -@@ -5684,17 +5587,17 @@ +@@ -5792,17 +5695,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5688: checking for $ac_hdr" >&5 -+echo "configure:5591: checking for $ac_hdr" >&5 +-echo "configure:5796: checking for $ac_hdr" >&5 ++echo "configure:5699: 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:5698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5736,7 +5639,7 @@ +@@ -5844,7 +5747,7 @@ LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5740: checking for main in -lbind" >&5 -+echo "configure:5643: checking for main in -lbind" >&5 +-echo "configure:5848: checking for main in -lbind" >&5 ++echo "configure:5751: 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 -@@ -5744,14 +5647,14 @@ +@@ -5852,14 +5755,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:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5863: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5772,7 +5675,7 @@ +@@ -5880,7 +5783,7 @@ fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:5776: checking for main in -lzeta" >&5 -+echo "configure:5679: checking for main in -lzeta" >&5 +-echo "configure:5884: checking for main in -lzeta" >&5 ++echo "configure:5787: 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 -@@ -5780,14 +5683,14 @@ +@@ -5888,14 +5791,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:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5899: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5851,18 +5754,18 @@ +@@ -5959,18 +5862,18 @@ MACOSX=1 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:5855: checking for -dead_strip option to ld" >&5 -+echo "configure:5758: checking for -dead_strip option to ld" >&5 +-echo "configure:5963: checking for -dead_strip option to ld" >&5 ++echo "configure:5866: 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:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:5974: \"$ac_link\") 1>&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 rm -rf conftest* _HAVE_DEAD_STRIP=1 else -@@ -6730,14 +6633,14 @@ +@@ -6838,14 +6741,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:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 : else echo "configure: failed program was:" >&5 -@@ -6765,7 +6668,7 @@ +@@ -6873,7 +6776,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:6769: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:6672: checking for Forte compiler version >= WS6U2" >&5 +-echo "configure:6877: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6780: 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. -@@ -6775,7 +6678,7 @@ +@@ -6883,7 +6786,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:6896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else -@@ -6913,7 +6816,7 @@ +@@ -7021,7 +6924,7 @@ ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 --echo "configure:6917: checking for -exported_symbols_list option to ld" >&5 -+echo "configure:6820: checking for -exported_symbols_list option to ld" >&5 +-echo "configure:7025: checking for -exported_symbols_list option to ld" >&5 ++echo "configure:6928: 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 -@@ -6953,12 +6856,12 @@ +@@ -7061,12 +6964,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:6957: checking for ANSI C header files" >&5 -+echo "configure:6860: checking for ANSI C header files" >&5 +-echo "configure:7065: checking for ANSI C header files" >&5 ++echo "configure:6968: 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 -@@ -6966,7 +6869,7 @@ +@@ -7074,7 +6977,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -6983,7 +6886,7 @@ +@@ -7091,7 +6994,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 -@@ -7001,7 +6904,7 @@ +@@ -7109,7 +7012,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 -@@ -7022,7 +6925,7 @@ +@@ -7130,7 +7033,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7033,7 +6936,7 @@ +@@ -7141,7 +7044,7 @@ exit (0); } EOF --if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -7057,12 +6960,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:7061: checking for working const" >&5 -+echo "configure:6964: 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:7018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -7132,12 +7035,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7136: checking for mode_t" >&5 -+echo "configure:7039: 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 @@ -7165,12 +7068,12 @@ fi - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7169: checking for off_t" >&5 -+echo "configure:7072: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + 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 + 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 + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7240,12 +7143,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 + 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 -@@ -7198,12 +7101,12 @@ +@@ -7273,12 +7176,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 + 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 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7202: checking for pid_t" >&5 -+echo "configure:7105: checking for pid_t" >&5 +-echo "configure:7310: checking for pid_t" >&5 ++echo "configure:7213: 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 -@@ -7231,12 +7134,12 @@ +@@ -7339,12 +7242,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7235: checking for size_t" >&5 -+echo "configure:7138: checking for size_t" >&5 +-echo "configure:7343: checking for size_t" >&5 ++echo "configure:7246: 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 -@@ -7264,12 +7167,12 @@ +@@ -7372,12 +7275,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7268: checking for st_blksize in struct stat" >&5 -+echo "configure:7171: checking for st_blksize in struct stat" >&5 +-echo "configure:7376: checking for st_blksize in struct stat" >&5 ++echo "configure:7279: 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 -@@ -7277,7 +7180,7 @@ +@@ -7385,7 +7288,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF --if { (eval echo configure:7281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -7298,12 +7201,12 @@ +@@ -7406,12 +7309,12 @@ fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7302: checking for siginfo_t" >&5 -+echo "configure:7205: checking for siginfo_t" >&5 +-echo "configure:7410: checking for siginfo_t" >&5 ++echo "configure:7313: 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 < -@@ -7311,7 +7214,7 @@ +@@ -7419,7 +7322,7 @@ siginfo_t* info; ; return 0; } EOF --if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_siginfo_t=true else -@@ -7345,12 +7248,12 @@ +@@ -7453,12 +7356,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7349: checking for int16_t" >&5 -+echo "configure:7252: checking for int16_t" >&5 +-echo "configure:7457: checking for int16_t" >&5 ++echo "configure:7360: 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 -@@ -7358,7 +7261,7 @@ +@@ -7466,7 +7369,7 @@ int16_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_int16_t=true else -@@ -7380,12 +7283,12 @@ +@@ -7488,12 +7391,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7384: checking for int32_t" >&5 -+echo "configure:7287: checking for int32_t" >&5 +-echo "configure:7492: checking for int32_t" >&5 ++echo "configure:7395: 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 -@@ -7393,7 +7296,7 @@ +@@ -7501,7 +7404,7 @@ int32_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_int32_t=true else -@@ -7415,12 +7318,12 @@ +@@ -7523,12 +7426,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7419: checking for int64_t" >&5 -+echo "configure:7322: checking for int64_t" >&5 +-echo "configure:7527: checking for int64_t" >&5 ++echo "configure:7430: 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 -@@ -7428,7 +7331,7 @@ +@@ -7536,7 +7439,7 @@ int64_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_int64_t=true else -@@ -7450,12 +7353,12 @@ +@@ -7558,12 +7461,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7454: checking for int64" >&5 -+echo "configure:7357: checking for int64" >&5 +-echo "configure:7562: checking for int64" >&5 ++echo "configure:7465: 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 -@@ -7463,7 +7366,7 @@ +@@ -7571,7 +7474,7 @@ int64 foo = 0; ; return 0; } EOF --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 +-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 rm -rf conftest* ac_cv_int64=true else -@@ -7485,12 +7388,12 @@ +@@ -7593,12 +7496,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7489: checking for uint" >&5 -+echo "configure:7392: checking for uint" >&5 +-echo "configure:7597: checking for uint" >&5 ++echo "configure:7500: 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 -@@ -7498,7 +7401,7 @@ +@@ -7606,7 +7509,7 @@ uint foo = 0; ; return 0; } EOF --if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_uint=true else -@@ -7520,12 +7423,12 @@ +@@ -7628,12 +7531,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7524: checking for uint_t" >&5 -+echo "configure:7427: checking for uint_t" >&5 +-echo "configure:7632: checking for uint_t" >&5 ++echo "configure:7535: 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 -@@ -7533,7 +7436,7 @@ +@@ -7641,7 +7544,7 @@ uint_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_uint_t=true else -@@ -7555,12 +7458,12 @@ +@@ -7663,12 +7566,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7559: checking for uint16_t" >&5 -+echo "configure:7462: checking for uint16_t" >&5 +-echo "configure:7667: checking for uint16_t" >&5 ++echo "configure:7570: 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 -@@ -7568,7 +7471,7 @@ +@@ -7676,7 +7579,7 @@ uint16_t foo = 0; ; return 0; } EOF --if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 -@@ -7599,12 +7502,12 @@ +@@ -7707,12 +7610,12 @@ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7603: checking for uname.domainname" >&5 -+echo "configure:7506: checking for uname.domainname" >&5 +-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() { -@@ -7612,7 +7515,7 @@ +@@ -7720,7 +7623,7 @@ (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF --if { (eval echo configure:7616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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_have_uname_domainname_field=true else -@@ -7636,12 +7539,12 @@ +@@ -7744,12 +7647,12 @@ fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:7640: checking for uname.__domainname" >&5 -+echo "configure:7543: checking for uname.__domainname" >&5 +-echo "configure:7748: checking for uname.__domainname" >&5 ++echo "configure:7651: 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() { -@@ -7649,7 +7552,7 @@ +@@ -7757,7 +7660,7 @@ (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF --if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else -@@ -7682,7 +7585,7 @@ +@@ -7790,12 +7693,12 @@ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:7686: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7589: checking for usable wchar_t (2 bytes, unsigned)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then +-echo "configure:7794: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7697: 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 -@@ -7690,14 +7593,14 @@ - ac_cv_have_usable_wchar="maybe" else cat > conftest.$ac_ext < - int main () { - return (sizeof(wchar_t) != 2) || - (wchar_t)-1 < (wchar_t) 0 ; } + $configure_static_assert_macros +@@ -7804,7 +7707,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } EOF --if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_have_usable_wchar="yes" +-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 + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" else -@@ -7732,7 +7635,7 @@ +@@ -7837,12 +7740,12 @@ CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:7736: checking for compiler -fshort-wchar option" >&5 -+echo "configure:7639: checking for compiler -fshort-wchar option" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then +-echo "configure:7841: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7744: 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 -@@ -7740,14 +7643,17 @@ - ac_cv_have_usable_wchar_option="maybe" else cat > conftest.$ac_ext < - int main () { - return (sizeof(wchar_t) != 2) || - (wchar_t)-1 < (wchar_t) 0 ; } + $configure_static_assert_macros +@@ -7851,7 +7754,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } EOF --if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_have_usable_wchar_option="yes" +-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 + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" else -@@ -7783,7 +7689,7 @@ +@@ -7885,7 +7788,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:7787: checking for visibility(hidden) attribute" >&5 -+echo "configure:7693: checking for visibility(hidden) attribute" >&5 +-echo "configure:7889: checking for visibility(hidden) attribute" >&5 ++echo "configure:7792: 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 -@@ -7808,7 +7714,7 @@ +@@ -7910,7 +7813,7 @@ echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:7812: checking for visibility(default) attribute" >&5 -+echo "configure:7718: checking for visibility(default) attribute" >&5 +-echo "configure:7914: checking for visibility(default) attribute" >&5 ++echo "configure:7817: 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 -@@ -7833,7 +7739,7 @@ +@@ -7935,7 +7838,7 @@ echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:7837: checking for visibility pragma support" >&5 -+echo "configure:7743: checking for visibility pragma support" >&5 +-echo "configure:7939: checking for visibility pragma support" >&5 ++echo "configure:7842: 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 -@@ -7858,7 +7764,7 @@ +@@ -7960,7 +7863,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 + 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 @@ + 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:7862: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:7768: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 +-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 if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -7901,12 +7807,12 @@ +@@ -8036,12 +7939,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:7905: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:7811: checking for $ac_hdr that defines DIR" >&5 +-echo "configure:8040: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7943: 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> -@@ -7914,7 +7820,7 @@ +@@ -8049,7 +7952,7 @@ DIR *dirp = 0; ; return 0; } EOF --if { (eval echo configure:7918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -7939,7 +7845,7 @@ +@@ -8074,7 +7977,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:7943: checking for opendir in -ldir" >&5 -+echo "configure:7849: checking for opendir in -ldir" >&5 +-echo "configure:8078: checking for opendir in -ldir" >&5 ++echo "configure:7981: 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 -@@ -7947,7 +7853,7 @@ +@@ -8082,7 +7985,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:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8097: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -7980,7 +7886,7 @@ +@@ -8115,7 +8018,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:7984: checking for opendir in -lx" >&5 -+echo "configure:7890: checking for opendir in -lx" >&5 +-echo "configure:8119: checking for opendir in -lx" >&5 ++echo "configure:8022: 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 -@@ -7988,7 +7894,7 @@ +@@ -8123,7 +8026,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:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8138: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8031,17 +7937,17 @@ +@@ -8166,17 +8069,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8035: checking for $ac_hdr" >&5 -+echo "configure:7941: checking for $ac_hdr" >&5 +-echo "configure:8170: checking for $ac_hdr" >&5 ++echo "configure:8073: 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:8045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8071,17 +7977,17 @@ +@@ -8206,17 +8109,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8075: checking for $ac_hdr" >&5 -+echo "configure:7981: checking for $ac_hdr" >&5 +-echo "configure:8210: checking for $ac_hdr" >&5 ++echo "configure:8113: 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:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8111,17 +8017,17 @@ +@@ -8246,17 +8149,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8115: checking for $ac_hdr" >&5 -+echo "configure:8021: checking for $ac_hdr" >&5 +-echo "configure:8250: checking for $ac_hdr" >&5 ++echo "configure:8153: 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:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8151,17 +8057,17 @@ +@@ -8286,17 +8189,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8155: checking for $ac_hdr" >&5 -+echo "configure:8061: checking for $ac_hdr" >&5 +-echo "configure:8290: checking for $ac_hdr" >&5 ++echo "configure:8193: 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:8165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8191,17 +8097,17 @@ +@@ -8326,17 +8229,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8195: checking for $ac_hdr" >&5 -+echo "configure:8101: checking for $ac_hdr" >&5 +-echo "configure:8330: checking for $ac_hdr" >&5 ++echo "configure:8233: 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:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8232,17 +8138,17 @@ +@@ -8367,17 +8270,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8236: checking for $ac_hdr" >&5 -+echo "configure:8142: checking for $ac_hdr" >&5 +-echo "configure:8371: checking for $ac_hdr" >&5 ++echo "configure:8274: 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:8246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8273,17 +8179,17 @@ +@@ -8408,17 +8311,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8277: checking for $ac_hdr" >&5 -+echo "configure:8183: checking for $ac_hdr" >&5 +-echo "configure:8412: checking for $ac_hdr" >&5 ++echo "configure:8315: 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:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8320,17 +8226,17 @@ +@@ -8455,17 +8358,17 @@ NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8324: checking for new" >&5 -+echo "configure:8230: checking for new" >&5 +-echo "configure:8459: checking for new" >&5 ++echo "configure:8362: 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:8334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8371,17 +8277,17 @@ +@@ -8506,17 +8409,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8375: checking for $ac_hdr" >&5 -+echo "configure:8281: checking for $ac_hdr" >&5 +-echo "configure:8510: checking for $ac_hdr" >&5 ++echo "configure:8413: 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:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8415,7 +8321,7 @@ +@@ -8550,7 +8453,7 @@ ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8419: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8325: checking for gethostbyname_r in -lc_r" >&5 +-echo "configure:8554: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8457: 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 -@@ -8423,7 +8329,7 @@ +@@ -8558,7 +8461,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:8344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8573: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8464,7 +8370,7 @@ +@@ -8599,7 +8502,7 @@ ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8468: checking for atan in -lm" >&5 -+echo "configure:8374: checking for atan in -lm" >&5 +-echo "configure:8603: checking for atan in -lm" >&5 ++echo "configure:8506: 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 -@@ -8472,7 +8378,7 @@ +@@ -8607,7 +8510,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:8393: \"$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 ++if { (eval echo configure:8525: \"$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 -@@ -8517,7 +8423,7 @@ +@@ -8652,7 +8555,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8521: checking for dlopen in -ldl" >&5 -+echo "configure:8427: checking for dlopen in -ldl" >&5 +-echo "configure:8656: checking for dlopen in -ldl" >&5 ++echo "configure:8559: 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 -@@ -8525,7 +8431,7 @@ +@@ -8660,7 +8563,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:8446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8675: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8553,17 +8459,17 @@ +@@ -8688,17 +8591,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:8557: checking for dlfcn.h" >&5 -+echo "configure:8463: checking for dlfcn.h" >&5 +-echo "configure:8692: checking for dlfcn.h" >&5 ++echo "configure:8595: 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:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -8599,7 +8505,7 @@ +@@ -8734,7 +8637,7 @@ case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:8603: checking for demangle in -lC_r" >&5 -+echo "configure:8509: checking for demangle in -lC_r" >&5 +-echo "configure:8738: checking for demangle in -lC_r" >&5 ++echo "configure:8641: 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 -@@ -8607,7 +8513,7 @@ +@@ -8742,7 +8645,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:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8757: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8648,7 +8554,7 @@ +@@ -8783,7 +8686,7 @@ ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:8652: checking for demangle in -lC" >&5 -+echo "configure:8558: checking for demangle in -lC" >&5 +-echo "configure:8787: checking for demangle in -lC" >&5 ++echo "configure:8690: 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 -@@ -8656,7 +8562,7 @@ +@@ -8791,7 +8694,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:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8806: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8698,7 +8604,7 @@ +@@ -8833,7 +8736,7 @@ esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:8702: checking for socket in -lsocket" >&5 -+echo "configure:8608: checking for socket in -lsocket" >&5 +-echo "configure:8837: checking for socket in -lsocket" >&5 ++echo "configure:8740: 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 -@@ -8706,7 +8612,7 @@ +@@ -8841,7 +8744,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:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8759: \"$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 -@@ -8762,7 +8668,7 @@ +@@ -8897,7 +8800,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:8766: checking for XDrawLines in -lX11" >&5 -+echo "configure:8672: checking for XDrawLines in -lX11" >&5 +-echo "configure:8901: checking for XDrawLines in -lX11" >&5 ++echo "configure:8804: 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 -@@ -8770,7 +8676,7 @@ +@@ -8905,7 +8808,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:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8920: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8803,7 +8709,7 @@ +@@ -8938,7 +8841,7 @@ fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:8807: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8713: checking for XextAddDisplay in -lXext" >&5 +-echo "configure:8942: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8845: 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 -@@ -8811,7 +8717,7 @@ +@@ -8946,7 +8849,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:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:8961: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8846,7 +8752,7 @@ +@@ -8981,7 +8884,7 @@ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:8850: checking for XtFree in -lXt" >&5 -+echo "configure:8756: checking for XtFree in -lXt" >&5 +-echo "configure:8985: checking for XtFree in -lXt" >&5 ++echo "configure:8888: 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 -@@ -8854,7 +8760,7 @@ +@@ -8989,7 +8892,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:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9004: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8886,7 +8792,7 @@ +@@ -9021,7 +8924,7 @@ unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:8890: checking for IceFlush in -lICE" >&5 -+echo "configure:8796: checking for IceFlush in -lICE" >&5 +-echo "configure:9025: checking for IceFlush in -lICE" >&5 ++echo "configure:8928: 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 -@@ -8894,7 +8800,7 @@ +@@ -9029,7 +8932,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:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9044: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8926,7 +8832,7 @@ +@@ -9061,7 +8964,7 @@ fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:8930: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:8836: checking for SmcCloseConnection in -lSM" >&5 +-echo "configure:9065: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:8968: 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 -@@ -8934,7 +8840,7 @@ +@@ -9069,7 +8972,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:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9084: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -8966,7 +8872,7 @@ +@@ -9101,7 +9004,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:8970: checking for XtFree in -lXt" >&5 -+echo "configure:8876: checking for XtFree in -lXt" >&5 +-echo "configure:9105: checking for XtFree in -lXt" >&5 ++echo "configure:9008: 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 -@@ -8974,7 +8880,7 @@ +@@ -9109,7 +9012,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:8895: \"$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 ++if { (eval echo configure:9027: \"$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 -@@ -9019,7 +8925,7 @@ +@@ -9154,7 +9057,7 @@ esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 --echo "configure:9023: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:8929: checking for XineramaIsActive in -lXinerama" >&5 +-echo "configure:9158: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9061: 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 -@@ -9027,7 +8933,7 @@ +@@ -9162,7 +9065,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:8948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9080: \"$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 -@@ -9060,17 +8966,17 @@ +@@ -9195,17 +9098,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:9064: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:8970: checking for X11/extensions/Xinerama.h" >&5 +-echo "configure:9199: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9102: 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:9074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9112: \"$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* -@@ -9093,7 +8999,7 @@ +@@ -9228,7 +9131,7 @@ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:9097: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9003: checking for XShmCreateImage in -lXext" >&5 +-echo "configure:9232: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9135: 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 -@@ -9101,7 +9007,7 @@ +@@ -9236,7 +9139,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:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9251: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -9134,17 +9040,17 @@ +@@ -9269,17 +9172,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:9138: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9044: checking for X11/extensions/XShm.h" >&5 +-echo "configure:9273: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9176: 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:9148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -9174,7 +9080,7 @@ +@@ -9309,7 +9212,7 @@ fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9178: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9084: checking for XieFloGeometry in -lXIE" >&5 +-echo "configure:9313: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9216: 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 -@@ -9182,7 +9088,7 @@ +@@ -9317,7 +9220,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:9103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9235: \"$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 -@@ -9215,17 +9121,17 @@ +@@ -9350,17 +9253,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:9219: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9125: checking for X11/extensions/XIElib.h" >&5 +-echo "configure:9354: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9257: 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:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9267: \"$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* -@@ -9299,7 +9205,7 @@ +@@ -9434,7 +9337,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:9303: checking for $ac_word" >&5 -+echo "configure:9209: checking for $ac_word" >&5 +-echo "configure:9438: checking for $ac_word" >&5 ++echo "configure:9341: 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 -@@ -9335,7 +9241,7 @@ +@@ -9470,7 +9373,7 @@ min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9339: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9245: checking for FreeType - version >= $min_ft_version" >&5 +-echo "configure:9474: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9377: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes -@@ -9383,7 +9289,7 @@ +@@ -9518,7 +9421,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -9409,7 +9315,7 @@ +@@ -9544,7 +9447,7 @@ } EOF --if { (eval echo configure:9413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -9461,7 +9367,7 @@ +@@ -9596,7 +9499,7 @@ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:9465: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9371: checking for pthread_create in -lpthreads" >&5 +-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; } -@@ -9483,7 +9389,7 @@ +@@ -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:9487: checking for pthread_create in -lpthread" >&5 -+echo "configure:9393: checking for pthread_create in -lpthread" >&5 +-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; } -@@ -9505,7 +9411,7 @@ +@@ -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:9509: checking for pthread_create in -lc_r" >&5 -+echo "configure:9415: checking for pthread_create in -lc_r" >&5 +-echo "configure:9644: checking for pthread_create in -lc_r" >&5 ++echo "configure:9547: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9527,7 +9433,7 @@ +@@ -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:9531: checking for pthread_create in -lc" >&5 -+echo "configure:9437: checking for pthread_create in -lc" >&5 +-echo "configure:9666: checking for pthread_create in -lc" >&5 ++echo "configure:9569: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } -@@ -9583,7 +9489,7 @@ +@@ -9718,7 +9621,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:9587: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9493: checking whether ${CC-cc} accepts -pthread" >&5 +-echo "configure:9722: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9625: 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 -@@ -9606,7 +9512,7 @@ +@@ -9741,7 +9644,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:9610: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9516: checking whether ${CC-cc} accepts -pthreads" >&5 +-echo "configure:9745: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9648: 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 -@@ -9728,7 +9634,7 @@ +@@ -9863,7 +9766,7 @@ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:9732: checking whether mmap() sees write()s" >&5 -+echo "configure:9638: checking whether mmap() sees write()s" >&5 +-echo "configure:9867: checking whether mmap() sees write()s" >&5 ++echo "configure:9770: checking whether mmap() sees write()s" >&5 mmap_test_prog=' -@@ -9767,11 +9673,11 @@ +@@ -9902,11 +9805,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:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:9910: \"$ac_link\") 1>&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 then result="yes" else -@@ -9796,13 +9702,13 @@ +@@ -9931,13 +9834,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:9800: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9706: checking whether ${CC-cc} needs -traditional" >&5 +-echo "configure:9935: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9838: 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 -@@ -9820,7 +9726,7 @@ +@@ -9955,7 +9858,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA -@@ -9842,7 +9748,7 @@ +@@ -9977,7 +9880,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:9846: checking for 8-bit clean memcmp" >&5 -+echo "configure:9752: checking for 8-bit clean memcmp" >&5 +-echo "configure:9981: checking for 8-bit clean memcmp" >&5 ++echo "configure:9884: 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 -@@ -9850,7 +9756,7 @@ +@@ -9985,7 +9888,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:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:9999: \"$ac_link\") 1>&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 then ac_cv_func_memcmp_clean=yes else -@@ -9880,12 +9786,12 @@ +@@ -10015,12 +9918,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:9884: checking for $ac_func" >&5 -+echo "configure:9790: checking for $ac_func" >&5 +-echo "configure:10019: checking for $ac_func" >&5 ++echo "configure:9922: 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:9818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10047: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -9935,12 +9841,12 @@ +@@ -10070,12 +9973,12 @@ for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9939: checking for $ac_func" >&5 -+echo "configure:9845: checking for $ac_func" >&5 +-echo "configure:10074: checking for $ac_func" >&5 ++echo "configure:9977: 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:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10102: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -9992,12 +9898,12 @@ +@@ -10127,12 +10030,12 @@ for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9996: checking for $ac_func" >&5 -+echo "configure:9902: checking for $ac_func" >&5 +-echo "configure:10131: checking for $ac_func" >&5 ++echo "configure:10034: 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:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10159: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -10056,19 +9962,19 @@ +@@ -10191,19 +10094,19 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:10060: checking for wcrtomb" >&5 -+echo "configure:9966: checking for wcrtomb" >&5 +-echo "configure:10195: checking for wcrtomb" >&5 ++echo "configure:10098: 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:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 rm -rf conftest* ac_cv_have_wcrtomb="yes" else -@@ -10088,19 +9994,19 @@ +@@ -10223,19 +10126,19 @@ fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:10092: checking for mbrtowc" >&5 -+echo "configure:9998: checking for mbrtowc" >&5 +-echo "configure:10227: checking for mbrtowc" >&5 ++echo "configure:10130: 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:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 rm -rf conftest* ac_cv_have_mbrtowc="yes" else -@@ -10129,12 +10035,12 @@ +@@ -10264,12 +10167,12 @@ fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:10133: checking for res_ninit()" >&5 -+echo "configure:10039: checking for res_ninit()" >&5 +-echo "configure:10268: checking for res_ninit()" >&5 ++echo "configure:10171: 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:10056: \"$ac_link\") 1>&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:10188: \"$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 -@@ -10176,12 +10082,12 @@ +@@ -10311,12 +10214,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10180: checking for gnu_get_libc_version()" >&5 -+echo "configure:10086: checking for gnu_get_libc_version()" >&5 +-echo "configure:10315: checking for gnu_get_libc_version()" >&5 ++echo "configure:10218: 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:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10331: \"$ac_link\") 1>&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 rm -rf conftest* ac_cv_func_gnu_get_libc_version=yes else -@@ -10221,7 +10127,7 @@ +@@ -10356,7 +10259,7 @@ *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10225: checking for iconv in -lc" >&5 -+echo "configure:10131: checking for iconv in -lc" >&5 +-echo "configure:10360: checking for iconv in -lc" >&5 ++echo "configure:10263: 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 -@@ -10229,7 +10135,7 @@ +@@ -10364,7 +10267,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:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10382: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -10262,7 +10168,7 @@ +@@ -10397,7 +10300,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10266: checking for iconv in -liconv" >&5 -+echo "configure:10172: checking for iconv in -liconv" >&5 +-echo "configure:10401: checking for iconv in -liconv" >&5 ++echo "configure:10304: 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 -@@ -10270,7 +10176,7 @@ +@@ -10405,7 +10308,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:10194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10423: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -10303,7 +10209,7 @@ +@@ -10438,7 +10341,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10307: checking for libiconv in -liconv" >&5 -+echo "configure:10213: checking for libiconv in -liconv" >&5 +-echo "configure:10442: checking for libiconv in -liconv" >&5 ++echo "configure:10345: 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 -@@ -10311,7 +10217,7 @@ +@@ -10446,7 +10349,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:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10464: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -10352,12 +10258,12 @@ +@@ -10487,12 +10390,12 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10356: checking for iconv()" >&5 -+echo "configure:10262: checking for iconv()" >&5 +-echo "configure:10491: checking for iconv()" >&5 ++echo "configure:10394: 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 < -@@ -10371,7 +10277,7 @@ +@@ -10506,7 +10409,7 @@ ; return 0; } EOF --if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else -@@ -10395,12 +10301,12 @@ +@@ -10530,12 +10433,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:10399: checking for iconv() with const input" >&5 -+echo "configure:10305: checking for iconv() with const input" >&5 +-echo "configure:10534: checking for iconv() with const input" >&5 ++echo "configure:10437: 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 < -@@ -10415,7 +10321,7 @@ +@@ -10550,7 +10453,7 @@ ; return 0; } EOF --if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_func_const_iconv=yes else -@@ -10444,19 +10350,19 @@ +@@ -10579,19 +10482,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10448: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10354: checking for nl_langinfo and CODESET" >&5 +-echo "configure:10583: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10486: 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:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 rm -rf conftest* am_cv_langinfo_codeset=yes else -@@ -10488,7 +10394,7 @@ +@@ -10623,7 +10526,7 @@ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:10492: checking for an implementation of va_copy()" >&5 -+echo "configure:10398: checking for an implementation of va_copy()" >&5 +-echo "configure:10627: checking for an implementation of va_copy()" >&5 ++echo "configure:10530: 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 -@@ -10498,7 +10404,7 @@ +@@ -10633,7 +10536,7 @@ else cat > conftest.$ac_ext < -@@ -10512,7 +10418,7 @@ +@@ -10647,7 +10550,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then ac_cv_va_copy=yes else -@@ -10529,7 +10435,7 @@ +@@ -10664,7 +10567,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:10533: checking for an implementation of __va_copy()" >&5 -+echo "configure:10439: checking for an implementation of __va_copy()" >&5 +-echo "configure:10668: checking for an implementation of __va_copy()" >&5 ++echo "configure:10571: 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 -@@ -10539,7 +10445,7 @@ +@@ -10674,7 +10577,7 @@ else cat > conftest.$ac_ext < -@@ -10553,7 +10459,7 @@ +@@ -10688,7 +10591,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then ac_cv___va_copy=yes else -@@ -10570,7 +10476,7 @@ +@@ -10705,7 +10608,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:10574: checking whether va_lists can be copied by value" >&5 -+echo "configure:10480: checking whether va_lists can be copied by value" >&5 +-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 if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -10580,7 +10486,7 @@ +@@ -10715,7 +10618,7 @@ else cat > conftest.$ac_ext < -@@ -10594,7 +10500,7 @@ +@@ -10729,7 +10632,7 @@ } int main() { f (0, 42); return 0; } EOF --if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then ac_cv_va_val_copy=yes else -@@ -10693,7 +10599,7 @@ +@@ -10828,7 +10731,7 @@ if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:10697: checking for C++ exceptions flag" >&5 -+echo "configure:10603: checking for C++ exceptions flag" >&5 +-echo "configure:10832: checking for C++ exceptions flag" >&5 ++echo "configure:10735: 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 -@@ -10728,12 +10634,12 @@ +@@ -10863,12 +10766,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:10732: checking for gcc 3.0 ABI" >&5 -+echo "configure:10638: checking for gcc 3.0 ABI" >&5 +-echo "configure:10867: checking for gcc 3.0 ABI" >&5 ++echo "configure:10770: 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:10656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else -@@ -10770,12 +10676,12 @@ +@@ -10905,12 +10808,12 @@ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:10774: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10680: checking for C++ \"explicit\" keyword" >&5 +-echo "configure:10909: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10812: 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:10695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else -@@ -10806,12 +10712,12 @@ +@@ -10941,12 +10844,12 @@ fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:10810: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10716: checking for C++ \"typename\" keyword" >&5 +-echo "configure:10945: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10848: 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:10740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else -@@ -10851,12 +10757,12 @@ +@@ -10986,12 +10889,12 @@ fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:10855: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10761: checking for modern C++ template specialization syntax support" >&5 +-echo "configure:10990: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10893: 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 {}; -@@ -10866,7 +10772,7 @@ +@@ -11001,7 +10904,7 @@ X y_x; ; return 0; } EOF --if { (eval echo configure:10870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else -@@ -10888,12 +10794,12 @@ +@@ -11023,12 +10926,12 @@ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:10892: checking whether partial template specialization works" >&5 -+echo "configure:10798: checking whether partial template specialization works" >&5 +-echo "configure:11027: checking whether partial template specialization works" >&5 ++echo "configure:10930: 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 {}; -@@ -10901,7 +10807,7 @@ +@@ -11036,7 +10939,7 @@ return 0; ; return 0; } EOF --if { (eval echo configure:10905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure: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 rm -rf conftest* ac_cv_cpp_partial_specialization=yes else -@@ -10922,12 +10828,12 @@ +@@ -11057,12 +10960,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:10926: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:10832: checking whether operators must be re-defined for templates derived from templates" >&5 +-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 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 -@@ -10939,7 +10845,7 @@ +@@ -11074,7 +10977,7 @@ return 0; ; return 0; } EOF --if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_need_derived_template_operators=no else -@@ -10961,12 +10867,12 @@ +@@ -11096,12 +10999,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:10965: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:10871: checking whether we need to cast a derived template to pass as its base class" >&5 +-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 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 { }; -@@ -10975,7 +10881,7 @@ +@@ -11110,7 +11013,7 @@ Derived bar; return foo(bar); ; return 0; } EOF --if { (eval echo configure:10979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else -@@ -10996,12 +10902,12 @@ +@@ -11131,12 +11034,12 @@ fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:11000: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:10906: checking whether the compiler can resolve const ambiguities for templates" >&5 +-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 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 { -@@ -11022,7 +10928,7 @@ +@@ -11157,7 +11060,7 @@ a(&i); ; return 0; } EOF --if { (eval echo configure:11026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else -@@ -11044,12 +10950,12 @@ +@@ -11179,12 +11082,12 @@ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:11048: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:10954: checking whether the C++ \"using\" keyword can change access" >&5 +-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 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:10967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else -@@ -11096,12 +11002,12 @@ +@@ -11231,12 +11134,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11100: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11006: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +-echo "configure:11235: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11138: 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:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:11256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else -@@ -11138,19 +11044,19 @@ +@@ -11273,19 +11176,19 @@ fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:11142: checking for \"std::\" namespace" >&5 -+echo "configure:11048: checking for \"std::\" namespace" >&5 +-echo "configure:11277: checking for \"std::\" namespace" >&5 ++echo "configure:11180: 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:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_cpp_namespace_std=yes else -@@ -11171,12 +11077,12 @@ +@@ -11306,12 +11209,12 @@ fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11175: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11081: checking whether standard template operator!=() is ambiguous" >&5 +-echo "configure:11310: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11213: 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 {}; -@@ -11186,7 +11092,7 @@ +@@ -11321,7 +11224,7 @@ T1 a,b; return a != b; ; return 0; } EOF --if { (eval echo configure:11190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else -@@ -11208,12 +11114,12 @@ +@@ -11343,12 +11246,12 @@ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11212: checking for C++ reinterpret_cast" >&5 -+echo "configure:11118: checking for C++ reinterpret_cast" >&5 +-echo "configure:11347: checking for C++ reinterpret_cast" >&5 ++echo "configure:11250: 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:11225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else -@@ -11242,7 +11148,7 @@ +@@ -11377,7 +11280,7 @@ fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11246: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11152: checking for C++ dynamic_cast to void*" >&5 +-echo "configure:11381: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11284: 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 -@@ -11250,8 +11156,11 @@ +@@ -11385,8 +11288,11 @@ ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF --if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then ac_cv_cpp_dynamic_cast_void_ptr=yes else -@@ -11290,19 +11199,19 @@ +@@ -11425,19 +11331,19 @@ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11294: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11203: checking whether C++ requires implementation of unused virtual methods" >&5 +-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 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:11215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:11441: \"$ac_link\") 1>&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 rm -rf conftest* ac_cv_cpp_unused_required=no else -@@ -11325,12 +11234,12 @@ +@@ -11460,12 +11366,12 @@ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11329: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11238: checking for trouble comparing to zero near std::operator!=()" >&5 +-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 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 {}; -@@ -11341,7 +11250,7 @@ +@@ -11476,7 +11382,7 @@ Foo f; return (0 != f); ; return 0; } EOF --if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else -@@ -11373,19 +11282,19 @@ +@@ -11508,19 +11414,19 @@ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11377: checking for LC_MESSAGES" >&5 -+echo "configure:11286: checking for LC_MESSAGES" >&5 +-echo "configure:11512: checking for LC_MESSAGES" >&5 ++echo "configure:11418: 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:11389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure: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_i18n_lc_messages=yes else -@@ -11466,7 +11375,7 @@ +@@ -11601,7 +11507,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:11470: checking for $ac_word" >&5 -+echo "configure:11379: checking for $ac_word" >&5 +-echo "configure:11605: checking for $ac_word" >&5 ++echo "configure:11511: 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 -@@ -11501,7 +11410,7 @@ +@@ -11636,7 +11542,7 @@ min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 --echo "configure:11505: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11414: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 +-echo "configure:11640: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11546: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then -@@ -11603,7 +11512,7 @@ +@@ -11738,7 +11644,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:11607: checking for $ac_word" >&5 -+echo "configure:11516: checking for $ac_word" >&5 +-echo "configure:11742: checking for $ac_word" >&5 ++echo "configure:11648: 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 -@@ -11638,7 +11547,7 @@ +@@ -11773,7 +11679,7 @@ min_nss_version=3.0.0 echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 --echo "configure:11642: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+echo "configure:11551: checking for NSS - version >= $min_nss_version (skipping)" >&5 +-echo "configure:11777: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11683: checking for NSS - version >= $min_nss_version (skipping)" >&5 no_nss="" if test "$NSS_CONFIG" = "no"; then -@@ -11711,7 +11620,7 @@ +@@ -11846,7 +11752,7 @@ SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:11715: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11624: checking for jpeg_destroy_compress in -ljpeg" >&5 +-echo "configure:11850: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11756: 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 -@@ -11719,7 +11628,7 @@ +@@ -11854,7 +11760,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:11643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:11869: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -11759,7 +11668,7 @@ +@@ -11894,7 +11800,7 @@ SYSTEM_JPEG= else cat > conftest.$ac_ext < #include -@@ -11773,7 +11682,7 @@ +@@ -11908,7 +11814,7 @@ } EOF --if { (eval echo configure:11777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then SYSTEM_JPEG=1 else -@@ -11814,7 +11723,7 @@ +@@ -11949,7 +11855,7 @@ SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:11818: checking for gzread in -lz" >&5 -+echo "configure:11727: checking for gzread in -lz" >&5 +-echo "configure:11953: checking for gzread in -lz" >&5 ++echo "configure:11859: 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 -@@ -11822,7 +11731,7 @@ +@@ -11957,7 +11863,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:11746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:11972: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -11861,7 +11770,7 @@ +@@ -11996,7 +11902,7 @@ SYSTEM_ZLIB= else cat > conftest.$ac_ext < -@@ -11882,7 +11791,7 @@ +@@ -12017,7 +11923,7 @@ } EOF --if { (eval echo configure:11886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then SYSTEM_ZLIB=1 else -@@ -11925,7 +11834,7 @@ +@@ -12060,7 +11966,7 @@ SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:11929: checking for png_get_valid in -lpng" >&5 -+echo "configure:11838: checking for png_get_valid in -lpng" >&5 +-echo "configure:12064: checking for png_get_valid in -lpng" >&5 ++echo "configure:11970: 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 -@@ -11933,7 +11842,7 @@ +@@ -12068,7 +11974,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:11857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12083: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -11972,7 +11881,7 @@ +@@ -12107,7 +12013,7 @@ SYSTEM_PNG= else cat > conftest.$ac_ext < #include -@@ -11986,7 +11895,7 @@ +@@ -12121,7 +12027,7 @@ } EOF --if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then SYSTEM_PNG=1 else -@@ -12086,8 +11995,8 @@ +@@ -12221,8 +12127,8 @@ MOZ_ENABLE_GTK2=1 MOZ_ENABLE_XREMOTE=1 MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} @@ -4162,175 +4240,175 @@ cat >> confdefs.h <<\EOF #define MOZ_WIDGET_GTK2 1 EOF -@@ -12236,7 +12145,7 @@ +@@ -12371,7 +12277,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:12240: checking for $ac_word" >&5 -+echo "configure:12149: checking for $ac_word" >&5 +-echo "configure:12375: checking for $ac_word" >&5 ++echo "configure:12281: 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 -@@ -12271,7 +12180,7 @@ +@@ -12406,7 +12312,7 @@ min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 --echo "configure:12275: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:12184: checking for GTK - version >= $min_gtk_version" >&5 +-echo "configure:12410: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12316: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes -@@ -12294,7 +12203,7 @@ +@@ -12429,7 +12335,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -12372,7 +12281,7 @@ +@@ -12507,7 +12413,7 @@ } EOF --if { (eval echo configure:12376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -12407,7 +12316,7 @@ +@@ -12542,7 +12448,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < -@@ -12417,7 +12326,7 @@ +@@ -12552,7 +12458,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF --if { (eval echo configure:12421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -12469,7 +12378,7 @@ +@@ -12604,7 +12510,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:12473: checking for $ac_word" >&5 -+echo "configure:12382: checking for $ac_word" >&5 +-echo "configure:12608: checking for $ac_word" >&5 ++echo "configure:12514: 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 -@@ -12513,19 +12422,19 @@ +@@ -12648,19 +12554,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:12517: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12426: checking for gtk+-2.0 >= 1.3.7" >&5 +-echo "configure:12652: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12558: 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:12524: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12433: checking MOZ_GTK2_CFLAGS" >&5 +-echo "configure:12659: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12565: 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:12529: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12438: checking MOZ_GTK2_LIBS" >&5 +-echo "configure:12664: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12570: 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\"`" -@@ -12590,7 +12499,7 @@ +@@ -12725,7 +12631,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:12594: checking for $ac_word" >&5 -+echo "configure:12503: checking for $ac_word" >&5 +-echo "configure:12729: checking for $ac_word" >&5 ++echo "configure:12635: 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 -@@ -12642,7 +12551,7 @@ +@@ -12777,7 +12683,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 --echo "configure:12646: checking for main in -lqt" >&5 -+echo "configure:12555: checking for main in -lqt" >&5 +-echo "configure:12781: checking for main in -lqt" >&5 ++echo "configure:12687: 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 -@@ -12650,14 +12559,14 @@ +@@ -12785,14 +12691,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:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12796: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -12676,7 +12585,7 @@ +@@ -12811,7 +12717,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 --echo "configure:12680: checking for main in -lqt-mt" >&5 -+echo "configure:12589: checking for main in -lqt-mt" >&5 +-echo "configure:12815: checking for main in -lqt-mt" >&5 ++echo "configure:12721: 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 -@@ -12684,14 +12593,14 @@ +@@ -12819,14 +12725,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:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:12830: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -12727,9 +12636,9 @@ +@@ -12862,9 +12768,9 @@ LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 --echo "configure:12731: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12640: checking Qt - version >= $QT_VERSION" >&5 +-echo "configure:12866: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12772: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { -@@ -12740,7 +12649,7 @@ +@@ -12875,7 +12781,7 @@ ; return 0; } EOF --if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* result="yes" else -@@ -12771,6 +12680,138 @@ +@@ -12906,6 +12812,138 @@ @@ -4360,7 +4438,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:12710: checking for $ac_word" >&5 ++echo "configure:12842: 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 @@ -4404,19 +4482,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:12754: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 ++echo "configure:12886: 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:12761: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 ++echo "configure:12893: 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:12766: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ++echo "configure:12898: 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\"`" @@ -4469,55 +4547,55 @@ -@@ -13336,7 +13377,7 @@ +@@ -13471,7 +13509,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:13340: checking for $ac_word" >&5 -+echo "configure:13381: checking for $ac_word" >&5 +-echo "configure:13475: checking for $ac_word" >&5 ++echo "configure:13513: 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 -@@ -13380,19 +13421,19 @@ +@@ -13515,19 +13553,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:13384: checking for xft" >&5 -+echo "configure:13425: checking for xft" >&5 +-echo "configure:13519: checking for xft" >&5 ++echo "configure:13557: 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:13391: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13432: checking MOZ_XFT_CFLAGS" >&5 +-echo "configure:13526: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13564: 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:13396: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13437: checking MOZ_XFT_LIBS" >&5 +-echo "configure:13531: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13569: 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\"`" -@@ -13427,7 +13468,7 @@ +@@ -13562,7 +13600,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:13431: checking for $ac_word" >&5 -+echo "configure:13472: checking for $ac_word" >&5 +-echo "configure:13566: checking for $ac_word" >&5 ++echo "configure:13604: 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 -@@ -13470,31 +13511,31 @@ +@@ -13605,31 +13643,31 @@ else 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:13475: checking for pango >= 1.1.0" >&5 +-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:13516: checking for pangoxft >= 1.1.0 pangox" >&5 ++echo "configure:13648: checking for pangoxft >= 1.1.0 pangox" >&5 - if $PKG_CONFIG --exists "pango >= 1.1.0" ; then + if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then @@ -4525,18 +4603,18 @@ succeeded=yes - echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13482: checking _PANGOCHK_CFLAGS" >&5 +-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:13523: checking MOZ_PANGO_CFLAGS" >&5 ++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_LIBS""... $ac_c" 1>&6 --echo "configure:13487: checking _PANGOCHK_LIBS" >&5 +-echo "configure:13622: checking _PANGOCHK_LIBS" >&5 + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -+echo "configure:13528: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13660: checking MOZ_PANGO_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\"`" @@ -4557,7 +4635,7 @@ fi -@@ -13508,7 +13549,7 @@ +@@ -13643,7 +13681,7 @@ if test $succeeded = yes; then : else @@ -4566,7 +4644,7 @@ fi fi -@@ -13517,6 +13558,8 @@ +@@ -13652,6 +13690,8 @@ @@ -4575,39 +4653,39 @@ # Check whether --enable-pango or --disable-pango was given. if test "${enable_pango+set}" = set; then enableval="$enable_pango" -@@ -13543,7 +13586,7 @@ +@@ -13678,7 +13718,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:13547: checking for $ac_word" >&5 -+echo "configure:13590: checking for $ac_word" >&5 +-echo "configure:13682: checking for $ac_word" >&5 ++echo "configure:13722: 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 -@@ -13587,19 +13630,19 @@ +@@ -13722,19 +13762,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:13591: checking for pangoxft >= 1.6.0" >&5 -+echo "configure:13634: checking for pangoxft >= 1.6.0" >&5 +-echo "configure:13726: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13766: 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:13598: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13641: checking MOZ_PANGO_CFLAGS" >&5 +-echo "configure:13733: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13773: 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:13603: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13646: checking MOZ_PANGO_LIBS" >&5 +-echo "configure:13738: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13778: 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\"`" -@@ -13627,10 +13670,110 @@ +@@ -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 @@ -4618,7 +4696,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:13681: checking for $ac_word" >&5 ++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 @@ -4662,19 +4740,19 @@ + 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:13725: checking for pangocairo >= 1.10.0" >&5 ++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:13732: checking PANGOCAIRO_CHK_CFLAGS" >&5 ++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:13737: checking PANGOCAIRO_CHK_LIBS" >&5 ++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\"`" @@ -4718,170 +4796,162 @@ fi if test "$MOZ_X11" -@@ -13667,7 +13810,7 @@ +@@ -13802,7 +13942,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 --echo "configure:13671: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13814: checking for XpGetPrinterList in -lXp" >&5 +-echo "configure:13806: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13946: 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 -@@ -13675,7 +13818,7 @@ +@@ -13810,7 +13950,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:13833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:13825: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -13759,7 +13902,7 @@ +@@ -13894,7 +14034,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:13763: checking for $ac_word" >&5 -+echo "configure:13906: checking for $ac_word" >&5 +-echo "configure:13898: checking for $ac_word" >&5 ++echo "configure:14038: 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 -@@ -13803,19 +13946,19 @@ +@@ -13938,19 +14078,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:13807: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:13950: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +-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 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:13814: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:13957: checking MOZ_GNOMEVFS_CFLAGS" >&5 +-echo "configure:13949: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14089: 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:13819: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:13962: checking MOZ_GNOMEVFS_LIBS" >&5 +-echo "configure:13954: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14094: 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\"`" -@@ -13866,7 +14009,7 @@ +@@ -14001,7 +14141,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:13870: checking for $ac_word" >&5 -+echo "configure:14013: checking for $ac_word" >&5 +-echo "configure:14005: checking for $ac_word" >&5 ++echo "configure:14145: 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 -@@ -13910,19 +14053,19 @@ +@@ -14045,19 +14185,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:13914: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14057: checking for gconf-2.0 >= $GCONF_VERSION" >&5 +-echo "configure:14049: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14189: 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:13921: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14064: checking MOZ_GCONF_CFLAGS" >&5 +-echo "configure:14056: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14196: 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:13926: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14069: checking MOZ_GCONF_LIBS" >&5 +-echo "configure:14061: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14201: 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\"`" -@@ -13959,6 +14102,7 @@ - - - -+ - - if test "$MOZ_ENABLE_LIBGNOME" - then -@@ -13969,7 +14113,7 @@ +@@ -14104,7 +14244,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:13973: checking for $ac_word" >&5 -+echo "configure:14117: checking for $ac_word" >&5 +-echo "configure:14108: checking for $ac_word" >&5 ++echo "configure:14248: 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 -@@ -14013,19 +14157,19 @@ +@@ -14148,19 +14288,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:14017: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14161: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 +-echo "configure:14152: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14292: 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:14024: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14168: checking MOZ_LIBGNOME_CFLAGS" >&5 +-echo "configure:14159: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14299: 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:14029: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14173: checking MOZ_LIBGNOME_LIBS" >&5 +-echo "configure:14164: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14304: 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\"`" -@@ -14103,7 +14247,7 @@ +@@ -14238,7 +14378,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:14107: checking for $ac_word" >&5 -+echo "configure:14251: checking for $ac_word" >&5 +-echo "configure:14242: checking for $ac_word" >&5 ++echo "configure:14382: 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 -@@ -14147,19 +14291,19 @@ +@@ -14282,19 +14422,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:14151: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14295: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 +-echo "configure:14286: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14426: 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:14158: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14302: checking MOZ_GNOMEUI_CFLAGS" >&5 +-echo "configure:14293: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14433: 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:14163: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14307: checking MOZ_GNOMEUI_LIBS" >&5 +-echo "configure:14298: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14438: 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\"`" -@@ -14210,6 +14354,221 @@ +@@ -14345,6 +14485,221 @@ @@ -4909,7 +4979,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:14382: checking for $ac_word" >&5 ++echo "configure:14513: 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 @@ -4953,19 +5023,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:14426: checking for dbus-glib-1" >&5 ++echo "configure:14557: 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:14433: checking MOZ_DBUS_GLIB_CFLAGS" >&5 ++echo "configure:14564: 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:14438: checking MOZ_DBUS_GLIB_LIBS" >&5 ++echo "configure:14569: 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\"`" @@ -5000,7 +5070,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:14473: checking for $ac_word" >&5 ++echo "configure:14604: 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 @@ -5044,19 +5114,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:14517: checking for gthread-2.0" >&5 ++echo "configure:14648: 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:14524: checking MOZ_GTHREAD_CFLAGS" >&5 ++echo "configure:14655: 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:14529: checking MOZ_GTHREAD_LIBS" >&5 ++echo "configure:14660: 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\"`" @@ -5103,25 +5173,25 @@ if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \ && test "$MOZ_ENABLE_COREXFONTS" \ || test "$MOZ_ENABLE_XLIB" \ -@@ -14645,7 +15004,7 @@ +@@ -14780,7 +15135,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:14649: checking for $ac_word" >&5 -+echo "configure:15008: checking for $ac_word" >&5 +-echo "configure:14784: checking for $ac_word" >&5 ++echo "configure:15139: 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 -@@ -14681,7 +15040,7 @@ +@@ -14816,7 +15171,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:14685: checking for $ac_word" >&5 -+echo "configure:15044: checking for $ac_word" >&5 +-echo "configure:14820: checking for $ac_word" >&5 ++echo "configure:15175: 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 -@@ -14756,6 +15115,13 @@ +@@ -14891,6 +15246,13 @@ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` fi @@ -5135,309 +5205,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||'` -@@ -14928,7 +15294,7 @@ +@@ -15063,7 +15425,7 @@ gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 --echo "configure:14932: checking for Gdiplus.h" >&5 -+echo "configure:15298: checking for Gdiplus.h" >&5 +-echo "configure:15067: checking for Gdiplus.h" >&5 ++echo "configure:15429: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -14938,7 +15304,7 @@ +@@ -15073,7 +15435,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include -@@ -14947,7 +15313,7 @@ +@@ -15082,7 +15444,7 @@ ; return 0; } EOF --if { (eval echo configure:14951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* echo "$ac_t""yes" 1>&6 else -@@ -15027,7 +15393,7 @@ +@@ -15162,7 +15524,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:15031: checking for $ac_word" >&5 -+echo "configure:15397: checking for $ac_word" >&5 +-echo "configure:15166: checking for $ac_word" >&5 ++echo "configure:15528: 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 -@@ -15072,7 +15438,7 @@ +@@ -15207,7 +15569,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:15076: checking for $ac_word" >&5 -+echo "configure:15442: checking for $ac_word" >&5 +-echo "configure:15211: checking for $ac_word" >&5 ++echo "configure:15573: 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 -@@ -15141,13 +15507,13 @@ +@@ -15276,13 +15638,13 @@ msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:15145: checking for iconv" >&5 -+echo "configure:15511: checking for iconv" >&5 +-echo "configure:15280: checking for iconv" >&5 ++echo "configure:15642: 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:15151: checking for $ac_word" >&5 -+echo "configure:15517: checking for $ac_word" >&5 +-echo "configure:15286: checking for $ac_word" >&5 ++echo "configure:15648: 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 -@@ -15493,18 +15859,18 @@ +@@ -15628,18 +15990,18 @@ if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:15497: checking for valid debug flags" >&5 -+echo "configure:15863: checking for valid debug flags" >&5 +-echo "configure:15632: checking for valid debug flags" >&5 ++echo "configure:15994: 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:15508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* _results=yes else -@@ -15545,18 +15911,18 @@ +@@ -15680,18 +16042,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:15549: checking for valid optimization flags" >&5 -+echo "configure:15915: checking for valid optimization flags" >&5 +-echo "configure:15684: checking for valid optimization flags" >&5 ++echo "configure:16046: 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:15560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* _results=yes else -@@ -15773,7 +16139,7 @@ +@@ -15908,7 +16270,7 @@ if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:15777: checking for malloc in -lefence" >&5 -+echo "configure:16143: checking for malloc in -lefence" >&5 +-echo "configure:15912: checking for malloc in -lefence" >&5 ++echo "configure:16274: 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 -@@ -15781,7 +16147,7 @@ +@@ -15916,7 +16278,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:16162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15931: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15893,12 +16259,12 @@ +@@ -16028,12 +16390,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:15897: checking for $ac_func" >&5 -+echo "configure:16263: checking for $ac_func" >&5 +-echo "configure:16032: checking for $ac_func" >&5 ++echo "configure:16394: 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:16294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16063: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -16167,12 +16533,12 @@ +@@ -16302,12 +16664,12 @@ for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:16171: checking for $ac_func" >&5 -+echo "configure:16537: checking for $ac_func" >&5 +-echo "configure:16306: checking for $ac_func" >&5 ++echo "configure:16668: 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:16568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16337: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -16336,7 +16702,7 @@ +@@ -16471,7 +16833,7 @@ # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:16340: checking for gcc -pipe support" >&5 -+echo "configure:16706: checking for gcc -pipe support" >&5 +-echo "configure:16475: checking for gcc -pipe support" >&5 ++echo "configure:16837: 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 -@@ -16351,14 +16717,14 @@ +@@ -16486,14 +16848,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF --if { (eval echo configure:16362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* _res_gcc_pipe="yes" else -@@ -16400,16 +16766,16 @@ +@@ -16535,16 +16897,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:16404: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:16770: checking whether compiler supports -Wno-long-long" >&5 +-echo "configure:16539: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16901: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16548: \"$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* _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" -@@ -16430,16 +16796,16 @@ +@@ -16565,16 +16927,16 @@ CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:16434: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:16800: checking whether C compiler supports -fprofile-generate" >&5 +-echo "configure:16569: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16931: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" -@@ -16457,16 +16823,16 @@ +@@ -16592,16 +16954,16 @@ else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:16461: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:16827: checking whether C compiler supports -fprofile-arcs" >&5 +-echo "configure:16596: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16958: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" -@@ -16512,18 +16878,21 @@ +@@ -16647,16 +17009,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:16516: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:16882: checking whether C++ compiler has -pedantic long long bug" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <&5 ++echo "configure:17013: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then +-if { (eval echo configure:16660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* result="no" else -@@ -16553,13 +16922,16 @@ +@@ -16681,13 +17043,16 @@ fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:16557: checking for correct temporary object destruction order" >&5 -+echo "configure:16926: checking for correct temporary object destruction order" >&5 +-echo "configure:16685: checking for correct temporary object destruction order" >&5 ++echo "configure:17047: 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:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16710: \"$ac_link\") 1>&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 then result="yes" else -@@ -16599,12 +16971,12 @@ +@@ -16727,12 +17092,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:16603: checking for correct overload resolution with const and templates" >&5 -+echo "configure:16975: checking for correct overload resolution with const and templates" >&5 +-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 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 < -@@ -16634,7 +17006,7 @@ +@@ -16762,7 +17127,7 @@ ; return 0; } EOF --if { (eval echo configure:16638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else -@@ -16926,7 +17298,7 @@ +@@ -17054,7 +17419,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:16930: checking for $ac_word" >&5 -+echo "configure:17302: checking for $ac_word" >&5 +-echo "configure:17058: checking for $ac_word" >&5 ++echo "configure:17423: 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 -@@ -16970,19 +17342,19 @@ +@@ -17098,19 +17463,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:16974: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17346: checking for libIDL-2.0 >= 0.8.0" >&5 +-echo "configure:17102: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17467: 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:16981: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17353: checking LIBIDL_CFLAGS" >&5 +-echo "configure:17109: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17474: 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:16986: checking LIBIDL_LIBS" >&5 -+echo "configure:17358: checking LIBIDL_LIBS" >&5 +-echo "configure:17114: checking LIBIDL_LIBS" >&5 ++echo "configure:17479: 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\"`" -@@ -17105,7 +17477,7 @@ +@@ -17233,7 +17598,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:17109: checking for $ac_word" >&5 -+echo "configure:17481: checking for $ac_word" >&5 +-echo "configure:17237: checking for $ac_word" >&5 ++echo "configure:17602: 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 -@@ -17140,7 +17512,7 @@ +@@ -17268,7 +17633,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17144: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:17272: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17637: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17163,7 +17535,7 @@ +@@ -17291,7 +17656,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17239,7 +17611,7 @@ +@@ -17367,7 +17732,7 @@ } EOF --if { (eval echo configure:17243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -17273,7 +17645,7 @@ +@@ -17401,7 +17766,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17283,7 +17655,7 @@ +@@ -17411,7 +17776,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:17287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -17327,7 +17699,7 @@ +@@ -17455,7 +17820,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:17331: checking for $ac_word" >&5 -+echo "configure:17703: checking for $ac_word" >&5 +-echo "configure:17459: checking for $ac_word" >&5 ++echo "configure:17824: 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 -@@ -17362,7 +17734,7 @@ +@@ -17490,7 +17855,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:17366: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5 +-echo "configure:17494: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17859: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -17389,7 +17761,7 @@ +@@ -17517,7 +17882,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17475,7 +17847,7 @@ +@@ -17603,7 +17968,7 @@ } EOF --if { (eval echo configure:17479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -17509,7 +17881,7 @@ +@@ -17637,7 +18002,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -17520,7 +17892,7 @@ +@@ -17648,7 +18013,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF --if { (eval echo configure:17524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -17648,7 +18020,7 @@ +@@ -17776,7 +18141,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:17652: checking for $ac_word" >&5 -+echo "configure:18024: checking for $ac_word" >&5 +-echo "configure:17780: checking for $ac_word" >&5 ++echo "configure:18145: 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 -@@ -17683,7 +18055,7 @@ +@@ -17811,7 +18176,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17687: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:17815: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18180: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -17706,7 +18078,7 @@ +@@ -17834,7 +18199,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -17782,7 +18154,7 @@ +@@ -17910,7 +18275,7 @@ } EOF --if { (eval echo configure:17786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -17816,7 +18188,7 @@ +@@ -17944,7 +18309,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -17826,7 +18198,7 @@ +@@ -17954,7 +18319,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:17830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -17870,7 +18242,7 @@ +@@ -17998,7 +18363,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:17874: checking for $ac_word" >&5 -+echo "configure:18246: checking for $ac_word" >&5 +-echo "configure:18002: checking for $ac_word" >&5 ++echo "configure:18367: 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 -@@ -17905,7 +18277,7 @@ +@@ -18033,7 +18398,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:17909: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5 +-echo "configure:18037: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18402: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes -@@ -17932,7 +18304,7 @@ +@@ -18060,7 +18425,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18018,7 +18390,7 @@ +@@ -18146,7 +18511,7 @@ } EOF --if { (eval echo configure:18022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -18052,7 +18424,7 @@ +@@ -18180,7 +18545,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < -@@ -18063,7 +18435,7 @@ +@@ -18191,7 +18556,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF --if { (eval echo configure:18067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -18104,7 +18476,7 @@ +@@ -18232,7 +18597,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:18108: checking for $ac_word" >&5 -+echo "configure:18480: checking for $ac_word" >&5 +-echo "configure:18236: checking for $ac_word" >&5 ++echo "configure:18601: 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 -@@ -18148,19 +18520,19 @@ +@@ -18276,19 +18641,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:18152: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18524: checking for libIDL-2.0 >= 0.8.0" >&5 +-echo "configure:18280: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18645: 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:18159: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18531: checking LIBIDL_CFLAGS" >&5 +-echo "configure:18287: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18652: 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:18164: checking LIBIDL_LIBS" >&5 -+echo "configure:18536: checking LIBIDL_LIBS" >&5 +-echo "configure:18292: checking LIBIDL_LIBS" >&5 ++echo "configure:18657: 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\"`" -@@ -18196,7 +18568,7 @@ +@@ -18324,7 +18689,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:18200: checking for $ac_word" >&5 -+echo "configure:18572: checking for $ac_word" >&5 +-echo "configure:18328: checking for $ac_word" >&5 ++echo "configure:18693: 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 -@@ -18233,7 +18605,7 @@ +@@ -18361,7 +18726,7 @@ if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:18237: checking for ORBit libIDL usability" >&5 -+echo "configure:18609: checking for ORBit libIDL usability" >&5 +-echo "configure:18365: checking for ORBit libIDL usability" >&5 ++echo "configure:18730: 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}` -@@ -18250,7 +18622,7 @@ +@@ -18378,7 +18743,7 @@ result="maybe" else cat > conftest.$ac_ext < -@@ -18265,7 +18637,7 @@ +@@ -18393,7 +18758,7 @@ } EOF --if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then _LIBIDL_FOUND=1 result="yes" -@@ -18322,7 +18694,7 @@ +@@ -18450,7 +18815,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:18326: checking for $ac_word" >&5 -+echo "configure:18698: checking for $ac_word" >&5 +-echo "configure:18454: checking for $ac_word" >&5 ++echo "configure:18819: 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 -@@ -18366,19 +18738,19 @@ +@@ -18494,19 +18859,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:18370: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5 +-echo "configure:18498: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18863: 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:18377: checking GLIB_CFLAGS" >&5 -+echo "configure:18749: checking GLIB_CFLAGS" >&5 +-echo "configure:18505: checking GLIB_CFLAGS" >&5 ++echo "configure:18870: 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:18382: checking GLIB_LIBS" >&5 -+echo "configure:18754: checking GLIB_LIBS" >&5 +-echo "configure:18510: checking GLIB_LIBS" >&5 ++echo "configure:18875: 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\"`" -@@ -18462,7 +18834,7 @@ +@@ -18590,7 +18955,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:18466: checking for $ac_word" >&5 -+echo "configure:18838: checking for $ac_word" >&5 +-echo "configure:18594: checking for $ac_word" >&5 ++echo "configure:18959: 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 -@@ -18497,7 +18869,7 @@ +@@ -18625,7 +18990,7 @@ min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:18501: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5 +-echo "configure:18629: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18994: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes -@@ -18520,7 +18892,7 @@ +@@ -18648,7 +19013,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < -@@ -18596,7 +18968,7 @@ +@@ -18724,7 +19089,7 @@ } EOF --if { (eval echo configure:18600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-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 then : else -@@ -18630,7 +19002,7 @@ +@@ -18758,7 +19123,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < -@@ -18640,7 +19012,7 @@ +@@ -18768,7 +19133,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF --if { (eval echo configure:18644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 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" -@@ -18720,19 +19092,19 @@ +@@ -18848,19 +19213,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:18724: checking for working alloca.h" >&5 -+echo "configure:19096: checking for working alloca.h" >&5 +-echo "configure:18852: checking for working alloca.h" >&5 ++echo "configure:19217: 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:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-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 rm -rf conftest* ac_cv_header_alloca_h=yes else -@@ -18753,12 +19125,12 @@ +@@ -18881,12 +19246,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:18757: checking for alloca" >&5 -+echo "configure:19129: checking for alloca" >&5 +-echo "configure:18885: checking for alloca" >&5 ++echo "configure:19250: 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:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18918: \"$ac_link\") 1>&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 rm -rf conftest* ac_cv_func_alloca_works=yes else -@@ -18818,12 +19190,12 @@ +@@ -18946,12 +19311,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:18822: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19194: checking whether alloca needs Cray hooks" >&5 +-echo "configure:18950: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19315: 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:18852: checking for $ac_func" >&5 -+echo "configure:19224: checking for $ac_func" >&5 +-echo "configure:18980: checking for $ac_func" >&5 ++echo "configure:19345: 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:19252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19008: \"$ac_link\") 1>&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 rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else -@@ -18903,7 +19275,7 @@ +@@ -19031,7 +19396,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:18907: checking stack direction for C alloca" >&5 -+echo "configure:19279: checking stack direction for C alloca" >&5 +-echo "configure:19035: checking stack direction for C alloca" >&5 ++echo "configure:19400: 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 -@@ -18911,7 +19283,7 @@ +@@ -19039,7 +19404,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:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19062: \"$ac_link\") 1>&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 then ac_cv_c_stack_direction=1 else -@@ -18979,17 +19351,17 @@ +@@ -19107,17 +19472,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:18983: checking for $ac_hdr" >&5 -+echo "configure:19355: checking for $ac_hdr" >&5 +-echo "configure:19111: checking for $ac_hdr" >&5 ++echo "configure:19476: 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:18993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (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; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -19080,7 +19452,7 @@ +@@ -19208,7 +19573,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:19084: checking for $ac_word" >&5 -+echo "configure:19456: checking for $ac_word" >&5 +-echo "configure:19212: checking for $ac_word" >&5 ++echo "configure:19577: 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 -@@ -19124,19 +19496,19 @@ +@@ -19252,19 +19617,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:19128: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5 +-echo "configure:19256: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19621: 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:19135: checking CAIRO_CFLAGS" >&5 -+echo "configure:19507: checking CAIRO_CFLAGS" >&5 +-echo "configure:19263: checking CAIRO_CFLAGS" >&5 ++echo "configure:19628: 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:19140: checking CAIRO_LIBS" >&5 -+echo "configure:19512: checking CAIRO_LIBS" >&5 +-echo "configure:19268: checking CAIRO_LIBS" >&5 ++echo "configure:19633: 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\"`" -@@ -19201,7 +19573,7 @@ +@@ -19329,7 +19694,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:19205: checking for $ac_word" >&5 -+echo "configure:19577: checking for $ac_word" >&5 +-echo "configure:19333: checking for $ac_word" >&5 ++echo "configure:19698: 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 -@@ -19477,14 +19849,14 @@ +@@ -19605,14 +19970,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:19488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 : else echo "configure: failed program was:" >&5 -@@ -19791,7 +20163,7 @@ +@@ -19919,7 +20284,7 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < -@@ -19807,7 +20179,7 @@ +@@ -19935,7 +20300,7 @@ ; return 0; } EOF --if { (eval echo configure:19811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-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 : else echo "configure: failed program was:" >&5 -@@ -20025,34 +20397,15 @@ +@@ -20152,34 +20517,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. @@ -6134,7 +6199,7 @@ MOZ_DEFINES=$DEFS -@@ -20299,6 +20652,9 @@ +@@ -20426,6 +20772,9 @@ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@HOST_MOC@%$HOST_MOC%g s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g @@ -6144,7 +6209,7 @@ s%@TK_CFLAGS@%$TK_CFLAGS%g s%@TK_LIBS@%$TK_LIBS%g s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g -@@ -20335,23 +20691,30 @@ +@@ -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 @@ -6161,12 +6226,7 @@ s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g - 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 +@@ -20479,6 +20829,11 @@ s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g @@ -6178,3 +6238,21 @@ 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.2-source.tar.bz2 b/firefox-2.0.0.2-source.tar.bz2 deleted file mode 100644 index 13ded39..0000000 --- a/firefox-2.0.0.2-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:313436574cfcf7227d64d1b7901dc26286becb3aa9db03a493280ed9d74aeb9a -size 37143472 diff --git a/firefox-2.0.0.4-source.tar.bz2 b/firefox-2.0.0.4-source.tar.bz2 new file mode 100644 index 0000000..607eacc --- /dev/null +++ b/firefox-2.0.0.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f2ed4543f7611ea01b816c24606dca425d16b6d1d54fc473e3b6d2f1d3551ef +size 37525948 diff --git a/l10n-2.0.0.4.tar.bz2 b/l10n-2.0.0.4.tar.bz2 new file mode 100644 index 0000000..a03732e --- /dev/null +++ b/l10n-2.0.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5dce543b8f03e7a1cdcd893ba358a9f15176f10c2bd3850cb846e49a0370053 +size 10110133 diff --git a/l10n.tar.bz2 b/l10n.tar.bz2 deleted file mode 100644 index 8db8dce..0000000 --- a/l10n.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53d23397422034b8742a42ea836f533d58e5b560daa6c3f8bd75d3069d167030 -size 9939337 diff --git a/startup.patch b/startup.patch index e094b61..865d088 100644 --- a/startup.patch +++ b/startup.patch @@ -4,11 +4,11 @@ References: https://bugzilla.novell.com/show_bug.cgi?id=115417 https://bugzilla.mozilla.org/show_bug.cgi?id=223492 -Index: config/autoconf.mk.in -=================================================================== ---- config/autoconf.mk.in.orig +Index: configure.in +================================================================================ +--- config/autoconf.mk.in +++ config/autoconf.mk.in -@@ -223,6 +223,10 @@ MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI +@@ -223,6 +223,10 @@ MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@ @@ -19,11 +19,9 @@ Index: config/autoconf.mk.in MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@ MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@ -Index: configure.in -=================================================================== ---- configure.in.orig +--- configure.in +++ configure.in -@@ -125,6 +125,7 @@ GNOMEVFS_VERSION=2.0 +@@ -125,6 +125,7 @@ GNOMEUI_VERSION=2.2.0 GCONF_VERSION=1.2.1 LIBGNOME_VERSION=2.0 @@ -31,7 +29,7 @@ Index: configure.in dnl Set various checks dnl ======================================================== -@@ -4088,6 +4089,42 @@ fi # COMPILE_ENVIRONMENT +@@ -4088,6 +4089,42 @@ AC_SUBST(MOZ_DEFAULT_TOOLKIT) @@ -74,11 +72,9 @@ Index: configure.in AC_SUBST(GTK_CONFIG) AC_SUBST(TK_CFLAGS) AC_SUBST(TK_LIBS) -Index: toolkit/components/remote/Makefile.in -=================================================================== ---- toolkit/components/remote/Makefile.in.orig +--- toolkit/components/remote/Makefile.in +++ toolkit/components/remote/Makefile.in -@@ -56,8 +56,9 @@ REQUIRES = \ +@@ -56,8 +56,9 @@ string \ appcomps \ toolkitcomps \ @@ -89,9 +85,7 @@ Index: toolkit/components/remote/Makefile.in widget \ gfx \ dom \ -Index: toolkit/components/remote/nsGTKRemoteService.cpp -=================================================================== ---- toolkit/components/remote/nsGTKRemoteService.cpp.orig +--- toolkit/components/remote/nsGTKRemoteService.cpp +++ toolkit/components/remote/nsGTKRemoteService.cpp @@ -50,7 +50,7 @@ @@ -122,7 +116,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp #define MOZILLA_VERSION_PROP "_MOZILLA_VERSION" #define MOZILLA_LOCK_PROP "_MOZILLA_LOCK" #define MOZILLA_COMMAND_PROP "_MOZILLA_COMMAND" -@@ -155,20 +161,44 @@ nsGTKRemoteService::StartupHandler(const +@@ -155,20 +161,44 @@ return PL_DHASH_NEXT; } @@ -171,7 +165,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp NS_ENSURE_TRUE(mainWidget, NS_ERROR_FAILURE); // walk up the widget tree and find the toplevel window in the -@@ -260,7 +290,7 @@ nsGTKRemoteService::EnsureAtoms(void) +@@ -260,7 +290,7 @@ #ifndef MOZ_XUL_APP const char* @@ -180,7 +174,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp { nsresult rv; -@@ -283,8 +313,60 @@ nsGTKRemoteService::HandleCommand(char* +@@ -283,8 +313,60 @@ } #else //MOZ_XUL_APP @@ -242,7 +236,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp { nsresult rv; -@@ -314,6 +396,12 @@ nsGTKRemoteService::HandleCommand(char* +@@ -314,6 +396,12 @@ #endif if (!command.EqualsLiteral("ping")) { @@ -255,7 +249,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp char* argv[3] = {"dummyappname", "-remote", aCommand}; rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT); if (NS_FAILED(rv)) -@@ -322,6 +410,8 @@ nsGTKRemoteService::HandleCommand(char* +@@ -322,6 +410,8 @@ if (aWindow) cmdline->SetWindowContext(aWindow); @@ -264,7 +258,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp rv = cmdline->Run(); if (NS_ERROR_ABORT == rv) return "500 command not parseable"; -@@ -333,7 +423,8 @@ nsGTKRemoteService::HandleCommand(char* +@@ -333,7 +423,8 @@ } const char* @@ -274,7 +268,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp { nsresult rv; -@@ -364,6 +455,8 @@ nsGTKRemoteService::HandleCommandLine(ch +@@ -364,6 +455,8 @@ if (NS_FAILED(rv)) return "509 internal error"; @@ -283,7 +277,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp char **argv = (char**) malloc(sizeof(char*) * argc); if (!argv) return "509 internal error"; -@@ -372,6 +465,12 @@ nsGTKRemoteService::HandleCommandLine(ch +@@ -372,6 +465,12 @@ for (int i = 0; i < argc; ++i) { argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]); @@ -296,7 +290,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp #ifdef DEBUG_bsmedberg printf(" argv[%i]:\t%s\n", i, argv[i]); #endif -@@ -386,7 +485,10 @@ nsGTKRemoteService::HandleCommandLine(ch +@@ -386,7 +485,10 @@ if (aWindow) cmdline->SetWindowContext(aWindow); @@ -307,7 +301,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp if (NS_ERROR_ABORT == rv) return "500 command not parseable"; -@@ -486,7 +588,7 @@ nsGTKRemoteService::HandlePropertyChange +@@ -486,7 +588,7 @@ return FALSE; // cool, we got the property data. @@ -316,7 +310,7 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp // put the property onto the window as the response XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), -@@ -531,7 +633,7 @@ nsGTKRemoteService::HandlePropertyChange +@@ -531,7 +633,7 @@ return FALSE; // cool, we got the property data. @@ -325,11 +319,9 @@ Index: toolkit/components/remote/nsGTKRemoteService.cpp // put the property onto the window as the response XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window), -Index: toolkit/components/remote/nsGTKRemoteService.h -=================================================================== ---- toolkit/components/remote/nsGTKRemoteService.h.orig +--- toolkit/components/remote/nsGTKRemoteService.h +++ toolkit/components/remote/nsGTKRemoteService.h -@@ -80,10 +80,12 @@ private: +@@ -80,10 +80,12 @@ nsIWeakReference* aData, void* aClosure); @@ -344,11 +336,9 @@ Index: toolkit/components/remote/nsGTKRemoteService.h #endif static gboolean HandlePropertyChange(GtkWidget *widget, -Index: toolkit/library/Makefile.in -=================================================================== ---- toolkit/library/Makefile.in.orig +--- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -350,6 +350,10 @@ ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_ +@@ -344,6 +344,10 @@ EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) endif @@ -359,11 +349,9 @@ Index: toolkit/library/Makefile.in ifdef MOZ_ENABLE_XPRINT EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS) endif -Index: toolkit/xre/Makefile.in -=================================================================== ---- toolkit/xre/Makefile.in.orig +--- toolkit/xre/Makefile.in +++ toolkit/xre/Makefile.in -@@ -69,6 +69,7 @@ REQUIRES = \ +@@ -69,6 +69,7 @@ shellservice \ string \ uriloader \ @@ -371,210 +359,9 @@ Index: toolkit/xre/Makefile.in widget \ windowwatcher \ xpcom \ -Index: toolkit/xre/nsAppRunner.cpp -=================================================================== ---- toolkit/xre/nsAppRunner.cpp.orig -+++ toolkit/xre/nsAppRunner.cpp -@@ -96,6 +96,7 @@ - #include "nsIWindowWatcher.h" - #include "nsIXULAppInfo.h" - #include "nsIXULRuntime.h" -+#include "nsIScriptGlobalObject.h" - #ifdef XP_WIN - #include "nsIWinAppHelper.h" - #endif -@@ -115,6 +116,12 @@ - #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" - -@@ -262,6 +269,9 @@ 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 -@@ -1105,7 +1115,7 @@ DumpVersion() - // 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; -@@ -1146,7 +1156,7 @@ HandleRemoteArgument(const char* remote) - 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", -@@ -1163,7 +1173,7 @@ HandleRemoteArgument(const char* remote) - } - - static PRBool --RemoteCommandLine() -+RemoteCommandLine(const char* aDesktopStartupID) - { - nsresult rv; - ArgResult ar; -@@ -1195,7 +1205,7 @@ RemoteCommandLine() - 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) -@@ -2080,6 +2090,41 @@ public: - #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 -@@ -2248,6 +2293,19 @@ XRE_main(int argc, char* argv[], const n - 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 -@@ -2273,6 +2331,7 @@ XRE_main(int argc, char* argv[], const n - if (glib2) { - PR_UnloadLibrary(glib2); - } -+ gtk_window_set_auto_startup_notification(PR_FALSE); - #endif - - gtk_widget_set_default_visual(gdk_rgb_get_visual()); -@@ -2337,12 +2396,12 @@ XRE_main(int argc, char* argv[], const 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 -@@ -2586,6 +2645,13 @@ XRE_main(int argc, char* argv[], const n - 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")); -@@ -2766,9 +2832,28 @@ XRE_main(int argc, char* argv[], const n - } - #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/Makefile.in -=================================================================== ---- widget/src/gtk2/Makefile.in.orig +--- widget/src/gtk2/Makefile.in +++ widget/src/gtk2/Makefile.in -@@ -97,6 +97,7 @@ EXTRA_DSO_LDOPTS += \ +@@ -97,6 +97,7 @@ $(MOZ_COMPONENT_LIBS) \ -lgkgfx \ -lgtkxtbin \ @@ -582,7 +369,7 @@ Index: widget/src/gtk2/Makefile.in $(XLDFLAGS) \ $(XLIBS) \ $(MOZ_GTK2_LIBS) -@@ -107,14 +108,15 @@ endif +@@ -107,14 +108,15 @@ EXPORTS = \ nsIGdkPixbufImage.h \ @@ -600,9 +387,7 @@ Index: widget/src/gtk2/Makefile.in DEFINES += -DUSE_XIM -Index: widget/src/gtk2/nsGTKToolkit.h -=================================================================== ---- /dev/null +--- widget/src/gtk2/nsGTKToolkit.h +++ widget/src/gtk2/nsGTKToolkit.h @@ -0,0 +1,87 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ @@ -692,9 +477,7 @@ Index: widget/src/gtk2/nsGTKToolkit.h +}; + +#endif // GTKTOOLKIT_H -Index: widget/src/gtk2/nsToolkit.cpp -=================================================================== ---- widget/src/gtk2/nsToolkit.cpp.orig +--- widget/src/gtk2/nsToolkit.cpp +++ widget/src/gtk2/nsToolkit.cpp @@ -38,7 +38,7 @@ * ***** END LICENSE BLOCK ***** */ @@ -705,7 +488,7 @@ Index: widget/src/gtk2/nsToolkit.cpp // // Static thread local storage index of the Toolkit -@@ -51,9 +51,10 @@ static PRUintn gToolkitTLSIndex = 0; +@@ -51,9 +51,10 @@ // constructor // //------------------------------------------------------------------------- @@ -717,7 +500,7 @@ Index: widget/src/gtk2/nsToolkit.cpp } //------------------------------------------------------------------------- -@@ -61,7 +62,7 @@ nsToolkit::nsToolkit() +@@ -61,7 +62,7 @@ // destructor // //------------------------------------------------------------------------- @@ -726,7 +509,7 @@ Index: widget/src/gtk2/nsToolkit.cpp { if (mSharedGC) { gdk_gc_unref(mSharedGC); -@@ -77,9 +78,9 @@ nsToolkit::~nsToolkit() +@@ -77,9 +78,9 @@ // //------------------------------------------------------------------------- @@ -738,7 +521,7 @@ Index: widget/src/gtk2/nsToolkit.cpp { GdkPixmap *pixmap; -@@ -91,7 +92,7 @@ void nsToolkit::CreateSharedGC(void) +@@ -91,7 +92,7 @@ gdk_pixmap_unref(pixmap); } @@ -747,7 +530,7 @@ Index: widget/src/gtk2/nsToolkit.cpp { return gdk_gc_ref(mSharedGC); } -@@ -100,7 +101,7 @@ GdkGC *nsToolkit::GetSharedGC(void) +@@ -100,7 +101,7 @@ // // //------------------------------------------------------------------------- @@ -756,7 +539,7 @@ Index: widget/src/gtk2/nsToolkit.cpp { CreateSharedGC(); -@@ -135,7 +136,7 @@ NS_METHOD NS_GetCurrentToolkit(nsIToolki +@@ -135,7 +136,7 @@ // Create a new toolkit for this thread... // if (!toolkit) { @@ -765,11 +548,481 @@ Index: widget/src/gtk2/nsToolkit.cpp if (!toolkit) { rv = NS_ERROR_OUT_OF_MEMORY; +--- widget/src/xremoteclient/XRemoteClient.cpp ++++ widget/src/xremoteclient/XRemoteClient.cpp +@@ -173,6 +173,7 @@ + nsresult + XRemoteClient::SendCommand (const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aWindowFound) + { + PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand")); +@@ -198,7 +199,7 @@ + + if (NS_SUCCEEDED(rv)) { + // send our command +- rv = DoSendCommand(w, aCommand, aResponse, &destroyed); ++ rv = DoSendCommand(w, aCommand, aDesktopStartupID, aResponse, &destroyed); + + // if the window was destroyed, don't bother trying to free the + // lock. +@@ -217,6 +218,7 @@ + XRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aWindowFound) + { + PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine")); +@@ -242,7 +244,7 @@ + + if (NS_SUCCEEDED(rv)) { + // send our command +- rv = DoSendCommandLine(w, argc, argv, aResponse, &destroyed); ++ rv = DoSendCommandLine(w, argc, argv, aDesktopStartupID, aResponse, &destroyed); + + // if the window was destroyed, don't bother trying to free the + // lock. +@@ -643,6 +645,7 @@ + + nsresult + XRemoteClient::DoSendCommand(Window aWindow, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aDestroyed) + { + *aDestroyed = PR_FALSE; +@@ -651,9 +654,28 @@ + ("(writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x)\n", + aCommand, (unsigned int) aWindow)); + ++ // We add the DESKTOP_STARTUP_ID setting as an extra line of ++ // the command string. Firefox ignores all lines but the first. ++ static char desktopStartupPrefix[] = "\nDESKTOP_STARTUP_ID="; ++ ++ PRInt32 len = strlen(aCommand); ++ if (aDesktopStartupID) { ++ len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID); ++ } ++ char* buffer = (char*)malloc(len + 1); ++ if (!buffer) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ strcpy(buffer, aCommand); ++ if (aDesktopStartupID) { ++ strcat(buffer, desktopStartupPrefix); ++ strcat(buffer, aDesktopStartupID); ++ } ++ + XChangeProperty (mDisplay, aWindow, mMozCommandAtom, XA_STRING, 8, +- PropModeReplace, (unsigned char *)aCommand, +- strlen(aCommand)); ++ PropModeReplace, (unsigned char *)buffer, len); ++ ++ free(buffer); + + if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandAtom)) + return NS_ERROR_FAILURE; +@@ -663,7 +685,7 @@ + + /* like strcpy, but return the char after the final null */ + static char* +-estrcpy(char* s, char* d) ++estrcpy(const char* s, char* d) + { + while (*s) + *d++ = *s++; +@@ -674,6 +696,7 @@ + + nsresult + XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aDestroyed) + { + int i; +@@ -690,9 +713,16 @@ + // [argc][offsetargv0][offsetargv1...]\0\0argv[1]...\0 + // (offset is from the beginning of the buffer) + ++ static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID="; ++ + PRInt32 argvlen = strlen(cwdbuf); +- for (i = 0; i < argc; ++i) +- argvlen += strlen(argv[i]); ++ for (i = 0; i < argc; ++i) { ++ PRInt32 len = strlen(argv[i]); ++ if (i == 0 && aDesktopStartupID) { ++ len += strlen(desktopStartupPrefix) + strlen(aDesktopStartupID); ++ } ++ argvlen += len; ++ } + + PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 + + sizeof(PRInt32) * (argc + 1)); +@@ -708,6 +738,10 @@ + for (int i = 0; i < argc; ++i) { + buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer)); + bufend = estrcpy(argv[i], bufend); ++ if (i == 0 && aDesktopStartupID) { ++ bufend = estrcpy(desktopStartupPrefix, bufend - 1); ++ bufend = estrcpy(aDesktopStartupID, bufend - 1); ++ } + } + + #ifdef DEBUG_bsmedberg +--- widget/src/xremoteclient/XRemoteClient.h ++++ widget/src/xremoteclient/XRemoteClient.h +@@ -48,10 +48,12 @@ + virtual nsresult Init(); + virtual nsresult SendCommand(const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded); + virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded); + void Shutdown(); + +@@ -67,10 +69,12 @@ + PRBool aSupportsCommandLine); + nsresult DoSendCommand (Window aWindow, + const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, + PRBool *aDestroyed); + nsresult DoSendCommandLine(Window aWindow, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + char **aResponse, + PRBool *aDestroyed); + PRBool WaitForResponse (Window aWindow, char **aResponse, +--- widget/src/xremoteclient/mozilla-xremote-client.cpp ++++ widget/src/xremoteclient/mozilla-xremote-client.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #ifdef MOZ_WIDGET_PHOTON + #include "PhRemoteClient.h" + #else +@@ -99,7 +100,7 @@ + // send the command - it doesn't get any easier than this + PRBool success = PR_FALSE; + char *error = 0; +- rv = client.SendCommand(browser, username, profile, command, ++ rv = client.SendCommand(browser, username, profile, command, nsnull, + &error, &success); + + // failed to send command +--- widget/src/xremoteclient/nsRemoteClient.h ++++ widget/src/xremoteclient/nsRemoteClient.h +@@ -85,6 +85,7 @@ + */ + virtual nsresult SendCommand(const char *aProgram, const char *aUsername, + const char *aProfile, const char *aCommand, ++ const char* aDesktopStartupID, + char **aResponse, PRBool *aSucceeded) = 0; + + /** +@@ -97,6 +98,7 @@ + virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, + const char *aProfile, + PRInt32 argc, char **argv, ++ const char* aDesktopStartupID, + 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 =================================================================== ---- widget/src/gtk2/nsWindow.cpp.orig -+++ widget/src/gtk2/nsWindow.cpp -@@ -40,7 +40,7 @@ +RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWindow.cpp,v +retrieving revision 1.145.2.12 +diff -u -p -6 -r1.145.2.12 nsWindow.cpp +--- widget/src/gtk2/nsWindow.cpp 25 Jan 2007 02:22:26 -0000 1.145.2.12 ++++ widget/src/gtk2/nsWindow.cpp 19 Feb 2007 09:39:54 -0000 +@@ -37,13 +37,13 @@ + * + * ***** END LICENSE BLOCK ***** */ + #include "prlink.h" #include "nsWindow.h" @@ -778,7 +1031,13 @@ Index: widget/src/gtk2/nsWindow.cpp #include "nsIRenderingContext.h" #include "nsIRegion.h" #include "nsIRollupListener.h" -@@ -58,6 +58,11 @@ + #include "nsIMenuRollup.h" + #include "nsIDOMNode.h" + +@@ -55,12 +55,17 @@ + #include "nsGtkCursors.h" + + #include #include #include @@ -790,7 +1049,13 @@ Index: widget/src/gtk2/nsWindow.cpp #include "gtk2xtbin.h" #include "nsIPrefService.h" -@@ -660,6 +665,70 @@ nsWindow::Enable(PRBool aState) + #include "nsIPrefBranch.h" + #include "nsIServiceManager.h" + #include "nsGfxCIID.h" +@@ -657,12 +662,76 @@ nsWindow::SetSizeMode(PRInt32 aMode) + NS_IMETHODIMP + nsWindow::Enable(PRBool aState) + { return NS_ERROR_NOT_IMPLEMENTED; } @@ -861,18 +1126,30 @@ Index: widget/src/gtk2/nsWindow.cpp NS_IMETHODIMP nsWindow::SetFocus(PRBool aRaise) { -@@ -680,6 +749,10 @@ nsWindow::SetFocus(PRBool aRaise) + // Make sure that our owning widget has focus. If it doesn't try to + // grab it. Note that we don't set our focus flag in this case. + +@@ -677,12 +746,16 @@ nsWindow::SetFocus(PRBool aRaise) + return NS_ERROR_FAILURE; + + // Raise the window if someone passed in PR_TRUE and the prefs are // set properly. GtkWidget *toplevelWidget = gtk_widget_get_toplevel(owningWidget); + if (toplevelWidget && aRaise) { + SetUserTimeAndStartupIDForActivatedWindow(toplevelWidget); + } -+ ++ if (gRaiseWindows && aRaise && toplevelWidget && !GTK_WIDGET_HAS_FOCUS(owningWidget) && !GTK_WIDGET_HAS_FOCUS(toplevelWidget)) { -@@ -1167,7 +1240,7 @@ nsWindow::GetNativeData(PRUint32 aDataTy + GtkWidget* top_window = nsnull; + GetToplevelWidget(&top_window); + if (top_window && (GTK_WIDGET_VISIBLE(top_window))) +@@ -1164,13 +1237,13 @@ nsWindow::GetNativeData(PRUint32 aDataTy + case NS_NATIVE_DISPLAY: + return GDK_DISPLAY(); + break; case NS_NATIVE_GRAPHIC: { NS_ASSERTION(nsnull != mToolkit, "NULL toolkit, unable to get a GC"); @@ -881,7 +1158,13 @@ Index: widget/src/gtk2/nsWindow.cpp break; } -@@ -2802,7 +2875,7 @@ nsWindow::NativeShow (PRBool aAction) + case NS_NATIVE_SHELLWIDGET: + return (void *) mShell; + +@@ -2799,22 +2872,27 @@ nsWindow::NativeShow (PRBool aAction) + // going to need it, because GTK won't let us unset the mask properly + // later. + // So, we delay setting the mask until the last moment: when the window // is shown. // XXX that may or may not be true for GTK+ 2.x if (mTransparencyBitmap) { @@ -890,7 +1173,9 @@ Index: widget/src/gtk2/nsWindow.cpp } // unset our flag now that our window has been shown -@@ -2812,6 +2885,11 @@ nsWindow::NativeShow (PRBool aAction) + mNeedsShow = PR_FALSE; + + if (mIsTopLevel) { moz_drawingarea_set_visibility(mDrawingarea, aAction); gtk_widget_show(GTK_WIDGET(mContainer)); gtk_widget_show(mShell); @@ -902,198 +1187,6 @@ Index: widget/src/gtk2/nsWindow.cpp } else if (mContainer) { moz_drawingarea_set_visibility(mDrawingarea, TRUE); -Index: widget/src/xremoteclient/XRemoteClient.cpp -=================================================================== ---- widget/src/xremoteclient/XRemoteClient.cpp.orig -+++ widget/src/xremoteclient/XRemoteClient.cpp -@@ -173,6 +173,7 @@ XRemoteClient::Shutdown (void) - nsresult - XRemoteClient::SendCommand (const char *aProgram, const char *aUsername, - const char *aProfile, const char *aCommand, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aWindowFound) - { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand")); -@@ -198,7 +199,7 @@ XRemoteClient::SendCommand (const char * - - if (NS_SUCCEEDED(rv)) { - // send our command -- rv = DoSendCommand(w, aCommand, aResponse, &destroyed); -+ rv = DoSendCommand(w, aCommand, aDesktopStartupID, aResponse, &destroyed); - - // if the window was destroyed, don't bother trying to free the - // lock. -@@ -217,6 +218,7 @@ nsresult - XRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername, - const char *aProfile, - PRInt32 argc, char **argv, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aWindowFound) - { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine")); -@@ -242,7 +244,7 @@ XRemoteClient::SendCommandLine (const ch - - if (NS_SUCCEEDED(rv)) { - // send our command -- rv = DoSendCommandLine(w, argc, argv, aResponse, &destroyed); -+ rv = DoSendCommandLine(w, argc, argv, aDesktopStartupID, aResponse, &destroyed); - - // if the window was destroyed, don't bother trying to free the - // lock. -@@ -643,6 +645,7 @@ XRemoteClient::FreeLock(Window aWindow) - - nsresult - XRemoteClient::DoSendCommand(Window aWindow, const char *aCommand, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aDestroyed) - { - *aDestroyed = PR_FALSE; -@@ -651,9 +654,28 @@ XRemoteClient::DoSendCommand(Window aWin - ("(writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x)\n", - aCommand, (unsigned int) aWindow)); - -+ // We add the DESKTOP_STARTUP_ID setting as an extra line of -+ // the command string. Firefox ignores all lines but the first. -+ static char desktopStartupPrefix[] = "\nDESKTOP_STARTUP_ID="; -+ -+ PRInt32 len = strlen(aCommand); -+ if (aDesktopStartupID) { -+ len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID); -+ } -+ char* buffer = (char*)malloc(len + 1); -+ if (!buffer) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ strcpy(buffer, aCommand); -+ if (aDesktopStartupID) { -+ strcat(buffer, desktopStartupPrefix); -+ strcat(buffer, aDesktopStartupID); -+ } -+ - XChangeProperty (mDisplay, aWindow, mMozCommandAtom, XA_STRING, 8, -- PropModeReplace, (unsigned char *)aCommand, -- strlen(aCommand)); -+ PropModeReplace, (unsigned char *)buffer, len); -+ -+ free(buffer); - - if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandAtom)) - return NS_ERROR_FAILURE; -@@ -663,7 +685,7 @@ XRemoteClient::DoSendCommand(Window aWin - - /* like strcpy, but return the char after the final null */ - static char* --estrcpy(char* s, char* d) -+estrcpy(const char* s, char* d) - { - while (*s) - *d++ = *s++; -@@ -674,6 +696,7 @@ estrcpy(char* s, char* d) - - nsresult - XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aDestroyed) - { - int i; -@@ -690,9 +713,16 @@ XRemoteClient::DoSendCommandLine(Window - // [argc][offsetargv0][offsetargv1...]\0\0argv[1]...\0 - // (offset is from the beginning of the buffer) - -+ static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID="; -+ - PRInt32 argvlen = strlen(cwdbuf); -- for (i = 0; i < argc; ++i) -- argvlen += strlen(argv[i]); -+ for (i = 0; i < argc; ++i) { -+ PRInt32 len = strlen(argv[i]); -+ if (i == 0 && aDesktopStartupID) { -+ len += strlen(desktopStartupPrefix) + strlen(aDesktopStartupID); -+ } -+ argvlen += len; -+ } - - PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 + - sizeof(PRInt32) * (argc + 1)); -@@ -708,6 +738,10 @@ XRemoteClient::DoSendCommandLine(Window - for (int i = 0; i < argc; ++i) { - buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer)); - bufend = estrcpy(argv[i], bufend); -+ if (i == 0 && aDesktopStartupID) { -+ bufend = estrcpy(desktopStartupPrefix, bufend - 1); -+ bufend = estrcpy(aDesktopStartupID, bufend - 1); -+ } - } - - #ifdef DEBUG_bsmedberg -Index: widget/src/xremoteclient/XRemoteClient.h -=================================================================== ---- widget/src/xremoteclient/XRemoteClient.h.orig -+++ widget/src/xremoteclient/XRemoteClient.h -@@ -48,10 +48,12 @@ public: - virtual nsresult Init(); - virtual nsresult SendCommand(const char *aProgram, const char *aUsername, - const char *aProfile, const char *aCommand, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aSucceeded); - virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, - const char *aProfile, - PRInt32 argc, char **argv, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aSucceeded); - void Shutdown(); - -@@ -67,10 +69,12 @@ private: - PRBool aSupportsCommandLine); - nsresult DoSendCommand (Window aWindow, - const char *aCommand, -+ const char* aDesktopStartupID, - char **aResponse, - PRBool *aDestroyed); - nsresult DoSendCommandLine(Window aWindow, - PRInt32 argc, char **argv, -+ const char* aDesktopStartupID, - char **aResponse, - PRBool *aDestroyed); - PRBool WaitForResponse (Window aWindow, char **aResponse, -Index: widget/src/xremoteclient/mozilla-xremote-client.cpp -=================================================================== ---- widget/src/xremoteclient/mozilla-xremote-client.cpp.orig -+++ widget/src/xremoteclient/mozilla-xremote-client.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #ifdef MOZ_WIDGET_PHOTON - #include "PhRemoteClient.h" - #else -@@ -99,7 +100,7 @@ int main(int argc, char **argv) - // send the command - it doesn't get any easier than this - PRBool success = PR_FALSE; - char *error = 0; -- rv = client.SendCommand(browser, username, profile, command, -+ rv = client.SendCommand(browser, username, profile, command, nsnull, - &error, &success); - - // failed to send command -Index: widget/src/xremoteclient/nsRemoteClient.h -=================================================================== ---- widget/src/xremoteclient/nsRemoteClient.h.orig -+++ widget/src/xremoteclient/nsRemoteClient.h -@@ -85,6 +85,7 @@ public: - */ - virtual nsresult SendCommand(const char *aProgram, const char *aUsername, - const char *aProfile, const char *aCommand, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aSucceeded) = 0; - - /** -@@ -97,6 +98,7 @@ public: - virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername, - const char *aProfile, - PRInt32 argc, char **argv, -+ const char* aDesktopStartupID, - char **aResponse, PRBool *aSucceeded) = 0; - }; - + gtk_widget_show(GTK_WIDGET(mContainer)); + } + else if (mDrawingarea) { diff --git a/visibility.patch b/visibility.patch index 2051a02..12d0972 100644 --- a/visibility.patch +++ b/visibility.patch @@ -9,23 +9,14 @@ feature at the moment Index: configure =================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1443 -diff -u -p -6 -r1.1443 configure ---- configure 2 Jun 2005 04:00:20 -0000 1.1443 -+++ configure 6 Jun 2005 07:34:06 -0000 -@@ -7303,13 +7303,13 @@ else - int foo_default = 1; - EOF - ac_cv_visibility_pragma=no +--- configure.orig ++++ configure +@@ -7949,7 +7949,7 @@ EOF if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then - if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then + if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then + if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then - ac_cv_visibility_pragma=yes + ac_cv_visibility_pragma=no fi fi fi - rm -f conftest.cs - - fi