From 0353450036f7985f40c8ed95e782be830824138239c919e52f35bfcdf130b3f0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 26 Mar 2008 15:01:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=31 --- MozillaFirefox.changes | 83 + MozillaFirefox.desktop | 2 +- MozillaFirefox.desktop.nld | 35 - MozillaFirefox.spec | 498 +- abuild.patch | 129 - add-plugins.sh.in | 70 - bookmarks.html.nld | 74 - bookmarks.html.suse | 3 +- cjk-postscript-fonts.dif | 30 - configure.patch | 6079 -------------------- cups-paper.patch | 858 --- dbus.patch | 588 -- em-356370.patch | 25 - find-external-requires.sh | 23 + firefox-2.0.0.12-source.tar.bz2 | 3 - firefox-2.9.94-source.tar.bz2 | 3 + firefox-348446-empty-lists.patch | 13 - firefox-libxul-sdk.patch | 20 + MozillaFirefox.xml => firefox-mimeinfo.xml | 0 firefox-no-update.patch | 134 +- firefox-suse-default-prefs.js | 4 +- firefox-ui-lockdown.patch | 432 -- firefox.1 | 2 +- gcc-undefined-ops.patch | 90 - gconf-backend.patch | 3267 ----------- gecko-lockdown.patch | 330 -- gnome-vfs-default.patch | 47 - gnome-vfs.patch | 393 -- greasemonkey.patch | 28 - l10n-2.0.0.12.tar.bz2 | 3 - l10n-2.9.94.tar.bz2 | 3 + locale.patch | 11 - misc.dif | 20 - mozilla-gcc4.3-fixes.patch | 146 - mozilla-path_len.patch | 181 - mozilla.sh.in | 93 +- nspr-prdtoa.patch | 17 - nss-opt.patch | 22 - plastikfox-theme.tar.bz2 | 3 - postscript.patch | 29 - proxy-dev.patch | 180 - rpath.patch | 21 - skin-selection.patch | 51 - startup.patch | 1214 ---- system-extensions.patch | 58 - system-proxies.patch | 894 --- tango-maxversion.patch | 11 - tango-theme.tar.bz2 | 3 - visibility.patch | 22 - x11-session.patch | 236 - 50 files changed, 376 insertions(+), 16105 deletions(-) delete mode 100644 MozillaFirefox.desktop.nld delete mode 100644 abuild.patch delete mode 100644 add-plugins.sh.in delete mode 100644 bookmarks.html.nld delete mode 100644 cjk-postscript-fonts.dif delete mode 100644 configure.patch delete mode 100644 cups-paper.patch delete mode 100644 dbus.patch delete mode 100644 em-356370.patch create mode 100644 find-external-requires.sh delete mode 100644 firefox-2.0.0.12-source.tar.bz2 create mode 100644 firefox-2.9.94-source.tar.bz2 delete mode 100644 firefox-348446-empty-lists.patch create mode 100644 firefox-libxul-sdk.patch rename MozillaFirefox.xml => firefox-mimeinfo.xml (100%) delete mode 100644 firefox-ui-lockdown.patch delete mode 100644 gcc-undefined-ops.patch delete mode 100644 gconf-backend.patch delete mode 100644 gecko-lockdown.patch delete mode 100644 gnome-vfs-default.patch delete mode 100644 gnome-vfs.patch delete mode 100644 greasemonkey.patch delete mode 100644 l10n-2.0.0.12.tar.bz2 create mode 100644 l10n-2.9.94.tar.bz2 delete mode 100644 locale.patch delete mode 100644 misc.dif delete mode 100644 mozilla-gcc4.3-fixes.patch delete mode 100644 mozilla-path_len.patch delete mode 100644 nspr-prdtoa.patch delete mode 100644 nss-opt.patch delete mode 100644 plastikfox-theme.tar.bz2 delete mode 100644 postscript.patch delete mode 100644 proxy-dev.patch delete mode 100644 rpath.patch delete mode 100644 skin-selection.patch delete mode 100644 startup.patch delete mode 100644 system-extensions.patch delete mode 100644 system-proxies.patch delete mode 100644 tango-maxversion.patch delete mode 100644 tango-theme.tar.bz2 delete mode 100644 visibility.patch delete mode 100644 x11-session.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 32bb7669..fbcd0f45 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Wed Mar 26 01:05:18 CET 2008 - maw@suse.de + +- Merge changes from the build service (thanks, Wolfgang) +- Update to the fourth Firefox 3.0 Beta (2.9.94): + + Based upon the Gecko 1.9 Web rendering platform, which improves + performance, stability, and rendering correctness; it also + boasts a considerable simplification in its code + + Security improvements: + * One-click site info + * Malware Protection + * New Web Forgery Protection page + * New SSL error pages + * Add-ons and Plugin version check + * Secure add-on updates + * Effective top-level domain (eTLD) service to better restrict + cookies and other restricted content to a single domain + * Better protection against cross-site JSON data leaks + + Usability improvements: + * Easier password management + * Simplified add-on installation + * New Download Manager + * Resumable downloading + * Full page zoom + * Podcasts and Videocasts can be associated with your media + playback tools + * Tab scrolling and quickmenu + * Save what you were doing: Firefox will prompt users to save + tabs on exit + * Optimized Open in Tabs behavior + * Location and Search bar size can now be customized with a + simple resizer item + * Text selection improvements + * Find toolbar + * Improved integration with Linux: Firefox's default icons, + buttons, and menu styles now use the native GTK theme + + Personalization improvements: + * Star button: quickly add bookmarks from the location bar + with a single click; a second click lets you file and tag them + * Tags: associate keywords with your bookmarks to sort them + by topic + * Location bar & auto-complete + * Smart Bookmarks Folder + * Places Organizer: view, organize and search through all + of your bookmarks, tags, and browsing history with multiple + views and smart folders to store your frequent searches + * Web-based protocol handlers + * Download & Install Add-ons + * Easy to use Download Actions + + Improved platform for web developers: + * New graphics and font handling: new graphics and text + rendering architectures in Gecko 1.9 provides rendering + improvements in CSS, SVG as well as improved display of + fonts with ligatures and complex scripts + * Color management: (set gfx.color_management.enabled on + in about:config and restart the browser to enable.); + Firefox can now adjust images with embedded color profiles + * Offline support: enables web applications to provide + offline functionality (website authors must add support + for offline browsing to their site for this feature + to be available to users) + + Improved performance: + * Speed: improvements to the JavaScript engine as well as + profile guided optimizations have resulted in significant + improvements in performance; compared to Firefox 2, + web applications like Google Mail and Zoho Office run + twice as fast in Firefox 3 Beta 4, and the popular + SunSpider test from Apple shows improvements over + previous releases + * Memory usage: Several new technologies work together to + reduce the amount of memory used by Firefox 3 Beta 4 + over a web browsing session; memory cycles are broken + and collected by an automated cycle collector, a new + memory allocator reduces fragmentation, hundreds of leaks + have been fixed, and caching strategies have been tuned + * Reliability: A user's bookmarks, history, cookies, and + preferences are now stored in a transactionally secure + database format which will prevent data loss even if their + system crashes +- This version depends upon the mozilla-xulrunner190 package +- Drop various stale packages, respin several that have been + kept around, and add a few new ones. + ------------------------------------------------------------------- Mon Feb 11 18:18:14 CET 2008 - maw@suse.de diff --git a/MozillaFirefox.desktop b/MozillaFirefox.desktop index b6df4375..62fae641 100644 --- a/MozillaFirefox.desktop +++ b/MozillaFirefox.desktop @@ -8,5 +8,5 @@ Exec=firefox %u Icon=firefox Terminal=false StartupNotify=true -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall; Type=Application diff --git a/MozillaFirefox.desktop.nld b/MozillaFirefox.desktop.nld deleted file mode 100644 index a7a3227f..00000000 --- a/MozillaFirefox.desktop.nld +++ /dev/null @@ -1,35 +0,0 @@ -[Desktop Entry] -Name=Firefox Web Browser -Name[en]=Firefox Web Browser -Name[cs]=Firefox -Name[de]=Firefox-Webbrowser -Name[fr]=Navigateur Web Firefox -Name[es]=Navegador Web Firefox -Name[hu]=Firefox webböngésző -Name[it]=Browser Web Firefox -Name[ja]=Firefox Webブラウザ -Name[pl]=Przeglądarka WWW Firefox -Name[pt_BR]=Browser da Web Firefox -Name[sk]=Firefox -Name[zh_CN]=Firefox 万维网浏览器 -Name[zh_TW]=Firefox 網頁瀏覽器 -Comment=Firefox Web Browser -Comment[en]=Firefox Web Browser -Comment[cs]=Prohlížeč Firefox -Comment[de]=Firefox-Webbrowser -Comment[fr]=Navigateur Web Firefox -Comment[es]=Navegador Web Firefox -Comment[hu]=Firefox webböngésző -Comment[it]=Browser Web Firefox -Comment[ja]=Firefox Webブラウザ -Comment[pl]=Przeglądarka WWW Firefox -Comment[pt_BR]=Browser da Web Firefox -Comment[sk]=Firefox Web Browser -Comment[zh_CN]=Firefox 万维网浏览器 -Comment[zh_TW]=Firefox 網頁瀏覽器 -TryExec=firefox -Exec=firefox %u -Icon=firefox -Terminal=false -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; -Type=Application diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 3718764a..2ca8c88a 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.0.0.12) +# spec file for package MozillaFirefox (Version 2.9.94) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,145 +12,46 @@ Name: MozillaFirefox -# Checklist for updating: -# * Copy new sources (don't forget l10n-%{version}.tar.bz2) and patches -# to your package checkout. -# * Increment Version: as necessary -# * Update releasedate -# * Ensure patches are in sync among all releases -# * configure.patch should be the last patch applied against the mozilla -# source itself; the following patches apply to other tarballs. -# * configure.patch is regenerated (when necessary) by applying -# pango-cairo.patch, dbus.patch, startup.patch to an unpacked source, -# and then running autoconf 2.13. debian.suse.de used to have this -# version installed. For more info see -# http://developer.mozilla.org/en/docs/How_Mozilla's_build_system_works -# * Update the .changes file -# * Update this checklist if necessary and keep it in sync on all supported -# platforms. -BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel unzip update-desktop-files zip -%if %suse_version <= 1010 -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-1-glib-devel -%endif +BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-xulrunner190-devel orbit-devel python unzip update-desktop-files zip %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox -Provides: MozillaFirebird -Obsoletes: MozillaFirebird <= 1.0.7 -%if %sles_version == 10 -Obsoletes: mozilla -%endif -Version: 2.0.0.12 -Release: 1 +Version: 2.9.94 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers -# Creation of firefox and l10n tarballs: -# cvs -d :pserver:anonymous:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk -# cd mozilla -# export MOZ_CO_PROJECT=browser -# export MOZ_CO_LOCALES=all -# make -f client.mk checkout -# cd .. -# 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 Source3: mozilla.sh.in -Source4: tango-theme.tar.bz2 +Source4: find-external-requires.sh Source5: search-addons.tar.bz2 -Source6: MozillaFirefox.desktop.nld Source7: l10n-%{version}.tar.bz2 -Source8: plastikfox-theme.tar.bz2 -Source9: bookmarks.html.nld +Source8: firefox-mimeinfo.xml Source10: bookmarks.html.suse Source11: firefox48.png Source16: firefox.1 Source17: firefox-suse-default-prefs.js Source18: firefox.schemas -Source19: MozillaFirefox.xml -Patch1: visibility.patch -Patch2: rpath.patch -Patch3: gcc-undefined-ops.patch -Patch4: mozilla-gcc4.3-fixes.patch -Patch5: abuild.patch -# NSPR bmo #270502 -Patch6: nspr-prdtoa.patch -Patch7: locale.patch -# lockdown infrastructure -Patch8: firefox-ui-lockdown.patch -Patch9: gecko-lockdown.patch -Patch10: gconf-backend.patch -Patch11: gnome-vfs.patch -Patch12: misc.dif -Patch13: nss-opt.patch +Patch1: firefox-libxul-sdk.patch +Patch2: firefox-no-update.patch Patch14: credits.patch -Patch15: em-356370.patch -# bmo #273524 (only for NLD) -Patch16: gnome-vfs-default.patch -# integration Patch17: firefox-appname.patch -Patch18: firefox-no-update.patch -Patch19: dbus.patch -Patch20: mozilla-path_len.patch -# customization -Patch22: cjk-postscript-fonts.dif -Patch23: startup.patch -# bmo #324060 -Patch24: cups-paper.patch -Patch25: system-extensions.patch -Patch27: system-proxies.patch -# bmo #331522 -Patch32: postscript.patch -Patch33: proxy-dev.patch -# integration -Patch34: skin-selection.patch -Patch36: greasemonkey.patch -Patch38: tango-maxversion.patch -Patch39: x11-session.patch -Patch40: firefox-348446-empty-lists.patch -# gconf.patch dbus.patch startup.patch -Patch100: configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: libstdc++ fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils -%if %suse_version < 1030 -Requires: /usr/lib/libaoss.so -%endif -%define opensuse_bs 0 -%if %sles_version == 10 -%define default_home_page http://www.novell.com/linux/sle10 -%else -%define default_home_page http://www.opensuse.org -%endif -%define has_system_nspr 0 -%define has_system_nss 0 -%define has_system_cairo 0 -%if %suse_version > 930 || %opensuse_bs -%define has_system_nspr 1 -%define has_system_cairo 1 -%endif -%if %suse_version > 1010 || %opensuse_bs -%define has_system_nss 1 -%endif -%if %has_system_nspr -Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) -%endif -%if %has_system_nss -Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) -%endif +PreReq: fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils +Requires: mozilla-xulrunner190 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190`) +%define default_home_page http://www.opensuse.org/ %define _unpackaged_files_terminate_build 0 -%define releasedate 2008020300 +%define _use_internal_dependency_generator 0 +%define __find_requires sh %{SOURCE4} +%define __find_provides %{nil} +%define releasedate 2008030800 %define progname firefox -%if %suse_version < 1010 -%define progdir /opt/MozillaFirefox/%_lib -%else %define progdir %{_prefix}/%_lib/firefox -%endif +%define libgssapi libgssapi_krb5.so.2 %if %suse_version > 1020 %define gnome_confdir %{_sysconfdir} %define gnome_dir %{_prefix} @@ -159,18 +60,9 @@ Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozill %define gnome_confdir %{_sysconfdir}/opt/gnome %define gnome_dir /opt/gnome %endif -%define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) -%define my_provides /tmp/my-provides -%define my_requires /tmp/my-requires -%if %suse_version > 920 -%define libgssapi libgssapi_krb5.so.2 -%else -%define libgssapi libgssapi.so.1 -%endif ### build options %define milestone 1 %define localize 1 -%define broken 0 ### build options end %description @@ -188,9 +80,10 @@ Authors: %package translations Summary: Translations for MozillaFirefox -Provides: locale(MozillaFirefox:af;ar;bg;be;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;it;ja;ka;ko;ku;lt;mk;mn;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;sk;sl;sv_SE;tr;zh_CN;zh_TW) +Provides: locale(%{name}:ar;be;ca;cs;da;de;el;en-GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;it;ja;ka;ko;lt;mk;nb_NO;nl;pa_IN;pl;pt_BR;pt_PT;ro;ru;sk;sq;sv_SE;tr;uk;zh_CN;zh_TW) Group: Productivity/Networking/Web/Browsers PreReq: %{name} = %{version} +Requires: mozilla-xulrunner190-lang %description translations This package contains several optional languages for the user interface @@ -203,68 +96,23 @@ Authors: Mozilla Foundation %prep -%setup -q -n mozilla -b 7 -b 4 -b 8 +%setup -q -n mozilla -b 7 cd $RPM_BUILD_DIR/mozilla %patch1 %patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -# lockdown stuff -%patch8 -p1 -%patch9 -%patch10 -%patch11 -%patch12 -%patch13 %patch14 -%patch15 %patch17 -%patch18 -%patch19 -%patch20 -p1 -# system NSS -%patch22 -%patch23 -%patch24 -%patch25 -%patch27 -%if %nld9 -%patch16 -%endif -%patch32 -%patch33 -p1 -%patch34 -%patch36 -pushd $RPM_BUILD_DIR -%patch38 -popd -%patch39 -p1 -%patch40 -p1 -%patch100 -%if %has_system_nss -#%patch101 -%endif # custom bookmarks -%if %nld9 -cp -f %{SOURCE9} $RPM_BUILD_DIR/mozilla/browser/locales/en-US/profile/bookmarks.html -%else cp -f %{SOURCE10} $RPM_BUILD_DIR/mozilla/browser/locales/en-US/profile/bookmarks.html -%endif %build export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 -export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing -ftree-vrp -fwrapv" -%if %suse_version > 1000 -export CFLAGS="$CFLAGS -fstack-protector" -%endif +export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing -fstack-protector" export CXXFLAGS="$CFLAGS" -export RPATH="-Wl,-rpath -Wl,%{progdir}" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig +SDKDIR=$(pkg-config --variable=sdkdir libxul) cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 @@ -275,54 +123,18 @@ ac_add_options --libdir=%{_libdir} ac_add_options --sysconfdir=%{_sysconfdir} ac_add_options --mandir=%{_mandir} ac_add_options --includedir=%{_includedir} -ac_add_options --enable-optimize="$CFLAGS" +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-libxul-sdk=$SDKDIR ac_add_options --with-system-jpeg -ac_add_options --with-system-png -ac_add_options --with-system-mng +#ac_add_options --with-system-png # doesn't work because of missing APNG support ac_add_options --with-system-zlib -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-gconf -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-xft -ac_add_options --disable-freetype2 +#ac_add_options --enable-gconf # not ported yet ac_add_options --disable-installer -ac_add_options --enable-static -ac_add_options --disable-shared ac_add_options --disable-tests ac_add_options --disable-debug +ac_add_options --disable-crashreporter EOF -%if %is_plus || %suse_version >= 930 -cat << EOF >> $MOZCONFIG -ac_add_options --enable-pango -EOF -%endif -%if %has_system_nspr -cat << EOF >> $MOZCONFIG -ac_add_options --with-system-nspr -EOF -%endif -%if %has_system_nss -cat << EOF >> $MOZCONFIG -ac_add_options --with-system-nss -EOF -%endif -%if %has_system_cairo -cat << EOF >> $MOZCONFIG -ac_add_options --enable-system-cairo -EOF -%endif -%if %suse_version >= 1000 -cat << EOF >> $MOZCONFIG -ac_add_options --enable-dbus -ac_add_options --enable-extensions="dbus default" -EOF -%endif -%if %suse_version >= 1010 -cat << EOF >> $MOZCONFIG -ac_add_options --enable-startup-notification -EOF -%endif %if %milestone cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding @@ -338,10 +150,9 @@ cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir} # install additional locales %if %localize echo %defattr\(-,root,root\) > %{_tmppath}/translations.list -#for locale in $(cat browser/locales/all-locales); do for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do case $locale in - ja-JP-mac) + ja-JP-mac) # broken locales, do not work ;; *) @@ -365,39 +176,16 @@ s:%%PROFILE:.mozilla/firefox:g" \ chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT/usr/bin/%{progname} # desktop definition -%if %nld9 -mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/applications -install -m 644 %{SOURCE6} \ - $RPM_BUILD_ROOT/opt/gnome/share/applications/%{name}.desktop -%else mkdir -p $RPM_BUILD_ROOT/usr/share/applications -%if %suse_version < 1010 -# no startup notification for 10.0 and older -sed "s:StartupNotify=true:StartupNotify=false:g" \ - %{SOURCE1} > $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop -%else install -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT/usr/share/applications -%endif -%endif -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages -cp %{S:19} $RPM_BUILD_ROOT/%{_datadir}/mime/packages +# additional mime-types +mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages +cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/firefox.xml # SCHEMA File -mkdir -p $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas +mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas install -m 644 %{SOURCE18} \ $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/ -# Themes -cp -a $RPM_BUILD_DIR/tango\@novell.com $RPM_BUILD_ROOT%{progdir}/extensions/ -%if %broken -cp -a $RPM_BUILD_DIR/\{4674e8a2-eb7e-4822-b517-b18328b3e8e8\} $RPM_BUILD_ROOT%{progdir}/extensions/ -%endif -# install add-plugins.sh -%if %suse_version <= 1000 -sed "s:%%PROGDIR:%{progdir}:g -s:%%APPNAME:%{progname}:g" \ - %{SOURCE2} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh -chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh -%endif # install man-page mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/ @@ -405,10 +193,10 @@ cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/ sed -e 's,RPM_VERSION,%{version}-%{release},g s,GSSAPI,%{libgssapi},g' \ %{SOURCE17} > suse-default-prefs -cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/pref/firefox-novell.js +cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-novell.js rm suse-default-prefs # use correct locale for useragent -cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox-l10n.js << EOF +cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); EOF ########## @@ -425,58 +213,45 @@ EOF mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ %if %milestone cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png -mkdir -p $RPM_BUILD_ROOT/%{gnome_dir}/share/icons/hicolor/48x48/apps/ -install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT/%{gnome_dir}/share/icons/hicolor/48x48/apps/firefox.png +mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/ +install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/firefox.png ln -sf firefox.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox-gnome.png %else cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.xpm %endif %suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK -%if %has_system_nspr && !%has_system_nss -# modify provides and requires lists (don't export NSS) -cat << EOF > %{my_provides} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so" | %{__find_provides} -EOF -chmod 755 %{my_provides} -%define __find_provides %{my_provides} -cat << EOF > %{my_requires} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|firefox-bin" | %{__find_requires} -EOF -chmod 755 %{my_requires} -%define __find_requires %{my_requires} -%endif -%find_gconf_schemas %if %suse_version > 1020 -%fdupes $RPM_BUILD_ROOT%_libdir -%fdupes $RPM_BUILD_ROOT%_docdir +%find_gconf_schemas +%fdupes $RPM_BUILD_ROOT%{progdir} +%fdupes $RPM_BUILD_ROOT%{_datadir} +%endif +%if %milestone +chmod -x $RPM_BUILD_ROOT%{_datadir}/pixmaps/firefox.png %endif -chmod -x $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png %clean rm -rf $RPM_BUILD_ROOT -%if %has_system_nspr && !%has_system_nss -rm -f %{my_provides} -rm -f %{my_requires} -%endif +%if %suse_version > 1020 %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun +%endif %post +# update mime and desktop database if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime >/dev/null || true + usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi %if %suse_version >= 1030 if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database >/dev/null || true + usr/bin/update-desktop-database > /dev/null || : fi %else if [ -f opt/gnome/bin/update-mime-database ] ; then - opt/gnome/bin/update-mime-database >/dev/null || true + opt/gnome/bin/update-mime-database > /dev/null || : fi %endif -%if %suse_version >= 1010 # move plugins to new location if [ "$1" = "2" ]; then if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then @@ -485,115 +260,67 @@ if [ "$1" = "2" ]; then rm -rf /opt/MozillaFirefox/%{_lib}/plugins fi fi -%endif +%if %suse_version <= 1020 if [ ! -f /.buildenv ]; then export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source` - %{gnome_dir}/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1 -%if %suse_version <= 1000 - # restart gconfd - killall -HUP gconfd-2 2>&1 >/dev/null -%endif + %{gnome_dir}bin/gconftool-2 --makefile-install-rule %{gnome_confdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1 fi -%if %suse_version <= 1000 -%{progdir}/add-plugins.sh > /dev/null 2>&1 %endif exit 0 -%if %suse_version <= 1000 -%posttrans -f %{name}.schemas_posttrans %postun if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime >/dev/null || true + usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi %if %suse_version >= 1030 if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database >/dev/null || true + usr/bin/update-desktop-database > /dev/null || : fi %else if [ -f opt/gnome/bin/update-mime-database ] ; then - opt/gnome/bin/update-mime-database >/dev/null || true + opt/gnome/bin/update-mime-database > /dev/null || : fi %endif - -%triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin -%{progdir}/add-plugins.sh > /dev/null 2>&1 -exit 0 - -%triggerpostun -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin -if [ -L %{progdir}/plugins/libjavaplugin_oji.so -a ! -f %{progdir}/plugins/libjavaplugin_oji.so ]; then - rm -f %{progdir}/plugins/libjavaplugin_oji.so -fi -%{progdir}/add-plugins.sh > /dev/null 2>&1 -exit 0 +%if %suse_version > 1020 +%posttrans -f %{name}.schemas_posttrans %endif +%if %suse_version > 1020 %files -f %{name}.schemas_list -%defattr(-,root,root) -%if %suse_version < 1010 -%dir /opt/MozillaFirefox +%else + +%files %endif +%defattr(-,root,root) %dir %{progdir} %dir %{progdir}/chrome/ %{progdir}/chrome/browser.* %{progdir}/chrome/classic.* -%{progdir}/chrome/comm.* %{progdir}/chrome/en-US.* -%{progdir}/chrome/pippki.* -%{progdir}/chrome/toolkit.* %{progdir}/chrome/reporter.* %{progdir}/chrome/icons %{progdir}/components/ -%{progdir}/greprefs/ %{progdir}/defaults/ -%{progdir}/dictionaries/ %{progdir}/extensions/ %{progdir}/icons/ -#%{progdir}/init.d/ -%dir %{progdir}/plugins -%{progdir}/plugins/libnullplugin.so -%{progdir}/res/ %{progdir}/searchplugins/ -%if %suse_version <= 1000 -%{progdir}/add-plugins.sh -%endif -%{progdir}/%{progname}-bin +%{progdir}/modules/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/browserconfig.properties -# NSPR -%if ! %has_system_nspr -%{progdir}/libnspr4.so -%{progdir}/libplc4.so -%{progdir}/libplds4.so -%endif -# NSS -%if ! %has_system_nss -%{progdir}/libnssckbi.so -%{progdir}/libnss3.so -%{progdir}/libsmime3.so -%{progdir}/libsoftokn3.chk -%{progdir}/libsoftokn3.so -%{progdir}/libssl3.so -%endif -# -%{progdir}/libmozjs.so -%{progdir}/libxpcom.so -%{progdir}/libxpcom_core.so -%{progdir}/libxpcom_compat.so -%{progdir}/libxpistub.so -%{progdir}/mozilla-xremote-client -%{progdir}/run-mozilla.sh -%{progdir}/updater -%{progdir}/updater.ini -%{progdir}/xpicleanup +%{progdir}/application.ini +%{progdir}/firefox +%exclude %{progdir}/updater.ini %exclude %{progdir}/removed-files -%exclude %{progdir}/firefox -%{progdir}/readme.txt -%if %nld9 -/opt/gnome/share/applications/%{name}.desktop -%else +%exclude %{progdir}/README.txt +%exclude %{progdir}/old-homepage-default.properties +%exclude %{progdir}/components/libnkgnomevfs.so +%exclude %{progdir}/run-mozilla.sh +%exclude %{progdir}/libjemalloc.so /usr/share/applications/%{name}.desktop -%endif +%if %suse_version <= 1020 %{gnome_confdir}/gconf/schemas/firefox.schemas +%endif +%{_datadir}/mime/packages/firefox.xml /usr/share/pixmaps/firefox* %if %milestone %{gnome_dir}/share/icons/hicolor/ @@ -605,8 +332,87 @@ exit 0 %files translations -f %{_tmppath}/translations.list %defattr(-,root,root) %endif - %changelog +* Wed Mar 26 2008 maw@suse.de +- Merge changes from the build service (thanks, Wolfgang) +- Update to the fourth Firefox 3.0 Beta (2.9.94): + + Based upon the Gecko 1.9 Web rendering platform, which improves + performance, stability, and rendering correctness; it also + boasts a considerable simplification in its code + + Security improvements: + * One-click site info + * Malware Protection + * New Web Forgery Protection page + * New SSL error pages + * Add-ons and Plugin version check + * Secure add-on updates + * Effective top-level domain (eTLD) service to better restrict + cookies and other restricted content to a single domain + * Better protection against cross-site JSON data leaks + + Usability improvements: + * Easier password management + * Simplified add-on installation + * New Download Manager + * Resumable downloading + * Full page zoom + * Podcasts and Videocasts can be associated with your media + playback tools + * Tab scrolling and quickmenu + * Save what you were doing: Firefox will prompt users to save + tabs on exit + * Optimized Open in Tabs behavior + * Location and Search bar size can now be customized with a + simple resizer item + * Text selection improvements + * Find toolbar + * Improved integration with Linux: Firefox's default icons, + buttons, and menu styles now use the native GTK theme + + Personalization improvements: + * Star button: quickly add bookmarks from the location bar + with a single click; a second click lets you file and tag them + * Tags: associate keywords with your bookmarks to sort them + by topic + * Location bar & auto-complete + * Smart Bookmarks Folder + * Places Organizer: view, organize and search through all + of your bookmarks, tags, and browsing history with multiple + views and smart folders to store your frequent searches + * Web-based protocol handlers + * Download & Install Add-ons + * Easy to use Download Actions + + Improved platform for web developers: + * New graphics and font handling: new graphics and text + rendering architectures in Gecko 1.9 provides rendering + improvements in CSS, SVG as well as improved display of + fonts with ligatures and complex scripts + * Color management: (set gfx.color_management.enabled on + in about:config and restart the browser to enable.); + Firefox can now adjust images with embedded color profiles + * Offline support: enables web applications to provide + offline functionality (website authors must add support + for offline browsing to their site for this feature + to be available to users) + + Improved performance: + * Speed: improvements to the JavaScript engine as well as + profile guided optimizations have resulted in significant + improvements in performance; compared to Firefox 2, + web applications like Google Mail and Zoho Office run + twice as fast in Firefox 3 Beta 4, and the popular + SunSpider test from Apple shows improvements over + previous releases + * Memory usage: Several new technologies work together to + reduce the amount of memory used by Firefox 3 Beta 4 + over a web browsing session; memory cycles are broken + and collected by an automated cycle collector, a new + memory allocator reduces fragmentation, hundreds of leaks + have been fixed, and caching strategies have been tuned + * Reliability: A user's bookmarks, history, cookies, and + preferences are now stored in a transactionally secure + database format which will prevent data loss even if their + system crashes +- This version depends upon the mozilla-xulrunner190 package +- Drop various stale packages, respin several that have been + kept around, and add a few new ones. * Mon Feb 11 2008 maw@suse.de - Security update to version 2.0.0.12 (bnc#354469): + MFSA 2008-11/CVE-2008-0594 Web forgery overwrite with div diff --git a/abuild.patch b/abuild.patch deleted file mode 100644 index 5e253444..00000000 --- a/abuild.patch +++ /dev/null @@ -1,129 +0,0 @@ -From: Wolfgang Rosenauer -Subject: Fix compiler warnings which disturb autobuild -References: - -### autobuild -... testing for serious compiler warnings -Program is using uninitialized variables. Note the difference between "is used" -and "may be used". Please investigate and fix. -Problematic file(s) and their linenumbers: - certificate.c: 541 - nsUnicodeToJamoTTF.cpp: 855 - nsObjectFrame.cpp: 1933 -### - -### autobuild -... testing for serious compiler warnings -Program returns random data in a function. Please fix. -Problematic file(s) and their linenumbers: - nsWebShell.cpp: 562 - nsOperaProfileMigrator.cpp: 831 - Program is using uninitialized variables. Note the difference between "is used" and "may be used". - Please investigate and fix. - Problematic file(s) and their linenumbers: - nsFrame.cpp: 3536 -### - ---- gfx/src/gtk/nsFontMetricsUtils.cpp.old 2005-03-24 07:27:33.000000000 +0100 -+++ gfx/src/gtk/nsFontMetricsUtils.cpp 2005-03-24 07:28:26.000000000 +0100 -@@ -75,6 +75,7 @@ NS_FontMetricsGetHints(void) - #ifdef MOZ_ENABLE_COREXFONTS - return nsFontMetricsGTK::GetHints(); - #endif -+ return 1; - } - - nsresult -@@ -95,6 +96,7 @@ NS_FontMetricsFamilyExists(nsIDeviceCont - #ifdef MOZ_ENABLE_COREXFONTS - return nsFontMetricsGTK::FamilyExists(aDevice, aName); - #endif -+ return 1; - } - - #ifdef MOZ_ENABLE_XFT -Index: intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp -=================================================================== -RCS file: /cvsroot/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp,v -retrieving revision 1.10 -diff -u -p -6 -r1.10 nsUnicodeToJamoTTF.cpp ---- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 19 Feb 2005 07:27:54 -0000 1.10 -+++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 7 Jun 2005 07:21:10 -0000 -@@ -842,12 +842,13 @@ PRInt16 JamoSrchReplace (const JamoNormM - // we don't need a separate range check here because the one in - // for-loop is sufficient. - for (PRInt32 i = start; i <= end - clusterLen; i++) - { - const JamoNormMap *match; - JamoNormMap key; -+ key.liga = 0; - - // cluster array is made up of PRUint8's to save memory - // and we have to subtract aOffset from the input before looking it up. - key.seq[0] = aIn[i] - aOffset; - key.seq[1] = aIn[i + 1] - aOffset; - key.seq[2] = clusterLen == 3 ? (aIn[i + 2] - aOffset) : 0; -Index: layout/generic/nsObjectFrame.cpp -=================================================================== -RCS file: /cvsroot/mozilla/layout/generic/nsObjectFrame.cpp,v -retrieving revision 1.505 -diff -u -p -6 -r1.505 nsObjectFrame.cpp ---- layout/generic/nsObjectFrame.cpp 6 May 2005 03:14:31 -0000 1.505 -+++ layout/generic/nsObjectFrame.cpp 7 Jun 2005 07:23:27 -0000 -@@ -1850,12 +1850,13 @@ nsObjectFrame::Paint(nsPresContext* - // now we need to setup the correct location for printing - nsresult rv; - nsPluginWindow window; - nsPoint origin; - float t2p; - window.window = nsnull; -+ window.ws_info = nsnull; - - // prepare embedded mode printing struct - nsPluginPrint npprint; - npprint.mode = nsPluginMode_Embedded; - - // we need to find out if we are windowless or not -Index: docshell/base/nsWebShell.cpp -=================================================================== -RCS file: /cvsroot/mozilla/docshell/base/nsWebShell.cpp,v -retrieving revision 1.656.2.1 -diff -u -p -6 -r1.656.2.1 nsWebShell.cpp ---- docshell/base/nsWebShell.cpp 16 Sep 2005 19:11:52 -0000 1.656.2.1 -+++ docshell/base/nsWebShell.cpp 22 Sep 2005 06:30:30 -0000 -@@ -556,12 +556,13 @@ nsWebShell::OnLinkClickSync(nsIContent * - // XXX TODO Should be similar to the HTML IMG ALT attribute handling - // in NS 4.x - default: - NS_ABORT_IF_FALSE(0,"unexpected link verb"); - return NS_ERROR_UNEXPECTED; - } -+ return NS_ERROR_UNEXPECTED; - } - - NS_IMETHODIMP - nsWebShell::OnOverLink(nsIContent* aContent, - nsIURI* aURI, - const PRUnichar* aTargetSpec) -Index: layout/generic/nsFrame.cpp -=================================================================== -RCS file: /cvsroot/mozilla/layout/generic/nsFrame.cpp,v -retrieving revision 3.574.2.4 -diff -u -p -6 -r3.574.2.4 nsFrame.cpp ---- layout/generic/nsFrame.cpp 20 Sep 2005 06:32:09 -0000 3.574.2.4 -+++ layout/generic/nsFrame.cpp 22 Sep 2005 06:31:42 -0000 -@@ -3528,13 +3528,13 @@ nsresult - nsFrame::PeekOffsetParagraph(nsPresContext* aPresContext, - nsPeekOffsetStruct *aPos) - { - #ifdef DEBUG_paragraph - printf("Selecting paragraph\n"); - #endif -- nsIFrame* blockFrame; -+ nsIFrame* blockFrame = NULL; - nsCOMPtr iter (getter_AddRefs(GetBlockFrameAndLineIter(this, &blockFrame))); - if (!blockFrame || !iter) - return NS_ERROR_UNEXPECTED; - - PRInt32 thisLine; - nsresult result = iter->FindLineContaining(this, &thisLine); diff --git a/add-plugins.sh.in b/add-plugins.sh.in deleted file mode 100644 index fa8b226b..00000000 --- a/add-plugins.sh.in +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved. -# 2002-2003 SuSE Linux AG, Nuernberg, Germany -# 2005 SUSE Linux Products GmbH, Nuernberg, Germany -# - -# check if we are started as root -# only one of UID and USER must be set correctly -if test "$UID" != 0 -a "$USER" != root; then - echo "You must be root to start $0." - exit 1 -fi - -PREFIX="%PROGDIR" -MOZ_APP="%APPNAME" - -get_arch () -{ - file "$1" | sed -n 's/.*: ELF [^,]*, \([^,]*\),.*/\1/p' -} - -mozilla_arch=`get_arch $PREFIX/$MOZ_APP-bin` -mozilla_lib=`file $PREFIX/$MOZ_APP-bin | awk '{ print $3 }'` - -JAVA_CHECK_PATH="/usr/lib /usr/java" -JAVA_ORDER="mozilla ns7 ns610 [Ss]un IBM BEA" -case $mozilla_lib in - 64-bit) - LIB=lib64 - ;; - *) - LIB=lib - ;; -esac - -find_java () -{ - TMP=$(find $JAVA_CHECK_PATH -name "$1" -type f) - for i in $TMP; do - if [ "`get_arch $i`" = "$mozilla_arch" ]; then - PLUGIN="$PLUGIN $i" - fi - done - TMP="" -} - -# JAVA -if [ ! -L $PREFIX/plugins/libjavaplugin_oji.so ] || - [ ! -f $PREFIX/plugins/libjavaplugin_oji.so ] ; then # link is here and valid - PLUGIN="" - find_java *javaplugin_oji.so - find_java *javaplugin_ojigcc3.so # IBMJava - if [ "$PLUGIN" ]; then - for i in $PLUGIN; do - if [[ $i == *mozilla* ]] || [[ $i == *gcc3* ]] || [[ $i == *ns7/* ]]; then - TMP=$i - break - fi - done - fi - if [ "$TMP" ]; then - PLUGIN=$TMP - ln -sf $PLUGIN $PREFIX/plugins/libjavaplugin_oji.so - echo "-> added Java2 plugin ($PLUGIN)" - else - echo "-> Java2: no change (no suitable JRE available)" - fi -else - echo "-> Java2: no change (existing link is valid)" -fi diff --git a/bookmarks.html.nld b/bookmarks.html.nld deleted file mode 100644 index 99c989ab..00000000 --- a/bookmarks.html.nld +++ /dev/null @@ -1,74 +0,0 @@ - - - -Bookmarks -

Bookmarks

- -

-

Bookmarks Toolbar Folder

-
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar -

-

NOVELL: Support -

Entertainment

-

-

The Internet Movie Database (IMDb) -
Movie Reviews -
Rotten Tomatoes Movie Reviews -
Real Player Guide -
Real Player Movie Trailers -

-

News

-

-

BBC News -
CNN.com -
Google News -
Slashdot: News for nerds, stuff that matters -
weather.com -
Wired News -

-

Internet Search

-

-

Google -
Open Directory Project -
Yahoo! -

-

Reference

-

-

Dictionary Search -
How Stuff Works -
Language Translation -
The Library of Congress -
National Library of Medicine -
Wikipedia, the free encyclopedia -

-

Maps and Directions

-

-

Map24 -
MapQuest -
Multimap.com -
Yahoo! Maps and Driving Directions -

-

Shopping

-

-

Amazon.com -
craigslist -
eBay -
Epinions.com -
Froogle -
Overstock.com -

-

People and Companies

-

-

Internet Yellow Pages -
White Pages Phone Directory -
Yahoo! People Search -

-

-

-
NOVELL: Worldwide -
NOVELL: Novell on Linux -
NOVELL: Support -
Welcome to SUSE LINUX -

diff --git a/bookmarks.html.suse b/bookmarks.html.suse index df2fe56e..b68d5972 100644 --- a/bookmarks.html.suse +++ b/bookmarks.html.suse @@ -15,8 +15,7 @@

openSUSE

openSUSE -
openSUSE Download -
openSUSE.org Online Software Repositories +
openSUSE Download
openSUSE News
Novell / Linux
SUSE Linux Cool Solutions diff --git a/cjk-postscript-fonts.dif b/cjk-postscript-fonts.dif deleted file mode 100644 index d40c733c..00000000 --- a/cjk-postscript-fonts.dif +++ /dev/null @@ -1,30 +0,0 @@ -Index: modules/libpref/src/init/all.js -=================================================================== ---- modules/libpref/src/init/all.js.orig -+++ modules/libpref/src/init/all.js -@@ -2251,8 +2251,10 @@ pref("print.postscript.print_command", " - pref("print.postscript.nativefont.ar", ""); - pref("print.postscript.nativefont.el", ""); - pref("print.postscript.nativefont.he", ""); --pref("print.postscript.nativefont.ja", ""); --pref("print.postscript.nativefont.ko", ""); -+pref("print.postscript.nativefont.ja", "UTF-8"); -+pref("print.postscript.nativefont.ja", "Ryumin-Light-UniJIS-UTF8-H"); -+pref("print.postscript.nativefont.ko", "UTF-8"); -+pref("print.postscript.nativefont.ko", "Baekmuk-Gulim-UniKS-UTF8-H"); - pref("print.postscript.nativefont.th", ""); - pref("print.postscript.nativefont.tr", ""); - pref("print.postscript.nativefont.x-baltic", ""); -@@ -2261,8 +2263,10 @@ pref("print.postscript.nativefont.x-cyri - pref("print.postscript.nativefont.x-unicode", ""); - pref("print.postscript.nativefont.x-user-def", ""); - pref("print.postscript.nativefont.x-western", ""); --pref("print.postscript.nativefont.zh-CN", ""); --pref("print.postscript.nativefont.zh-TW", ""); -+pref("print.postscript.nativefont.zh-CN", "UTF-8"); -+pref("print.postscript.nativefont.zh-CN", "GB-Song-Medium-UniGB-UTF8-H"); -+pref("print.postscript.nativefont.zh-TW", "UTF-8"); -+pref("print.postscript.nativefont.zh-TW", "B5-Song-Medium-UniCNS-UTF8-H"); - pref("print.postscript.nativefont.zh-HK", ""); - - # XP_UNIX diff --git a/configure.patch b/configure.patch deleted file mode 100644 index 55805e1d..00000000 --- a/configure.patch +++ /dev/null @@ -1,6079 +0,0 @@ -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1492.2.128 -diff -u -r1.1492.2.128 configure ---- configure 18 Dec 2007 21:42:55 -0000 1.1492.2.128 -+++ configure 5 Feb 2008 12:00:52 -0000 -@@ -83,6 +83,8 @@ - ac_help="$ac_help - --with-qtdir=\$dir Specify Qt directory " - ac_help="$ac_help -+ --enable-startup-notification Enable startup-notification support (default: disabled) " -+ac_help="$ac_help - --enable-application=APP - Options include: - suite -@@ -133,6 +135,8 @@ - ac_help="$ac_help - --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) " - ac_help="$ac_help -+ --enable-dbus Enable dbus support (default: disabled) " -+ac_help="$ac_help - --disable-crypto Disable crypto support (Personal Security Manager)" - ac_help="$ac_help - --disable-jsd Disable JavaScript debug library" -@@ -960,7 +964,7 @@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:964: checking host system type" >&5 -+echo "configure:968: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -981,7 +985,7 @@ - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:985: checking target system type" >&5 -+echo "configure:989: checking target system type" >&5 - - target_alias=$target - case "$target_alias" in -@@ -999,7 +1003,7 @@ - echo "$ac_t""$target" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:1003: checking build system type" >&5 -+echo "configure:1007: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -1067,14 +1071,15 @@ - GNOMEUI_VERSION=2.2.0 - GCONF_VERSION=1.2.1 - LIBGNOME_VERSION=2.0 -+STARTUP_NOTIFICATION_VERSION=0.8 - - MISSING_X= --for ac_prog in gawk mawk nawk awk -+for ac_prog in mawk gawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1078: checking for $ac_word" >&5 -+echo "configure:1083: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1172,7 +1177,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:1176: checking for $ac_word" >&5 -+echo "configure:1181: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1214,7 +1219,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1218: checking for $ac_word" >&5 -+echo "configure:1223: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1285,13 +1290,13 @@ - _SAVE_LDFLAGS="$LDFLAGS" - - echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 --echo "configure:1289: checking for host c compiler" >&5 -+echo "configure:1294: checking for host c compiler" >&5 - for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1295: checking for $ac_word" >&5 -+echo "configure:1300: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1326,13 +1331,13 @@ - fi - echo "$ac_t""$HOST_CC" 1>&6 - echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 --echo "configure:1330: checking for host c++ compiler" >&5 -+echo "configure:1335: checking for host c++ compiler" >&5 - for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1336: checking for $ac_word" >&5 -+echo "configure:1341: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1381,7 +1386,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1385: checking for $ac_word" >&5 -+echo "configure:1390: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1416,7 +1421,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1420: checking for $ac_word" >&5 -+echo "configure:1425: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1451,16 +1456,16 @@ - LDFLAGS="$HOST_LDFLAGS" - - echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1460: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 - else -@@ -1475,16 +1480,16 @@ - CFLAGS="$HOST_CXXFLAGS" - - echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1484: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 - else -@@ -1513,7 +1518,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1517: checking for $ac_word" >&5 -+echo "configure:1522: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1547,7 +1552,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1551: checking for $ac_word" >&5 -+echo "configure:1556: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1577,7 +1582,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1581: checking for $ac_word" >&5 -+echo "configure:1586: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1628,7 +1633,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1632: checking for $ac_word" >&5 -+echo "configure:1637: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1660,7 +1665,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1669: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1671,12 +1676,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1675 "configure" -+#line 1680 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1702,12 +1707,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1711: checking whether we are using GNU C" >&5 -+echo "configure:1716: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1716,7 +1721,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1735,7 +1740,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1744: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1771,7 +1776,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1775: checking for $ac_word" >&5 -+echo "configure:1780: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1807,7 +1812,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1811: checking for $ac_word" >&5 -+echo "configure:1816: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1839,7 +1844,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1848: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1850,12 +1855,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1854 "configure" -+#line 1859 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1881,12 +1886,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1890: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:1890: checking whether we are using GNU C++" >&5 -+echo "configure:1895: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1895,7 +1900,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -1914,7 +1919,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1923: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1945,57 +1950,6 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext < --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - - case "$build:$target" in - powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -2009,7 +1963,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2013: checking for $ac_word" >&5 -+echo "configure:1967: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2044,7 +1998,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2048: checking for $ac_word" >&5 -+echo "configure:2002: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2079,7 +2033,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2083: checking for $ac_word" >&5 -+echo "configure:2037: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2120,7 +2074,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2124: checking for $ac_word" >&5 -+echo "configure:2078: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2155,7 +2109,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2159: checking for $ac_word" >&5 -+echo "configure:2113: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2190,7 +2144,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2194: checking for $ac_word" >&5 -+echo "configure:2148: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2228,7 +2182,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2232: checking for $ac_word" >&5 -+echo "configure:2186: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2258,7 +2212,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2262: checking for $ac_word" >&5 -+echo "configure:2216: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2309,7 +2263,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2313: checking for $ac_word" >&5 -+echo "configure:2267: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2341,7 +2295,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2299: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2352,12 +2306,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2356 "configure" -+#line 2310 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2383,12 +2337,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2341: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:2392: checking whether we are using GNU C" >&5 -+echo "configure:2346: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2397,7 +2351,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -2416,7 +2370,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2374: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2452,7 +2406,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2456: checking for $ac_word" >&5 -+echo "configure:2410: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2484,7 +2438,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2442: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2495,12 +2449,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2499 "configure" -+#line 2453 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2526,12 +2480,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2484: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:2535: checking whether we are using GNU C++" >&5 -+echo "configure:2489: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2540,7 +2494,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -2559,7 +2513,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2517: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2590,61 +2544,10 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext < --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2648: checking for $ac_word" >&5 -+echo "configure:2551: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2676,7 +2579,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2680: checking for $ac_word" >&5 -+echo "configure:2583: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2717,7 +2620,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2721: checking for $ac_word" >&5 -+echo "configure:2624: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2752,7 +2655,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2756: checking for $ac_word" >&5 -+echo "configure:2659: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2787,7 +2690,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2791: checking for $ac_word" >&5 -+echo "configure:2694: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2822,7 +2725,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2826: checking for $ac_word" >&5 -+echo "configure:2729: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2911,7 +2814,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2915: checking for $ac_word" >&5 -+echo "configure:2818: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2953,14 +2856,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2978,14 +2881,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - int main() { - unsigned *test = new unsigned(42); - ; return 0; } - EOF --if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -3041,7 +2944,7 @@ - _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` - # Add flags if necessary - echo $ac_n "checking for midl flags""... $ac_c" 1>&6 --echo "configure:3045: checking for midl flags" >&5 -+echo "configure:2948: checking for midl flags" >&5 - if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then - # Starting with MIDL version 6.0.359, the MIDL compiler - # generates /Oicf /robust stubs by default, which is not -@@ -3063,9 +2966,9 @@ - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` - _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` - echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 --echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5 -+echo "configure:2970: checking for w32api version >= $W32API_VERSION" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -3077,7 +2980,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - res=yes - else -@@ -3093,7 +2996,7 @@ - fi - # Check windres version - echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 --echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5 -+echo "configure:3000: checking for windres version >= $WINDRES_VERSION" >&5 - _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` - echo "$ac_t""$_WINDRES_VERSION" 1>&6 - _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` -@@ -3120,7 +3023,7 @@ - SKIP_COMPILER_CHECKS=1 - SKIP_LIBRARY_CHECKS=1 - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3124: checking how to run the C preprocessor" >&5 -+echo "configure:3027: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3135,13 +3038,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3152,13 +3055,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3169,13 +3072,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3203,17 +3106,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3207: checking for $ac_hdr" >&5 -+echo "configure:3110: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3244,10 +3147,10 @@ - if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then - if test "x$CC" != xcc; then - echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 --echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:3151: checking whether $CC and cc understand -c and -o together" >&5 - else - echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 --echo "configure:3251: checking whether cc understands -c and -o together" >&5 -+echo "configure:3154: checking whether cc understands -c and -o together" >&5 - fi - set dummy $CC; ac_cc="`echo $2 | - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" -@@ -3259,16 +3162,16 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' --if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. -- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - ac_try='cc -c conftest.c -o conftest.o 1>&5' -- if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - # cc works too. - : -@@ -3304,7 +3207,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3308: checking how to run the C preprocessor" >&5 -+echo "configure:3211: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3319,13 +3222,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3336,13 +3239,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3353,13 +3256,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3384,7 +3287,7 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:3388: checking how to run the C++ preprocessor" >&5 -+echo "configure:3291: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3397,12 +3300,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -3449,7 +3352,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3453: checking for a BSD compatible install" >&5 -+echo "configure:3356: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3502,7 +3405,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3506: checking whether ln -s works" >&5 -+echo "configure:3409: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3527,7 +3430,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3531: checking for $ac_word" >&5 -+echo "configure:3434: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3567,7 +3470,7 @@ - fi - - echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 --echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5 -+echo "configure:3474: checking for minimum required perl version >= $PERL_VERSION" >&5 - _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - echo "$ac_t""$_perl_version" 1>&6 -@@ -3577,7 +3480,7 @@ - fi - - echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 --echo "configure:3581: checking for full perl installation" >&5 -+echo "configure:3484: checking for full perl installation" >&5 - _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - if test "$_perl_res" != 0; then -@@ -3590,7 +3493,7 @@ - # Extract the first word of "doxygen", so it can be a program name with args. - set dummy doxygen; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3594: checking for $ac_word" >&5 -+echo "configure:3497: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3626,7 +3529,7 @@ - # Extract the first word of "whoami", so it can be a program name with args. - set dummy whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3630: checking for $ac_word" >&5 -+echo "configure:3533: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3662,7 +3565,7 @@ - # Extract the first word of "autoconf", so it can be a program name with args. - set dummy autoconf; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3666: checking for $ac_word" >&5 -+echo "configure:3569: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3698,7 +3601,7 @@ - # Extract the first word of "unzip", so it can be a program name with args. - set dummy unzip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3702: checking for $ac_word" >&5 -+echo "configure:3605: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3736,7 +3639,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3740: checking for $ac_word" >&5 -+echo "configure:3643: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3777,7 +3680,7 @@ - # Extract the first word of "makedepend", so it can be a program name with args. - set dummy makedepend; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3781: checking for $ac_word" >&5 -+echo "configure:3684: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3812,7 +3715,7 @@ - # Extract the first word of "xargs", so it can be a program name with args. - set dummy xargs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3816: checking for $ac_word" >&5 -+echo "configure:3719: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3875,7 +3778,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3879: checking for $ac_word" >&5 -+echo "configure:3782: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3925,7 +3828,7 @@ - # Extract the first word of "sdp", so it can be a program name with args. - set dummy sdp; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3929: checking for $ac_word" >&5 -+echo "configure:3832: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4056,7 +3959,7 @@ - fi - - echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 --echo "configure:4060: checking for valid compiler/Mac OS X SDK combination" >&5 -+echo "configure:3963: checking for valid compiler/Mac OS X SDK combination" >&5 - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -4065,7 +3968,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - int main() { return 0; } -@@ -4073,7 +3976,7 @@ - result=yes - ; return 0; } - EOF --if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result=no - else -@@ -4098,7 +4001,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:4102: checking for $ac_word" >&5 -+echo "configure:4005: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4141,7 +4044,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:4145: checking for $ac_word" >&5 -+echo "configure:4048: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4209,7 +4112,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:4213: checking for X" >&5 -+echo "configure:4116: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -4271,12 +4174,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4183: \"$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* -@@ -4345,14 +4248,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -4458,17 +4361,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:4462: checking whether -R must be followed by a space" >&5 -+echo "configure:4365: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -4484,14 +4387,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -4523,7 +4426,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:4527: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:4430: checking for dnet_ntoa in -ldnet" >&5 - ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4531,7 +4434,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4452: \"$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 -@@ -4567,7 +4470,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:4571: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:4474: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4575,7 +4478,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4496: \"$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 -@@ -4618,12 +4521,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4622: checking for gethostbyname" >&5 -+echo "configure:4525: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -4670,7 +4573,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4674: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4577: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4678,7 +4581,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4599: \"$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 -@@ -4722,12 +4625,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4726: checking for connect" >&5 -+echo "configure:4629: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -4774,7 +4677,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4778: checking for connect in -lsocket" >&5 -+echo "configure:4681: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4782,7 +4685,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4703: \"$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 -@@ -4820,12 +4723,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:4824: checking for remove" >&5 -+echo "configure:4727: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" - else -@@ -4872,7 +4775,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:4876: checking for remove in -lposix" >&5 -+echo "configure:4779: checking for remove in -lposix" >&5 - ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4880,7 +4783,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4801: \"$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 -@@ -4918,12 +4821,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:4922: checking for shmat" >&5 -+echo "configure:4825: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" - else -@@ -4970,7 +4873,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:4974: checking for shmat in -lipc" >&5 -+echo "configure:4877: checking for shmat in -lipc" >&5 - ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4978,7 +4881,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4899: \"$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 -@@ -5025,7 +4928,7 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:5029: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:4932: checking for IceConnectionNumber in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5033,7 +4936,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4954: \"$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 -@@ -5485,7 +5388,7 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:5489: checking whether ld has archive extraction flags" >&5 -+echo "configure:5392: checking whether ld has archive extraction flags" >&5 - if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5502,14 +5405,14 @@ - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_mkshlib_force_and_unforce=$line; break - else -@@ -5542,7 +5445,7 @@ - ' - - echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:5546: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:5449: 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 -@@ -5556,14 +5459,14 @@ - - ac_cv_static_assertion_macros_work="yes" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5573,14 +5476,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5596,14 +5499,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -5613,14 +5516,14 @@ - fi - rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -5655,16 +5558,16 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5659: checking for 64-bit OS" >&5 -+echo "configure:5562: checking for 64-bit OS" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -5822,9 +5725,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:5826: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5729: 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:5740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -5871,17 +5774,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5875: checking for $ac_hdr" >&5 -+echo "configure:5778: 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:5885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5788: \"$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* -@@ -5923,7 +5826,7 @@ - LIBS="$LIBS -lbe" - if test "$COMPILE_ENVIRONMENT"; then - echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5927: checking for main in -lbind" >&5 -+echo "configure:5830: 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 -@@ -5931,14 +5834,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:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5959,7 +5862,7 @@ - fi - - echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:5963: checking for main in -lzeta" >&5 -+echo "configure:5866: 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 -@@ -5967,14 +5870,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:5881: \"$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 -@@ -6042,18 +5945,18 @@ - MACOSX=1 - - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:6046: checking for -dead_strip option to ld" >&5 -+echo "configure:5949: 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:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -6921,14 +6824,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:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -6956,7 +6859,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:6960: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:6863: 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. -@@ -6966,7 +6869,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -7125,12 +7028,12 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:7129: checking for ANSI C header files" >&5 -+echo "configure:7032: 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 -@@ -7138,7 +7041,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7045: \"$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* -@@ -7155,7 +7058,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 -@@ -7173,7 +7076,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 -@@ -7194,7 +7097,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -7205,7 +7108,7 @@ - exit (0); } - - EOF --if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -7229,12 +7132,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:7233: checking for working const" >&5 -+echo "configure:7136: 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:7190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -7304,12 +7207,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7308: checking for mode_t" >&5 -+echo "configure:7211: 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 -@@ -7337,12 +7240,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7341: checking for off_t" >&5 -+echo "configure:7244: 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 -@@ -7370,12 +7273,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7374: checking for pid_t" >&5 -+echo "configure:7277: 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 -@@ -7403,12 +7306,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7407: checking for size_t" >&5 -+echo "configure:7310: 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 -@@ -7436,12 +7339,12 @@ - fi - - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7440: checking for st_blksize in struct stat" >&5 -+echo "configure:7343: 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 -@@ -7449,7 +7352,7 @@ - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -7470,12 +7373,12 @@ - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7474: checking for siginfo_t" >&5 -+echo "configure:7377: 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 < -@@ -7483,7 +7386,7 @@ - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -7517,12 +7420,12 @@ - fi - - echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7521: checking for int16_t" >&5 -+echo "configure:7424: 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 -@@ -7530,7 +7433,7 @@ - int16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int16_t=true - else -@@ -7552,12 +7455,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7556: checking for int32_t" >&5 -+echo "configure:7459: 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 -@@ -7565,7 +7468,7 @@ - int32_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int32_t=true - else -@@ -7587,12 +7490,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7591: checking for int64_t" >&5 -+echo "configure:7494: 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 -@@ -7600,7 +7503,7 @@ - int64_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64_t=true - else -@@ -7622,12 +7525,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7626: checking for int64" >&5 -+echo "configure:7529: 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 -@@ -7635,7 +7538,7 @@ - int64 foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64=true - else -@@ -7657,12 +7560,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7661: checking for uint" >&5 -+echo "configure:7564: 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 -@@ -7670,7 +7573,7 @@ - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -7692,12 +7595,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7696: checking for uint_t" >&5 -+echo "configure:7599: 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 -@@ -7705,7 +7608,7 @@ - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -7727,12 +7630,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7731: checking for uint16_t" >&5 -+echo "configure:7634: 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 -@@ -7740,7 +7643,7 @@ - uint16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint16_t=true - else -@@ -7771,12 +7674,12 @@ - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7775: checking for uname.domainname" >&5 -+echo "configure:7678: 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() { -@@ -7784,7 +7687,7 @@ - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:7788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -7808,12 +7711,12 @@ - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:7812: checking for uname.__domainname" >&5 -+echo "configure:7715: 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() { -@@ -7821,7 +7724,7 @@ - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -7854,12 +7757,12 @@ - - - echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:7858: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7761: checking for usable wchar_t (2 bytes, unsigned)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - $configure_static_assert_macros -@@ -7868,7 +7771,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:7872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_v2="yes" - else -@@ -7901,12 +7804,12 @@ - CXXFLAGS="$CXXFLAGS -fshort-wchar" - - echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:7905: checking for compiler -fshort-wchar option" >&5 -+echo "configure:7808: checking for compiler -fshort-wchar option" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - $configure_static_assert_macros -@@ -7915,7 +7818,7 @@ - CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) - ; return 0; } - EOF --if { (eval echo configure:7919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_usable_wchar_option_v2="yes" - else -@@ -7949,7 +7852,7 @@ - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:7953: checking for visibility(hidden) attribute" >&5 -+echo "configure:7856: 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 -@@ -7974,7 +7877,7 @@ - - - echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:7978: checking for visibility(default) attribute" >&5 -+echo "configure:7881: 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 -@@ -7999,7 +7902,7 @@ - - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:8003: checking for visibility pragma support" >&5 -+echo "configure:7906: 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 -@@ -8024,7 +7927,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:8028: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:7931: 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 -@@ -8052,7 +7955,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:8056: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:7959: 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 -@@ -8100,12 +8003,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:8104: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:8007: 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> -@@ -8113,7 +8016,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:8117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -8138,7 +8041,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:8142: checking for opendir in -ldir" >&5 -+echo "configure:8045: 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 -@@ -8146,7 +8049,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:8064: \"$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 -@@ -8179,7 +8082,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:8183: checking for opendir in -lx" >&5 -+echo "configure:8086: 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 -@@ -8187,7 +8090,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:8105: \"$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 -@@ -8230,17 +8133,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8234: checking for $ac_hdr" >&5 -+echo "configure:8137: 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:8244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8147: \"$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* -@@ -8270,17 +8173,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8274: checking for $ac_hdr" >&5 -+echo "configure:8177: 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:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8187: \"$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* -@@ -8310,17 +8213,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8314: checking for $ac_hdr" >&5 -+echo "configure:8217: 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:8324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8227: \"$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* -@@ -8350,17 +8253,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8354: checking for $ac_hdr" >&5 -+echo "configure:8257: 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:8364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8267: \"$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* -@@ -8390,17 +8293,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8394: checking for $ac_hdr" >&5 -+echo "configure:8297: 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:8404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8307: \"$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* -@@ -8431,17 +8334,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8435: checking for $ac_hdr" >&5 -+echo "configure:8338: 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:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8348: \"$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* -@@ -8472,17 +8375,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8476: checking for $ac_hdr" >&5 -+echo "configure:8379: 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:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8389: \"$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* -@@ -8519,17 +8422,17 @@ - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8523: checking for new" >&5 -+echo "configure:8426: 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:8533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8570,17 +8473,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8574: checking for $ac_hdr" >&5 -+echo "configure:8477: 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:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8487: \"$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* -@@ -8614,7 +8517,7 @@ - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8618: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8521: 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 -@@ -8622,7 +8525,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:8540: \"$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 -@@ -8663,7 +8566,7 @@ - ;; - esac - echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8667: checking for atan in -lm" >&5 -+echo "configure:8570: 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 -@@ -8671,7 +8574,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:8589: \"$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 -@@ -8716,7 +8619,7 @@ - ;; - *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8720: checking for dlopen in -ldl" >&5 -+echo "configure:8623: 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 -@@ -8724,7 +8627,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:8642: \"$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 -@@ -8752,17 +8655,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:8756: checking for dlfcn.h" >&5 -+echo "configure:8659: 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:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8669: \"$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* -@@ -8798,7 +8701,7 @@ - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:8802: checking for demangle in -lC_r" >&5 -+echo "configure:8705: 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 -@@ -8806,7 +8709,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:8724: \"$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 -@@ -8847,7 +8750,7 @@ - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:8851: checking for demangle in -lC" >&5 -+echo "configure:8754: 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 -@@ -8855,7 +8758,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:8773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8897,7 +8800,7 @@ - esac - fi - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:8901: checking for socket in -lsocket" >&5 -+echo "configure:8804: 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 -@@ -8905,7 +8808,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: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 -@@ -8961,7 +8864,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:8965: checking for XDrawLines in -lX11" >&5 -+echo "configure:8868: 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 -@@ -8969,7 +8872,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:8887: \"$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 -@@ -9002,7 +8905,7 @@ - fi - - echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:9006: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8909: 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 -@@ -9010,7 +8913,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:8928: \"$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 -@@ -9045,7 +8948,7 @@ - - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9049: checking for XtFree in -lXt" >&5 -+echo "configure:8952: 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 -@@ -9053,7 +8956,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:8971: \"$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 -@@ -9085,7 +8988,7 @@ - - unset ac_cv_lib_Xt_XtFree - echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:9089: checking for IceFlush in -lICE" >&5 -+echo "configure:8992: 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 -@@ -9093,7 +8996,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:9011: \"$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 -@@ -9125,7 +9028,7 @@ - fi - - echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:9129: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:9032: 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 -@@ -9133,7 +9036,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:9051: \"$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 -@@ -9165,7 +9068,7 @@ - fi - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:9169: checking for XtFree in -lXt" >&5 -+echo "configure:9072: 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 -@@ -9173,7 +9076,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:9091: \"$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 -@@ -9218,7 +9121,7 @@ - esac - - echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 --echo "configure:9222: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:9125: 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 -@@ -9226,7 +9129,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:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9259,17 +9162,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:9263: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:9166: 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:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9176: \"$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* -@@ -9292,7 +9195,7 @@ - - - echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:9296: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:9199: 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 -@@ -9300,7 +9203,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:9218: \"$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 -@@ -9333,17 +9236,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:9337: checking for X11/extensions/XShm.h" >&5 -+echo "configure:9240: 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:9347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9250: \"$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* -@@ -9373,7 +9276,7 @@ - fi - - echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9377: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:9280: 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 -@@ -9381,7 +9284,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:9299: \"$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 -@@ -9414,17 +9317,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:9418: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:9321: 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:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9331: \"$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* -@@ -9498,7 +9401,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:9502: checking for $ac_word" >&5 -+echo "configure:9405: 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 -@@ -9534,7 +9437,7 @@ - - min_ft_version=6.1.0 - echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9538: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9441: checking for FreeType - version >= $min_ft_version" >&5 - no_ft="" - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes -@@ -9582,7 +9485,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -9608,7 +9511,7 @@ - } - - EOF --if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -9660,7 +9563,7 @@ - - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:9664: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9567: checking for pthread_create in -lpthreads" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9682,7 +9585,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:9686: checking for pthread_create in -lpthread" >&5 -+echo "configure:9589: checking for pthread_create in -lpthread" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9704,7 +9607,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:9708: checking for pthread_create in -lc_r" >&5 -+echo "configure:9611: checking for pthread_create in -lc_r" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9726,7 +9629,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:9730: checking for pthread_create in -lc" >&5 -+echo "configure:9633: checking for pthread_create in -lc" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9782,7 +9685,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:9786: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9689: 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 -@@ -9805,7 +9708,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:9809: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9712: 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 -@@ -9900,7 +9803,7 @@ - fi - - echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:9904: checking whether mmap() sees write()s" >&5 -+echo "configure:9807: checking whether mmap() sees write()s" >&5 - - - mmap_test_prog=' -@@ -9939,11 +9842,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:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -9968,13 +9871,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:9972: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9875: 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 -@@ -9992,7 +9895,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext < - Autoconf TCGETA -@@ -10014,7 +9917,7 @@ - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:10018: checking for 8-bit clean memcmp" >&5 -+echo "configure:9921: 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 -@@ -10022,7 +9925,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:9939: \"$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 -@@ -10052,12 +9955,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:10056: checking for $ac_func" >&5 -+echo "configure:9959: 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:9987: \"$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 -@@ -10107,12 +10010,12 @@ - for ac_func in flockfile getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10111: checking for $ac_func" >&5 -+echo "configure:10014: 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:10042: \"$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 -@@ -10164,12 +10067,12 @@ - for ac_func in localtime_r strtok_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10168: checking for $ac_func" >&5 -+echo "configure:10071: 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:10099: \"$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 -@@ -10228,19 +10131,19 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:10232: checking for wcrtomb" >&5 -+echo "configure:10135: 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:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -10260,19 +10163,19 @@ - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:10264: checking for mbrtowc" >&5 -+echo "configure:10167: 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:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -10301,12 +10204,12 @@ - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:10305: checking for res_ninit()" >&5 -+echo "configure:10208: 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:10225: \"$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 -@@ -10348,12 +10251,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10352: checking for gnu_get_libc_version()" >&5 -+echo "configure:10255: 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:10271: \"$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 -@@ -10393,7 +10296,7 @@ - *) - - echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10397: checking for iconv in -lc" >&5 -+echo "configure:10300: 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 -@@ -10401,7 +10304,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:10322: \"$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 -@@ -10434,7 +10337,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10438: checking for iconv in -liconv" >&5 -+echo "configure:10341: 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 -@@ -10442,7 +10345,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:10363: \"$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 -@@ -10475,7 +10378,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10479: checking for libiconv in -liconv" >&5 -+echo "configure:10382: 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 -@@ -10483,7 +10386,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:10404: \"$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 -@@ -10524,12 +10427,12 @@ - _SAVE_LIBS=$LIBS - LIBS="$LIBS $_ICONV_LIBS" - echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10528: checking for iconv()" >&5 -+echo "configure:10431: 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 < -@@ -10543,7 +10446,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_iconv=yes - else -@@ -10567,12 +10470,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:10571: checking for iconv() with const input" >&5 -+echo "configure:10474: 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 < -@@ -10587,7 +10490,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_const_iconv=yes - else -@@ -10616,19 +10519,19 @@ - - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10620: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10523: 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:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes - else -@@ -10660,7 +10563,7 @@ - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:10664: checking for an implementation of va_copy()" >&5 -+echo "configure:10567: 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 -@@ -10670,7 +10573,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10684,7 +10587,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10591: \"$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 -@@ -10701,7 +10604,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:10705: checking for an implementation of __va_copy()" >&5 -+echo "configure:10608: 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 -@@ -10711,7 +10614,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10725,7 +10628,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10632: \"$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 -@@ -10742,7 +10645,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:10746: checking whether va_lists can be copied by value" >&5 -+echo "configure:10649: 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 -@@ -10752,7 +10655,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10766,7 +10669,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10673: \"$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 -@@ -10865,7 +10768,7 @@ - if test "$GNU_CXX"; then - - echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:10869: checking for C++ exceptions flag" >&5 -+echo "configure:10772: 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 -@@ -10900,12 +10803,12 @@ - HAVE_GCC3_ABI= - if test "$GNU_CC"; then - echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:10904: checking for gcc 3.0 ABI" >&5 -+echo "configure:10807: 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:10825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_three_abi="yes" - else -@@ -10942,12 +10845,12 @@ - - - echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:10946: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10849: 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:10864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_explicit=yes - else -@@ -10978,12 +10881,12 @@ - fi - - echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:10982: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10885: 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:10909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_typename=yes - else -@@ -11023,12 +10926,12 @@ - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:11027: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10930: 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 {}; -@@ -11038,7 +10941,7 @@ - X y_x; - ; return 0; } - EOF --if { (eval echo configure:11042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -11060,12 +10963,12 @@ - - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11064: checking whether partial template specialization works" >&5 -+echo "configure:10967: 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 {}; -@@ -11073,7 +10976,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -11094,12 +10997,12 @@ - fi - - echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:11098: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:11001: 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 -@@ -11111,7 +11014,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_derived_template_operators=no - else -@@ -11133,12 +11036,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:11137: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:11040: 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 { }; -@@ -11147,7 +11050,7 @@ - Derived bar; return foo(bar); - ; return 0; } - EOF --if { (eval echo configure:11151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_cpp_template_cast_to_base=no - else -@@ -11168,12 +11071,12 @@ - fi - - echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:11172: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:11075: 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 { -@@ -11194,7 +11097,7 @@ - a(&i); - ; return 0; } - EOF --if { (eval echo configure:11198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_can_resolve_const_ambiguity=yes - else -@@ -11216,12 +11119,12 @@ - - - echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:11220: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:11123: 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:11136: \"$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:11147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_access_changing_using2=no - else -@@ -11268,12 +11171,12 @@ - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11272: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11175: 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:11196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -11310,19 +11213,19 @@ - fi - - echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:11314: checking for \"std::\" namespace" >&5 -+echo "configure:11217: 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:11326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_namespace_std=yes - else -@@ -11343,12 +11246,12 @@ - fi - - echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11347: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:11250: 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 {}; -@@ -11358,7 +11261,7 @@ - T1 a,b; return a != b; - ; return 0; } - EOF --if { (eval echo configure:11362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_unambiguous_std_notequal=unambiguous - else -@@ -11380,12 +11283,12 @@ - - - echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11384: checking for C++ reinterpret_cast" >&5 -+echo "configure:11287: 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:11397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_reinterpret_cast=yes - else -@@ -11414,7 +11317,7 @@ - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11418: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11321: 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 -@@ -11422,8 +11325,11 @@ - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <(suby)))); - } - EOF --if { (eval echo configure:11442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11348: \"$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 -@@ -11462,19 +11368,19 @@ - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11466: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11372: 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:11384: \"$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 -@@ -11497,12 +11403,12 @@ - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11501: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11407: 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 {}; -@@ -11513,7 +11419,7 @@ - Foo f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -11545,19 +11451,19 @@ - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11549: checking for LC_MESSAGES" >&5 -+echo "configure:11455: 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:11561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -11638,7 +11544,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:11642: checking for $ac_word" >&5 -+echo "configure:11548: 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 -@@ -11673,7 +11579,7 @@ - - min_nspr_version=4.0.0 - echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 --echo "configure:11677: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11583: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" = "no"; then -@@ -11775,7 +11681,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:11779: checking for $ac_word" >&5 -+echo "configure:11685: 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 -@@ -11810,7 +11716,7 @@ - - min_nss_version=3.0.0 - echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 --echo "configure:11814: checking for NSS - version >= $min_nss_version (skipping)" >&5 -+echo "configure:11720: checking for NSS - version >= $min_nss_version (skipping)" >&5 - - no_nss="" - if test "$NSS_CONFIG" = "no"; then -@@ -11883,7 +11789,7 @@ - SYSTEM_JPEG= - else - echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:11887: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11793: 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 -@@ -11891,7 +11797,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:11812: \"$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 -@@ -11931,7 +11837,7 @@ - SYSTEM_JPEG= - else - cat > conftest.$ac_ext < - #include -@@ -11945,7 +11851,7 @@ - } - - EOF --if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_JPEG=1 - else -@@ -11986,7 +11892,7 @@ - SYSTEM_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:11990: checking for gzread in -lz" >&5 -+echo "configure:11896: 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 -@@ -11994,7 +11900,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:11915: \"$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 -@@ -12033,7 +11939,7 @@ - SYSTEM_ZLIB= - else - cat > conftest.$ac_ext < -@@ -12054,7 +11960,7 @@ - } - - EOF --if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_ZLIB=1 - else -@@ -12097,7 +12003,7 @@ - SYSTEM_PNG= - else - echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:12101: checking for png_get_valid in -lpng" >&5 -+echo "configure:12007: 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 -@@ -12105,7 +12011,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:12026: \"$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 -@@ -12144,7 +12050,7 @@ - SYSTEM_PNG= - else - cat > conftest.$ac_ext < - #include -@@ -12158,7 +12064,7 @@ - } - - EOF --if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_PNG=1 - else -@@ -12408,7 +12314,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:12412: checking for $ac_word" >&5 -+echo "configure:12318: 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 -@@ -12443,7 +12349,7 @@ - - min_gtk_version=$GTK_VERSION - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 --echo "configure:12447: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:12353: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes -@@ -12466,7 +12372,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -12544,7 +12450,7 @@ - } - - EOF --if { (eval echo configure:12548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -12579,7 +12485,7 @@ - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat > conftest.$ac_ext < -@@ -12589,7 +12495,7 @@ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:12593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12499: \"$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" -@@ -12641,7 +12547,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:12645: checking for $ac_word" >&5 -+echo "configure:12551: 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 -@@ -12685,19 +12591,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:12689: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12595: 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:12696: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12602: 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:12701: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12607: 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\"`" -@@ -12762,7 +12668,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:12766: checking for $ac_word" >&5 -+echo "configure:12672: 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 -@@ -12814,7 +12720,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 --echo "configure:12818: checking for main in -lqt" >&5 -+echo "configure:12724: 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 -@@ -12822,14 +12728,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:12739: \"$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 -@@ -12848,7 +12754,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 --echo "configure:12852: checking for main in -lqt-mt" >&5 -+echo "configure:12758: 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 -@@ -12856,14 +12762,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:12773: \"$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 -@@ -12899,9 +12805,9 @@ - LIBS="$LIBS $QT_LIBS" - - echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 --echo "configure:12903: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12809: checking Qt - version >= $QT_VERSION" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -12912,7 +12818,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:12916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -12943,6 +12849,138 @@ - - - -+if test "$MOZ_ENABLE_GTK2" -+then -+ MOZ_ENABLE_STARTUP_NOTIFICATION= -+ -+ # Check whether --enable-startup-notification or --disable-startup-notification was given. -+if test "${enable_startup_notification+set}" = set; then -+ enableval="$enable_startup_notification" -+ if test "$enableval" = "yes"; then -+ MOZ_ENABLE_STARTUP_NOTIFICATION=force -+ elif test "$enableval" = "no"; then -+ MOZ_ENABLE_STARTUP_NOTIFICATION= -+ else -+ { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; } -+ fi -+fi -+ -+ -+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" -+ then -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:12879: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac -+fi -+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+if test -n "$PKG_CONFIG"; then -+ echo "$ac_t""$PKG_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 -+echo "configure:12923: 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:12930: 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:12935: 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\"`" -+ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 -+ else -+ MOZ_STARTUP_NOTIFICATION_CFLAGS="" -+ MOZ_STARTUP_NOTIFICATION_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` -+ -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ MOZ_ENABLE_STARTUP_NOTIFICATION=1 -+ else -+ -+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force" -+ then -+ { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; } -+ fi -+ MOZ_ENABLE_STARTUP_NOTIFICATION= -+ -+ fi -+ -+ fi -+ -+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then -+ cat >> confdefs.h <<\EOF -+#define MOZ_ENABLE_STARTUP_NOTIFICATION 1 -+EOF -+ -+ fi -+ -+ TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" -+fi -+ -+ -+ -+ -+ - - - -@@ -13508,7 +13546,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:13512: checking for $ac_word" >&5 -+echo "configure:13550: 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 -@@ -13552,19 +13590,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:13556: checking for xft" >&5 -+echo "configure:13594: 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:13563: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:13601: 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:13568: checking MOZ_XFT_LIBS" >&5 -+echo "configure:13606: 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\"`" -@@ -13599,7 +13637,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:13603: checking for $ac_word" >&5 -+echo "configure:13641: 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 -@@ -13643,19 +13681,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 --echo "configure:13647: checking for pango >= 1.1.0" >&5 -+echo "configure:13685: checking for pango >= 1.1.0" >&5 - - if $PKG_CONFIG --exists "pango >= 1.1.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13654: checking _PANGOCHK_CFLAGS" >&5 -+echo "configure:13692: checking _PANGOCHK_CFLAGS" >&5 - _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` - echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 - - echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 --echo "configure:13659: checking _PANGOCHK_LIBS" >&5 -+echo "configure:13697: checking _PANGOCHK_LIBS" >&5 - ## don't use --libs since that can do evil things like add - ## -Wl,--export-dynamic - _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" -@@ -13715,7 +13753,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:13719: checking for $ac_word" >&5 -+echo "configure:13757: 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 -@@ -13759,19 +13797,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 --echo "configure:13763: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 -+echo "configure:13801: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 - - if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 --echo "configure:13770: checking MOZ_PANGO_CFLAGS" >&5 -+echo "configure:13808: checking MOZ_PANGO_CFLAGS" >&5 - MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` - echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 --echo "configure:13775: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13813: checking MOZ_PANGO_LIBS" >&5 - ## don't use --libs since that can do evil things like add - ## -Wl,--export-dynamic - MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" -@@ -13839,7 +13877,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 --echo "configure:13843: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13881: 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 -@@ -13847,7 +13885,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:13900: \"$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 -@@ -13931,7 +13969,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:13935: checking for $ac_word" >&5 -+echo "configure:13973: 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 -@@ -13975,19 +14013,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:13979: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:14017: 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:13986: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:14024: 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:13991: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:14029: 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\"`" -@@ -14038,7 +14076,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:14042: checking for $ac_word" >&5 -+echo "configure:14080: 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 -@@ -14082,19 +14120,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:14086: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:14124: 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:14093: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:14131: 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:14098: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:14136: 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\"`" -@@ -14131,6 +14169,7 @@ - - - -+ - - if test "$MOZ_ENABLE_LIBGNOME" - then -@@ -14141,7 +14180,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:14145: checking for $ac_word" >&5 -+echo "configure:14184: 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 -@@ -14185,19 +14224,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:14189: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:14228: 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:14196: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:14235: 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:14201: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:14240: 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\"`" -@@ -14275,7 +14314,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:14279: checking for $ac_word" >&5 -+echo "configure:14318: 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 -@@ -14319,19 +14358,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:14323: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:14362: 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:14330: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:14369: 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:14335: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:14374: 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\"`" -@@ -14382,6 +14421,221 @@ - - - -+if test "$MOZ_ENABLE_GTK2" -+then -+ # Check whether --enable-dbus or --disable-dbus was given. -+if test "${enable_dbus+set}" = set; then -+ enableval="$enable_dbus" -+ if test "$enableval" = "yes"; then -+ MOZ_ENABLE_DBUS=1 -+ elif test "$enableval" = "no"; then -+ MOZ_ENABLE_DBUS= -+ else -+ { echo "configure: error: Option, dbus, does not take an argument ($enableval)." 1>&2; exit 1; } -+ fi -+fi -+ -+ -+ if test "$MOZ_ENABLE_DBUS" -+ then -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:14449: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac -+fi -+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+if test -n "$PKG_CONFIG"; then -+ echo "$ac_t""$PKG_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for dbus-glib-1""... $ac_c" 1>&6 -+echo "configure:14493: 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:14500: 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:14505: 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\"`" -+ echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 -+ else -+ MOZ_DBUS_GLIB_CFLAGS="" -+ MOZ_DBUS_GLIB_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ MOZ_DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` -+ echo $MOZ_DBUS_GLIB_PKG_ERRORS -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ : -+ else -+ { echo "configure: error: Library requirements (dbus-glib-1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -+ fi -+ -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:14540: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac -+fi -+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+if test -n "$PKG_CONFIG"; then -+ echo "$ac_t""$PKG_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 -+echo "configure:14584: 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:14591: 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:14596: 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\"`" -+ echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 -+ else -+ MOZ_GTHREAD_CFLAGS="" -+ MOZ_GTHREAD_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ MOZ_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` -+ echo $MOZ_GTHREAD_PKG_ERRORS -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ : -+ else -+ { echo "configure: error: Library requirements (gthread-2.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 -+ -+ fi -+ -+ if test "$MOZ_ENABLE_DBUS"; then -+ cat >> confdefs.h <<\EOF -+#define MOZ_ENABLE_DBUS 1 -+EOF -+ -+ fi -+fi -+ -+ -+ -+ -+ -+ -+ - if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \ - && test "$MOZ_ENABLE_COREXFONTS" \ - || test "$MOZ_ENABLE_XLIB" \ -@@ -14817,7 +15071,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:14821: checking for $ac_word" >&5 -+echo "configure:15075: 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 -@@ -14853,7 +15107,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:14857: checking for $ac_word" >&5 -+echo "configure:15111: 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 -@@ -14928,6 +15182,13 @@ - MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` - fi - -+if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then -+ if test -n "$MOZ_X11"; then -+ echo "configure: warning: Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS." 1>&2 -+ fi -+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'` -+fi -+ - 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||'` -@@ -15100,7 +15361,7 @@ - gdiplus) - MOZ_SVG_RENDERER_GDIPLUS=1 - echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 --echo "configure:15104: checking for Gdiplus.h" >&5 -+echo "configure:15365: checking for Gdiplus.h" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -15110,7 +15371,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - #include -@@ -15119,7 +15380,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:15123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -15199,7 +15460,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:15203: checking for $ac_word" >&5 -+echo "configure:15464: 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 -@@ -15244,7 +15505,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:15248: checking for $ac_word" >&5 -+echo "configure:15509: 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 -@@ -15313,13 +15574,13 @@ - msvc*|mks*|cygwin*|mingw*|wince*) - if test -n "$MOZ_UPDATER"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:15317: checking for iconv" >&5 -+echo "configure:15578: 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:15323: checking for $ac_word" >&5 -+echo "configure:15584: 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 -@@ -15665,18 +15926,18 @@ - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:15669: checking for valid debug flags" >&5 -+echo "configure:15930: 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:15680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -15717,18 +15978,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:15721: checking for valid optimization flags" >&5 -+echo "configure:15982: 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:15732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -15945,7 +16206,7 @@ - - if test -n "$_ENABLE_EFENCE"; then - echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:15949: checking for malloc in -lefence" >&5 -+echo "configure:16210: 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 -@@ -15953,7 +16214,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:16229: \"$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 -@@ -16065,12 +16326,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:16069: checking for $ac_func" >&5 -+echo "configure:16330: 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:16361: \"$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 -@@ -16339,12 +16600,12 @@ - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:16343: checking for $ac_func" >&5 -+echo "configure:16604: 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:16635: \"$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 -@@ -16508,7 +16769,7 @@ - # Compiler Options - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:16512: checking for gcc -pipe support" >&5 -+echo "configure:16773: 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 -@@ -16523,14 +16784,14 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:16534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -16572,16 +16833,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:16576: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:16837: checking whether compiler supports -Wno-long-long" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16846: \"$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" -@@ -16602,16 +16863,16 @@ - CFLAGS="$CFLAGS -fprofile-generate" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:16606: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:16867: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -16629,16 +16890,16 @@ - else - CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" - echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:16633: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:16894: checking whether C compiler supports -fprofile-arcs" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-arcs" - result="yes" -@@ -16684,16 +16945,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:16688: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:16949: checking whether C++ compiler has -pedantic long long bug" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="no" - else -@@ -16718,13 +16979,16 @@ - fi - - echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:16722: checking for correct temporary object destruction order" >&5 -+echo "configure:16983: 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:17011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -16764,12 +17028,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:16768: checking for correct overload resolution with const and templates" >&5 -+echo "configure:17032: 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 < -@@ -16799,7 +17063,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:16803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -17091,7 +17355,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:17095: checking for $ac_word" >&5 -+echo "configure:17359: 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 -@@ -17135,19 +17399,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:17139: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17403: 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:17146: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17410: 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:17151: checking LIBIDL_LIBS" >&5 -+echo "configure:17415: 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\"`" -@@ -17270,7 +17534,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:17274: checking for $ac_word" >&5 -+echo "configure:17538: 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 -@@ -17305,7 +17569,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17309: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17573: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -17328,7 +17592,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17404,7 +17668,7 @@ - } - - EOF --if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17438,7 +17702,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -17448,7 +17712,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:17452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17716: \"$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" -@@ -17492,7 +17756,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:17496: checking for $ac_word" >&5 -+echo "configure:17760: 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 -@@ -17527,7 +17791,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:17531: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17795: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -17554,7 +17818,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17640,7 +17904,7 @@ - } - - EOF --if { (eval echo configure:17644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17674,7 +17938,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext < -@@ -17685,7 +17949,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17953: \"$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" -@@ -17813,7 +18077,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:17817: checking for $ac_word" >&5 -+echo "configure:18081: 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 -@@ -17848,7 +18112,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17852: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18116: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -17871,7 +18135,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17947,7 +18211,7 @@ - } - - EOF --if { (eval echo configure:17951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17981,7 +18245,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -17991,7 +18255,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:17995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18259: \"$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" -@@ -18035,7 +18299,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:18039: checking for $ac_word" >&5 -+echo "configure:18303: 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 -@@ -18070,7 +18334,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:18074: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:18338: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -18097,7 +18361,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -18183,7 +18447,7 @@ - } - - EOF --if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18217,7 +18481,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext < -@@ -18228,7 +18492,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18496: \"$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" -@@ -18269,7 +18533,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:18273: checking for $ac_word" >&5 -+echo "configure:18537: 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 -@@ -18313,19 +18577,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:18317: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:18581: 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:18324: checking LIBIDL_CFLAGS" >&5 -+echo "configure:18588: 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:18329: checking LIBIDL_LIBS" >&5 -+echo "configure:18593: 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\"`" -@@ -18361,7 +18625,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:18365: checking for $ac_word" >&5 -+echo "configure:18629: 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 -@@ -18398,7 +18662,7 @@ - - if test -n "$ORBIT_CONFIG"; then - echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:18402: checking for ORBit libIDL usability" >&5 -+echo "configure:18666: 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}` -@@ -18415,7 +18679,7 @@ - result="maybe" - else - cat > conftest.$ac_ext < -@@ -18430,7 +18694,7 @@ - } - - EOF --if { (eval echo configure:18434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18698: \"$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" -@@ -18487,7 +18751,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:18491: checking for $ac_word" >&5 -+echo "configure:18755: 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 -@@ -18531,19 +18795,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:18535: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:18799: 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:18542: checking GLIB_CFLAGS" >&5 -+echo "configure:18806: 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:18547: checking GLIB_LIBS" >&5 -+echo "configure:18811: 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\"`" -@@ -18627,7 +18891,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:18631: checking for $ac_word" >&5 -+echo "configure:18895: 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 -@@ -18662,7 +18926,7 @@ - - min_glib_version=${GLIB_VERSION} - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:18666: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:18930: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -18685,7 +18949,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -18761,7 +19025,7 @@ - } - - EOF --if { (eval echo configure:18765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -18795,7 +19059,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -18805,7 +19069,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:18809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19073: \"$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" -@@ -18885,19 +19149,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:18889: checking for working alloca.h" >&5 -+echo "configure:19153: 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:18901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19165: \"$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 -@@ -18918,12 +19182,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:18922: checking for alloca" >&5 -+echo "configure:19186: 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:19219: \"$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 -@@ -18983,12 +19247,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:18987: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19251: 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:19017: checking for $ac_func" >&5 -+echo "configure:19281: 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:19309: \"$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 -@@ -19068,7 +19332,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19072: checking stack direction for C alloca" >&5 -+echo "configure:19336: 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 -@@ -19076,7 +19340,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:19363: \"$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 -@@ -19144,17 +19408,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:19148: checking for $ac_hdr" >&5 -+echo "configure:19412: 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:19158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19422: \"$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* -@@ -19245,7 +19509,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:19249: checking for $ac_word" >&5 -+echo "configure:19513: 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 -@@ -19289,19 +19553,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:19293: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:19557: 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:19300: checking CAIRO_CFLAGS" >&5 -+echo "configure:19564: 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:19305: checking CAIRO_LIBS" >&5 -+echo "configure:19569: 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\"`" -@@ -19366,7 +19630,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:19370: checking for $ac_word" >&5 -+echo "configure:19634: 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 -@@ -19642,14 +19906,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:19653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -19956,7 +20220,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext < -@@ -19972,7 +20236,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:19976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -20190,34 +20454,15 @@ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - MOZ_DEFINES=$DEFS - -@@ -20465,6 +20710,9 @@ - s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g - s%@HOST_MOC@%$HOST_MOC%g - s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g -+s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g -+s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g -+s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g - s%@TK_CFLAGS@%$TK_CFLAGS%g - s%@TK_LIBS@%$TK_LIBS%g - s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g -@@ -20512,12 +20760,18 @@ - 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 - s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g - s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g - s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g -+s%@MOZ_DBUS_GLIB_CFLAGS@%$MOZ_DBUS_GLIB_CFLAGS%g -+s%@MOZ_DBUS_GLIB_LIBS@%$MOZ_DBUS_GLIB_LIBS%g -+s%@MOZ_GTHREAD_CFLAGS@%$MOZ_GTHREAD_CFLAGS%g -+s%@MOZ_GTHREAD_LIBS@%$MOZ_GTHREAD_LIBS%g -+s%@MOZ_ENABLE_DBUS@%$MOZ_ENABLE_DBUS%g - s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g - s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g - s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g diff --git a/cups-paper.patch b/cups-paper.patch deleted file mode 100644 index 8a209eb6..00000000 --- a/cups-paper.patch +++ /dev/null @@ -1,858 +0,0 @@ -From: Wolfgang Rosenauer , Arne John Glenstrup -Subject: get paper sizes from CUPS -References: -https://bugzilla.novell.com/show_bug.cgi?id=65482 -https://bugzilla.mozilla.org/show_bug.cgi?id=324060 - - -================================================================================ ---- gfx/src/gtk/nsDeviceContextSpecG.cpp -+++ gfx/src/gtk/nsDeviceContextSpecG.cpp -@@ -66,6 +66,7 @@ - #ifdef USE_POSTSCRIPT - #include "nsPSPrinters.h" - #include "nsPaperPS.h" /* Paper size list */ -+#include "nsPaperFactoryPS.h" /* Paper size list factory */ - #endif /* USE_POSTSCRIPT */ - - /* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */ -@@ -1210,34 +1211,38 @@ - #ifdef SET_PRINTER_FEATURES_VIA_PREFS - printerFeatures.SetCanChangePaperSize(PR_TRUE); - #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ -- nsXPIDLCString papername; -- if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) { -- nsPaperSizePS paper; -- -- if (paper.Find(papername)) { -- DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", -- paper.Name(), paper.Width_mm(), paper.Height_mm())); -- aPrintSettings->SetPaperSizeUnit(paper.IsMetric() ? -- (int)nsIPrintSettings::kPaperSizeMillimeters : -- (int)nsIPrintSettings::kPaperSizeInches); -- aPrintSettings->SetPaperWidth(paper.Width_mm()); -- aPrintSettings->SetPaperHeight(paper.Height_mm()); -- aPrintSettings->SetPaperName(NS_ConvertASCIItoUCS2(paper.Name()).get()); -- } -- else { -- DO_PR_DEBUG_LOG(("Unknown paper size '%s' given.\n", papername.get())); -+ { -+ nsIPaperSizePS* paper; -+ nsresult rv; -+ rv = nsPaperFactoryPS::CreatePaper -+ (fullPrinterName.get(), printerName.get(), paper); -+ if (NS_FAILED(rv)) return rv; -+ paper->FindDefault(); -+ -+ nsXPIDLCString papername; -+ if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", fullPrinterName, "print_paper_name", getter_Copies(papername)))) { -+ if (!paper->Find(papername)) { -+ DO_PR_DEBUG_LOG(("Unknown paper size '%s' given.\n", papername.get())); -+ } - } -+ DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", -+ paper->Name(), paper->Width_mm(), paper->Height_mm())); -+ aPrintSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters); -+ aPrintSettings->SetPaperWidth(paper->Width_mm()); -+ aPrintSettings->SetPaperHeight(paper->Height_mm()); -+ aPrintSettings->SetPaperName(NS_ConvertASCIItoUTF16(paper->Name()).get()); - #ifdef SET_PRINTER_FEATURES_VIA_PREFS -- paper.First(); -+ paper->First(); - int count = 0; -- while (!paper.AtEnd()) -+ while (!paper->AtEnd()) - { -- printerFeatures.SetPaperRecord(count++, paper.Name(), -- (int)paper.Width_mm(), (int)paper.Height_mm(), !paper.IsMetric()); -- paper.Next(); -+ printerFeatures.SetPaperRecord(count++, paper->Name(), -+ (int)paper->Width_mm(), (int)paper->Height_mm(), !paper->IsMetric()); -+ paper->Next(); - } - printerFeatures.SetNumPaperSizeRecords(count); - #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ -+ delete(paper); - } - - PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == ---- gfx/src/ps/nsPrintJobPS.cpp -+++ gfx/src/ps/nsPrintJobPS.cpp -@@ -364,6 +364,10 @@ - const char *slash = strchr(printerName, '/'); - mPrinterName = slash ? slash + 1 : printerName; - mJobTitle.SetIsVoid(PR_TRUE); -+ /* Paper name */ -+ const char* paperName = nsnull; -+ aSpec->GetPaperName(&paperName); -+ mPaperName = paperName; - return NS_OK; - } - -@@ -445,6 +449,11 @@ - mNumCopies.get(), - dest->num_options, - &dest->options); -+ if (!mPaperName.IsEmpty()) -+ dest->num_options = (mCups.mCupsAddOption)("media", -+ mPaperName.get(), -+ dest->num_options, -+ &dest->options); - const char *title = mJobTitle.IsVoid() ? - "Untitled Document" : mJobTitle.get(); - result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(), ---- gfx/src/ps/nsPrintJobPS.h -+++ gfx/src/ps/nsPrintJobPS.h -@@ -179,6 +179,7 @@ - nsCUPSShim mCups; - nsCString mPrinterName; - nsCString mNumCopies; -+ nsCString mPaperName; - nsCString mJobTitle; // IsVoid() if no title - }; - #endif /* VMS */ ---- gfx/src/psshared/Makefile.in -+++ gfx/src/psshared/Makefile.in -@@ -57,13 +57,16 @@ - - EXPORTS = nsCUPSShim.h \ - nsPaperPS.h \ -+ nsIPaperPS.h \ - nsPSPrinters.h\ - psSharedCore.h \ -+ nsPaperFactoryPS.h \ - $(NULL) - - CPPSRCS = nsCUPSShim.cpp \ - nsPaperPS.cpp \ - nsPSPrinters.cpp \ -+ nsPaperFactoryPS.cpp \ - $(NULL) - - EXTRA_DSO_LDOPTS = \ ---- gfx/src/psshared/nsCUPSShim.cpp -+++ gfx/src/psshared/nsCUPSShim.cpp -@@ -45,13 +45,18 @@ - // List of symbols to find in libcups. Must match symAddr[] defined in Init(). - // Making this an array of arrays instead of pointers allows storing the - // whole thing in read-only memory. --static const char gSymName[][sizeof("cupsPrintFile")] = { -+static const char gSymName[][sizeof("ppdMarkDefaults")] = { - { "cupsAddOption" }, - { "cupsFreeDests" }, - { "cupsGetDest" }, - { "cupsGetDests" }, - { "cupsPrintFile" }, - { "cupsTempFd" }, -+ { "cupsGetPPD" }, -+ { "ppdOpenFile" }, -+ { "ppdClose" }, -+ { "ppdMarkDefaults" }, -+ { "ppdIsMarked" }, - }; - static const int gSymNameCt = sizeof(gSymName) / sizeof(gSymName[0]); - -@@ -71,6 +76,11 @@ - (void **)&mCupsGetDests, - (void **)&mCupsPrintFile, - (void **)&mCupsTempFd, -+ (void **)&mCupsGetPPD, -+ (void **)&mPpdOpenFile, -+ (void **)&mPpdClose, -+ (void **)&mPpdMarkDefaults, -+ (void **)&mPpdIsMarked, - }; - - for (int i = gSymNameCt; i--; ) { ---- gfx/src/psshared/nsCUPSShim.h -+++ gfx/src/psshared/nsCUPSShim.h -@@ -62,6 +62,82 @@ - cups_option_t *options; /* Options */ - } cups_dest_t; - -+typedef enum /**** Colorspaces ****/ -+{ -+ PPD_CS_CMYK = -4, /* CMYK colorspace */ -+ PPD_CS_CMY, /* CMY colorspace */ -+ PPD_CS_GRAY = 1, /* Grayscale colorspace */ -+ PPD_CS_RGB = 3, /* RGB colorspace */ -+ PPD_CS_RGBK, /* RGBK (K = gray) colorspace */ -+ PPD_CS_N /* DeviceN colorspace */ -+} ppd_cs_t; -+ -+typedef struct /**** Page Sizes ****/ -+{ -+ int marked; /* Page size selected? */ -+ char name[41]; -+ /* Media size option */ -+ float width, /* Width of media in points */ -+ length, /* Length of media in points */ -+ left, /* Left printable margin in points */ -+ bottom, /* Bottom printable margin in points */ -+ right, /* Right printable margin in points */ -+ top; /* Top printable margin in points */ -+} ppd_size_t; -+ -+typedef struct /**** Files ****/ -+{ -+ int language_level, /* Language level of device */ -+ color_device, /* 1 = color device, 0 = grayscale */ -+ variable_sizes, /* 1 = supports variable sizes, 0 = doesn't */ -+ accurate_screens, /* 1 = supports accurate screens, 0 = not */ -+ contone_only, /* 1 = continuous tone only, 0 = not */ -+ landscape, /* -90 or 90 */ -+ model_number, /* Device-specific model number */ -+ manual_copies, /* 1 = Copies done manually, 0 = hardware */ -+ throughput; /* Pages per minute */ -+ ppd_cs_t colorspace; /* Default colorspace */ -+ char *patches; /* Patch commands to be sent to printer */ -+ int num_emulations; /* Number of emulations supported */ -+ void *emulations; /* Emulations and the code to invoke them */ -+ char *jcl_begin, /* Start JCL commands */ -+ *jcl_ps, /* Enter PostScript interpreter */ -+ *jcl_end, /* End JCL commands */ -+ *lang_encoding, /* Language encoding */ -+ *lang_version, /* Language version (English, Spanish, etc.) */ -+ *modelname, /* Model name (general) */ -+ *ttrasterizer, /* Truetype rasterizer */ -+ *manufacturer, /* Manufacturer name */ -+ *product, /* Product name (from PS RIP/interpreter) */ -+ *nickname, /* Nickname (specific) */ -+ *shortnickname; /* Short version of nickname */ -+ int num_groups; /* Number of UI groups */ -+ void *groups; /* UI groups */ -+ int num_sizes; /* Number of page sizes */ -+ ppd_size_t *sizes; /* Page sizes */ -+ float custom_min[2], /* Minimum variable page size */ -+ custom_max[2], /* Maximum variable page size */ -+ custom_margins[4];/* Margins around page */ -+ int num_consts; /* Number of UI/Non-UI constraints */ -+ void *consts; /* UI/Non-UI constraints */ -+ int num_fonts; /* Number of pre-loaded fonts */ -+ char **fonts; /* Pre-loaded fonts */ -+ int num_profiles; /* Number of sRGB color profiles */ -+ void *profiles; /* sRGB color profiles */ -+ int num_filters; /* Number of filters */ -+ char **filters; /* Filter strings... */ -+ -+ /**** New in CUPS 1.1 ****/ -+ int flip_duplex; /* 1 = Flip page for back sides */ -+ -+ /**** New in CUPS 1.1.19 ****/ -+ char *protocols, /* Protocols (BCP, TBCP) string */ -+ *pcfilename; /* PCFileName string */ -+ int num_attrs, /* Number of attributes */ -+ cur_attr; /* Current attribute */ -+ void **attrs; /* Attributes */ -+} ppd_file_t; -+ - typedef cups_dest_t* (PR_CALLBACK *CupsGetDestType)(const char *printer, - const char *instance, - int num_dests, -@@ -80,6 +156,11 @@ - const char *value, - int num_options, - cups_option_t **options); -+typedef const char* (PR_CALLBACK *CupsGetPPDType) (const char* name); -+typedef ppd_file_t* (PR_CALLBACK *PPDOpenFileType) (const char* filename); -+typedef void (PR_CALLBACK *PPDCloseType) (ppd_file_t* ppd); -+typedef void (PR_CALLBACK *PPDMarkDefaultsType) (ppd_file_t* ppd); -+typedef int (PR_CALLBACK *PPDIsMarkedType) (ppd_file_t* ppd, const char* pname, const char* pname_clear); - - struct PRLibrary; - -@@ -113,6 +194,11 @@ - CupsGetDestsType mCupsGetDests; - CupsPrintFileType mCupsPrintFile; - CupsTempFdType mCupsTempFd; -+ CupsGetPPDType mCupsGetPPD; -+ PPDOpenFileType mPpdOpenFile; -+ PPDCloseType mPpdClose; -+ PPDMarkDefaultsType mPpdMarkDefaults; -+ PPDIsMarkedType mPpdIsMarked; - - private: - PRLibrary *mCupsLib; ---- gfx/src/psshared/nsIPaperPS.h -+++ gfx/src/psshared/nsIPaperPS.h -@@ -0,0 +1,102 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * Contributor(s): -+ * Arne John Glenstrup -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+ -+#ifndef _NSIPAPERPS_H_ -+#define _NSIPAPERPS_H_ -+ -+#include "prtypes.h" -+#include "psSharedCore.h" -+ -+class nsIPaperSizePS { -+ public: -+ /** --------------------------------------------------- -+ * Virtual destructor. -+ */ -+ virtual ~nsIPaperSizePS(); -+ -+ /* Allow the paper factory to create instances */ -+ friend class nsPaperFactoryPS; -+ -+ /** --------------------------------------------------- -+ * @return PR_TRUE if the cursor points past the last item. -+ */ -+ virtual PRBool AtEnd() = 0; -+ -+ /** --------------------------------------------------- -+ * Position the cursor at the beginning of the paper size list. -+ * @return VOID -+ */ -+ virtual void First() = 0; -+ -+ /** --------------------------------------------------- -+ * Advance the cursor to the next item. -+ * @return VOID -+ */ -+ virtual void Next() = 0; -+ -+ /** --------------------------------------------------- -+ * Point the cursor to the entry with the given paper name. -+ * @return PR_TRUE if pointing to a valid entry. -+ */ -+ virtual PRBool Find(const char *aName) = 0; -+ -+ /** --------------------------------------------------- -+ * Point the cursor to a default entry if available. -+ * Otherwise it's equivalent to First(). -+ * @return PR_TRUE if pointing to a valid entry. -+ */ -+ virtual PRBool FindDefault() = 0; -+ -+ /** --------------------------------------------------- -+ * @return a pointer to the name of the current paper size -+ */ -+ virtual const char *Name() = 0; -+ -+ /** --------------------------------------------------- -+ * @return the width of the page in millimeters -+ */ -+ virtual float Width_mm() = 0; -+ -+ /** --------------------------------------------------- -+ * @return the height of the page in millimeters -+ */ -+ virtual float Height_mm() = 0; -+ -+ /** --------------------------------------------------- -+ * @return PR_TRUE if the paper should be presented to -+ * the user in metric units. -+ */ -+ virtual PRBool IsMetric() { return PR_TRUE; }; -+}; -+ -+#endif /* _NSIPAPERPS_H_ */ ---- gfx/src/psshared/nsPSPrinters.h -+++ gfx/src/psshared/nsPSPrinters.h -@@ -44,6 +44,7 @@ - #include "prtypes.h" - #include "nsCUPSShim.h" - #include "psSharedCore.h" -+#include "nsCOMPtr.h" - - class nsIPrefService; - class nsIPrefBranch; ---- gfx/src/psshared/nsPaperFactoryPS.cpp -+++ gfx/src/psshared/nsPaperFactoryPS.cpp -@@ -0,0 +1,65 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Kenneth Herron . -+ * Portions created by the Initial Developer are Copyright (C) 2004 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Arne John Glenstrup -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+ -+#include "nsDebug.h" -+#include "nsPaperFactoryPS.h" -+#include "nsIPaperPS.h" -+#include "nsPaperPS.h" -+#include "nsPSPrinters.h" -+ -+nsresult -+nsPaperFactoryPS::CreatePaper(const char* fullPrinterName, -+ const char* printerName, -+ nsIPaperSizePS* &aPaper) -+{ -+ nsIPaperSizePS *newPZ; -+ -+ if (nsPSPrinterList::kTypeCUPS == nsPSPrinterList::GetPrinterType -+ (nsDependentCString(fullPrinterName))) -+ newPZ = new nsPaperSizeCUPS(fullPrinterName, printerName); -+ else -+ newPZ = new nsPaperSizePS(); -+ -+ if (!newPZ) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ aPaper = newPZ; -+ return NS_OK; -+} ---- gfx/src/psshared/nsPaperFactoryPS.h -+++ gfx/src/psshared/nsPaperFactoryPS.h -@@ -0,0 +1,64 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * Contributor(s): -+ * Arne John Glenstrup -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nsPaperFactoryPS_h__ -+#define nsPaperFactoryPS_h__ -+ -+#include "nscore.h" -+#include "nsIPaperPS.h" -+ -+/* Factory class for the paper sizes. This class determines -+ * which paper size class should handle a request, and constructs -+ * an object of the appropriate class. -+ */ -+ -+class NS_PSSHARED nsPaperFactoryPS -+{ -+public: -+ /** -+ * Construct a paper size object for the given device context spec. -+ * On success, the paper size object is owned by the caller and should -+ * be destroyed when no longer needed. -+ * -+ * @param fullPrinterName Fully qualified name, e.g., "CUPS/myprinter" -+ * @param printerName Stripped name, e.g., "myprinter" -+ * @param aPaper If NS_OK is returned, this will be filled -+ * in with a pointer to a paper size object. -+ * @return NS_OK or a suitable error value. -+ */ -+ static nsresult CreatePaper(const char* fullPrinterName, -+ const char* printerName, -+ nsIPaperSizePS* &aPaper); -+}; -+ -+ -+#endif /* nsPaperFactoryPS_h__ */ ---- gfx/src/psshared/nsPaperPS.cpp -+++ gfx/src/psshared/nsPaperPS.cpp -@@ -22,6 +22,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Arne John Glenstrup - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,9 +38,25 @@ - * - * ***** END LICENSE BLOCK ***** */ - -- -+#ifdef MOZ_LOGGING -+#define FORCE_PR_LOG 1 /* Allow logging in the release build */ -+#endif /* MOZ_LOGGING */ -+#include "prlog.h" -+ - #include "nsPaperPS.h" - #include "plstr.h" -+#include "nsPSPrinters.h" -+#include -+ -+#ifdef PR_LOGGING -+static PRLogModuleInfo *PaperSizePSLM = PR_NewLogModule("PaperSizePS"); -+#endif /* PR_LOGGING */ -+/* Macro to make lines shorter */ -+#define DO_PR_DEBUG_LOG(x) PR_LOG(PaperSizePSLM, PR_LOG_DEBUG, x) -+ -+#define MM_PER_PT (25.4 / 72.0) -+#define HALF_INCH_PT 36.0 -+#define EPSILON 0.125 - - #define COUNTOF(x) (sizeof(x) / sizeof((x)[0])) - -@@ -57,7 +74,15 @@ - #undef SIZE_MM - }; - --const unsigned int nsPaperSizePS::mCount = COUNTOF(mList); -+nsCUPSShim nsPaperSizeCUPS::mCups; -+ -+/* ~nsIPaperSizePS() is virtual, so must implement a destructor. */ -+nsIPaperSizePS::~nsIPaperSizePS () { } -+ -+nsPaperSizePS::nsPaperSizePS() { -+ mCount = COUNTOF(mList); -+ mCurrent = 0; -+} - - PRBool - nsPaperSizePS::Find(const char *aName) -@@ -70,3 +95,125 @@ - } - return PR_FALSE; - } -+ -+nsPaperSizeCUPS::nsPaperSizeCUPS(const char* fullPrinterName, -+ const char* printerName) { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS('%s', '%s')\n", -+ fullPrinterName, printerName)); -+ /* Don't use CUPS before we are sure we have access to the PPD */ -+ mUsingCups = false; -+ mPPD = nsnull; -+ mCount = COUNTOF(mList); -+ mCurrent = 0; -+ if (!fullPrinterName || !printerName || -+ nsPSPrinterList::kTypeCUPS != -+ nsPSPrinterList::GetPrinterType(nsDependentCString(fullPrinterName))) -+ return; -+ if (!mCups.IsInitialized()) { mCups.Init(); } -+ if (!mCups.IsInitialized()) { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: CUPS unavailable\n")); -+ return; -+ } -+ const char* ppdFileName = mCups.mCupsGetPPD(printerName); -+ if (!ppdFileName) { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: " -+ "cannot get PPD file name for printer '%s'\n", -+ printerName)); -+ return; -+ } -+ mPPD = mCups.mPpdOpenFile(ppdFileName); -+ if (!mPPD) { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::nsPaperSizeCUPS: " -+ "cannot open PPD file '%s'\n", -+ ppdFileName)); -+ return; -+ } -+ mCount = mPPD->num_sizes; -+ mUsingCups = true; -+} -+ -+nsPaperSizeCUPS::~nsPaperSizeCUPS() { -+ if (mPPD) mCups.mPpdClose(mPPD); -+} -+ -+void -+nsPaperSizeCUPS::SkipZeroSizes() { -+ if (!mUsingCups) return; -+ while (mCurrent < mCount -+ && (mPPD->sizes[mCurrent].width == 0.0f || -+ mPPD->sizes[mCurrent].length == 0.0f)) { -+ mCurrent++; -+ } -+} -+ -+PRBool -+nsPaperSizeCUPS::Find(const char* aName) { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::Find ('%s') ", aName)); -+ if (!mUsingCups) return nsPaperSizePS::Find(aName); -+ for (int i = mCount; i--; ) { -+ if (!PL_strcasecmp(aName, mPPD->sizes[i].name)) { -+ DO_PR_DEBUG_LOG -+ (("found paper '%s' (%gx%gmm)\n", -+ aName, -+ round(mPPD->sizes[i].width * MM_PER_PT), -+ round(mPPD->sizes[i].length * MM_PER_PT))); -+ mCurrent = i; -+ return PR_TRUE; -+ } -+ } -+ DO_PR_DEBUG_LOG(("did not find paper '%s'\n", aName)); -+ return PR_FALSE; -+} -+ -+PRBool -+nsPaperSizeCUPS::FindDefault() { -+ DO_PR_DEBUG_LOG(("nsPaperSizeCUPS::FindDefault")); -+ if (!mUsingCups) return nsPaperSizePS::FindDefault(); -+ mCups.mPpdMarkDefaults(mPPD); -+ for (int i = mCount; i--; ) { -+ if (mCups.mPpdIsMarked(mPPD, "PageSize", mPPD->sizes[i].name )) { -+ DO_PR_DEBUG_LOG -+ (("found default paper '%s' (%gx%gmm)\n", -+ mPPD->sizes[i].name, -+ round(mPPD->sizes[i].width * MM_PER_PT), -+ round(mPPD->sizes[i].length * MM_PER_PT))); -+ mCurrent = i; -+ return PR_TRUE; -+ } -+ } -+ mCurrent = 0; -+ DO_PR_DEBUG_LOG(("no default paper found, therefore set the first\n")); -+ return PR_TRUE; -+} -+ -+const char* -+nsPaperSizeCUPS::Name() { -+ if (!mUsingCups) return nsPaperSizePS::Name(); -+ NS_PRECONDITION(!AtEnd(), "Invalid current item"); -+ return mPPD->sizes[mCurrent].name; -+} -+ -+float -+nsPaperSizeCUPS::Width_mm() { -+ if (!mUsingCups) return nsPaperSizePS::Width_mm(); -+ NS_PRECONDITION(!AtEnd(), "Invalid current item"); -+ return round(mPPD->sizes[mCurrent].width * MM_PER_PT); -+} -+ -+float -+nsPaperSizeCUPS::Height_mm() { -+ if (!mUsingCups) return nsPaperSizePS::Height_mm(); -+ NS_PRECONDITION(!AtEnd(), "Invalid current item"); -+ return round(mPPD->sizes[mCurrent].length * MM_PER_PT); -+} -+ -+PRBool -+nsPaperSizeCUPS::IsMetric() { -+ if (!mUsingCups) return nsPaperSizePS::IsMetric(); -+ NS_PRECONDITION(!AtEnd(), "Invalid current item"); -+ /* Educated guess: unless sizes are integral number */ -+ /* of half inches, present them to the user in metric. */ -+ return -+ fabs(fmod(mPPD->sizes[mCurrent].width, HALF_INCH_PT)) > EPSILON || -+ fabs(fmod(mPPD->sizes[mCurrent].length, HALF_INCH_PT)) > EPSILON; -+} ---- gfx/src/psshared/nsPaperPS.h -+++ gfx/src/psshared/nsPaperPS.h -@@ -40,9 +40,9 @@ - #ifndef _PAPERPS_H_ - #define _PAPERPS_H_ - --#include "prtypes.h" -+#include "nsIPaperPS.h" - #include "nsDebug.h" --#include "psSharedCore.h" -+#include "nsCUPSShim.h" - - struct nsPaperSizePS_ { - const char *name; -@@ -51,13 +51,13 @@ - PRBool isMetric; // Present to the user in metric, if possible - }; - --class NS_PSSHARED nsPaperSizePS { -+class NS_PSSHARED nsPaperSizePS : public nsIPaperSizePS { - public: - /** --------------------------------------------------- - * Constructor - */ -- nsPaperSizePS() { mCurrent = 0; } -- -+ nsPaperSizePS(); -+ - /** --------------------------------------------------- - * @return PR_TRUE if the cursor points past the last item. - */ -@@ -85,6 +85,12 @@ - PRBool Find(const char *aName); - - /** --------------------------------------------------- -+ * Position the cursor at the beginning of the paper size list. -+ * @return PR_TRUE -+ */ -+ PRBool FindDefault() { mCurrent = 0; return PR_TRUE; } -+ -+ /** --------------------------------------------------- - * @return a pointer to the name of the current paper size - */ - const char *Name() { -@@ -117,11 +123,83 @@ - return mList[mCurrent].isMetric; - } - -- private: -+ protected: - unsigned int mCurrent; - // the class visibility should export these, but it doesn't - static NS_PSSHARED_STATIC_MEMBER_(const nsPaperSizePS_) mList[]; -- static NS_PSSHARED_STATIC_MEMBER_(const unsigned int) mCount; -+ unsigned int mCount; -+}; -+ -+class NS_PSSHARED nsPaperSizeCUPS : public nsPaperSizePS { -+ public: -+ /** --------------------------------------------------- -+ * Constructor for a specific CUPS printer. -+ * @param fullPrinterName Fully qualified name, e.g., "CUPS/myprinter" -+ * @param printerName Stripped name, e.g., "myprinter" -+ */ -+ nsPaperSizeCUPS(const char* fullPrinterName, const char* printerName); -+ -+ /** --------------------------------------------------- -+ * Destructor. -+ */ -+ ~nsPaperSizeCUPS(); -+ -+ /** --------------------------------------------------- -+ * Position the cursor at the beginning of the paper size list. -+ * @return VOID -+ */ -+ void First() { -+ nsPaperSizePS::First(); -+ SkipZeroSizes(); -+ } -+ -+ /** --------------------------------------------------- -+ * Advance the cursor to the next item. -+ * @return VOID -+ */ -+ void Next() { -+ nsPaperSizePS::Next(); -+ SkipZeroSizes(); -+ } -+ -+ /** --------------------------------------------------- -+ * Point the cursor to the entry with the given paper name. -+ * @return PR_TRUE if pointing to a valid entry. -+ */ -+ PRBool Find(const char *aName); -+ -+ /** --------------------------------------------------- -+ * Point the cursor to the CUPS default entry for paper size. -+ * @return PR_TRUE if pointing to a valid entry. -+ */ -+ PRBool FindDefault(); -+ -+ /** --------------------------------------------------- -+ * @return a pointer to the name of the current paper size -+ */ -+ const char *Name(); -+ -+ /** --------------------------------------------------- -+ * @return the width of the page in millimeters -+ */ -+ float Width_mm(); -+ -+ /** --------------------------------------------------- -+ * @return the height of the page in millimeters -+ */ -+ float Height_mm(); -+ -+ /** --------------------------------------------------- -+ * @return PR_TRUE if the paper should be presented to -+ * the user in metric units. -+ */ -+ PRBool IsMetric(); -+ -+ private: -+ void SkipZeroSizes(); -+ PRBool mUsingCups; -+ static NS_PSSHARED_STATIC_MEMBER_(nsCUPSShim) mCups; -+ ppd_file_t* mPPD; - }; - - #endif ---- gfx/src/xlib/nsDeviceContextSpecXlib.cpp -+++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp -@@ -1212,7 +1212,11 @@ - #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ - nsXPIDLCString papername; - if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) { -- nsPaperSizePS paper; -+ nsIPaperSizePS* paper; -+ nsresult rv; -+ rv = nsPaperFactoryPS::CreatePaper -+ (fullPrinterName.get(), printerName.get(), paper); -+ if (NS_FAILED(rv)) return rv; - - if (paper.Find(papername)) { - DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", -@@ -1238,6 +1242,7 @@ - } - printerFeatures.SetNumPaperSizeRecords(count); - #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ -+ delete(paper); - } - - PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == diff --git a/dbus.patch b/dbus.patch deleted file mode 100644 index 342c08dc..00000000 --- a/dbus.patch +++ /dev/null @@ -1,588 +0,0 @@ -Index: configure.in -================================================================================ ---- browser/installer/unix/packages-static -+++ browser/installer/unix/packages-static -@@ -341,6 +341,7 @@ - ; - bin/components/libnkgnomevfs.so - bin/components/libauth.so -+bin/components/libdbusservice.so - - ; [Additional Developer Tools] - [adt] ---- config/autoconf.mk.in -+++ config/autoconf.mk.in -@@ -458,6 +458,12 @@ - MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@ - MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@ - -+MOZ_DBUS_GLIB_CFLAGS = @MOZ_DBUS_GLIB_CFLAGS@ -+MOZ_DBUS_GLIB_LIBS = @MOZ_DBUS_GLIB_LIBS@ -+ -+MOZ_GTHREAD_CFLAGS = @MOZ_GTHREAD_CFLAGS@ -+MOZ_GTHREAD_LIBS = @MOZ_GTHREAD_LIBS@ -+ - MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@ - MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@ - ---- configure.in -+++ configure.in -@@ -4776,6 +4776,33 @@ - AC_SUBST(MOZ_GNOMEUI_LIBS) - - dnl ======================================================== -+dnl = dbus support -+dnl ======================================================== -+ -+if test "$MOZ_ENABLE_GTK2" -+then -+ MOZ_ARG_ENABLE_BOOL(dbus, -+ [ --enable-dbus Enable dbus support (default: disabled) ], -+ MOZ_ENABLE_DBUS=1, -+ MOZ_ENABLE_DBUS=) -+ -+ if test "$MOZ_ENABLE_DBUS" -+ then -+ PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1) -+ PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) -+ fi -+ -+ if test "$MOZ_ENABLE_DBUS"; then -+ AC_DEFINE(MOZ_ENABLE_DBUS) -+ fi -+fi -+AC_SUBST(MOZ_ENABLE_DBUS) -+AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) -+AC_SUBST(MOZ_DBUS_GLIB_LIBS) -+AC_SUBST(MOZ_GTHREAD_CFLAGS) -+AC_SUBST(MOZ_GTHREAD_LIBS) -+ -+dnl ======================================================== - dnl = Setting MOZ_EXTRA_X11CONVERTERS turns on additional - dnl = converters in intl/uconv that are used only by X11 gfx - dnl = implementations. By default, it's undefined so that -@@ -5128,6 +5155,13 @@ - MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` - fi - -+if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then -+ if test -n "$MOZ_X11"; then -+ AC_MSG_WARN([Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS.]) -+ fi -+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'` -+fi -+ - if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then - AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) - MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` ---- extensions/dbus/Makefile.in -+++ extensions/dbus/Makefile.in -@@ -0,0 +1,70 @@ -+# ###### BEGIN LICENSE BLOCK ###### -+# Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# -+# The contents of this file are subject to the Mozilla Public -+# License Version 1.1 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS -+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+# implied. See the License for the specific language governing -+# rights and limitations under the License. -+# -+# The Original Code is Novell code. -+# -+# The Initial Developer of the Original Code is Novell, Inc. -+# -+# Original Author: Robert O'Callahan (rocallahan@novell.com) -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the NPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the NPL, the GPL or the LGPL. -+# -+# ###### END LICENSE BLOCK ###### -+ -+DEPTH = ../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = dbus -+LIBRARY_NAME = dbusservice -+GRE_MODULE = 1 -+#EXPORT_LIBRARY = 1 -+IS_COMPONENT = 1 -+FORCE_SHARED_LIB = 1 -+ -+REQUIRES = xpcom \ -+ string \ -+ necko \ -+ embedcomponents \ -+ $(NULL) -+ -+EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \ -+ $(NSPR_LIBS) \ -+ $(MOZ_DBUS_GLIB_LIBS) \ -+ $(MOZ_GTHREAD_LIBS) \ -+ $(NULL) -+ -+CPPSRCS = \ -+ nsDBusModule.cpp \ -+ $(NULL) -+ -+include $(topsrcdir)/config/rules.mk -+ -+CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS) -+CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS)) -Index: config/system-headers -=================================================================== -RCS file: /cvsroot/mozilla/config/system-headers,v -retrieving revision 3.4.4.3 -diff -u -r3.4.4.3 system-headers ---- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3 -+++ config/system-headers 13 Nov 2007 23:04:10 -0000 -@@ -141,6 +141,9 @@ - curses.h - cxxabi.h - DateTimeUtils.h -+dbus/dbus.h -+dbus/dbus-glib.h -+dbus/dbus-glib-lowlevel.h - ddeml.h - Debug.h - dem.h ---- extensions/dbus/nsDBusModule.cpp.none 1970-01-01 01:00:00.000000000 +0100 -+++ extensions/dbus/nsDBusModule.cpp 2008-01-15 17:09:51.000000000 +0100 -@@ -0,0 +1,418 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is Novell code. -+ * -+ * The Initial Developer of the Original Code is Novell, Inc. -+ * -+ * Original Author: Robert O'Callahan (rocallahan@novell.com) -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include -+ -+#define DBUS_API_SUBJECT_TO_CHANGE -+ -+#include -+#include -+#include -+#include -+ -+#include "nsIObserverService.h" -+#include "nsIObserver.h" -+#include "nsIIOService.h" -+#include "nsWeakReference.h" -+#include "nsIPrefBranch2.h" -+#include "nsIPrefService.h" -+#include "nsServiceManagerUtils.h" -+#include "nsNetCID.h" -+#include "nsCRT.h" -+#include "nsICategoryManager.h" -+#include "nsIGenericFactory.h" -+#include "nsIAppStartupNotifier.h" -+#include "nsITimer.h" -+#include "nsComponentManagerUtils.h" -+ -+#include "nsStringAPI.h" -+ -+// Define NetworkManager API constants. This avoids a dependency on -+// NetworkManager-devel. -+#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" -+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -+#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange" -+typedef enum NMState -+{ -+ NM_STATE_UNKNOWN = 0, -+ NM_STATE_ASLEEP, -+ NM_STATE_CONNECTING, -+ NM_STATE_CONNECTED, -+ NM_STATE_DISCONNECTED -+} NMState; -+ -+#define NS_DBUS_CONTRACTID "@mozilla.org/dbus;1" -+#define NS_DBUS_CLASSNAME "DBus Interface" -+#define NS_DBUS_CID \ -+ { 0x85899443, \ -+ 0x2842, \ -+ 0x4cc4, \ -+ { 0x87, 0x0c, 0x7a, 0x6f, 0x22, 0xb0, 0xaa, 0x11 } \ -+ } -+ -+/** -+ * The nsDBusService component interfaces with DBUS to communicate with daemons -+ * in systems supporting DBUS. It links dynamically to the DBUS libraries so -+ * will not load on systems without those libraries ... but that's harmless. -+ * -+ * Currently the only daemon we communicate with is NetworkManager. We listen -+ * for NetworkManager state changes; we set nsIOService's offline status to -+ * FALSE when NetworkManager reports NM_STATE_CONNECTED, and to TRUE otherwise. -+ * We also solicit the current status from NetworkManager when this component -+ * gets loaded. In addition to setting IOService, we also set the -+ * "browser.offline" preference (because Firefox treats that preference as -+ * authoritative). We have to wait until prefs have been loaded before setting -+ * "browser.offline". -+ * -+ * In the future we could extend this class to talk to other daemons. -+ * -+ * Currently all communication is asynchronous. This isn't hard to implement -+ * and avoids blocking our main thread. -+ */ -+class nsDBusService : public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_NSIOBSERVER -+ -+ nsDBusService(); -+ virtual ~nsDBusService(); -+ -+ nsresult Init(); -+ -+ /** -+ * This gets called when NetworkManager sends us a StateChange signal, -+ * or when we receive a reply to our inquiry. -+ * The message contains the current NMState. -+ */ -+ void UpdateNetworkStatus(DBusMessage* message); -+ -+ /** -+ * Handle a message. -+ * @return PR_TRUE to indicate that the message has been handled -+ */ -+ PRBool HandleMessage(DBusMessage* message); -+ -+ void DoTimerCallback(nsITimer* aTimer); -+ -+private: -+ /** -+ * Try to connect to the dbus service. -+ */ -+ nsresult ConnectToDBus(); -+ /** -+ * Ask NetworkManager to send us the current status. -+ */ -+ void RequestNetworkStatus(); -+ /** -+ * Update Gecko networking settings based on information we have received. -+ */ -+ void SetGeckoNetworkStatus(); -+ /** -+ * DBUS has disconnected. Hopefull it will restart; we need to restore -+ * our connection. -+ */ -+ void HandleDBusDisconnect(); -+ -+ DBusConnection* mConnection; -+ nsCOMPtr mReconnectTimer; -+ -+ /** -+ * Set to PR_TRUE after we have received at least one status indication -+ * from NetworkManager. -+ */ -+ PRPackedBool mGotNetworkStatus; -+ /** -+ * When mGotNetworkStatus is PR_TRUE, this contains the status indicated -+ * by NetworkManager. -+ */ -+ PRPackedBool mNetworkOnline; -+ /** -+ * Set to PR_TRUE after prefs have been loaded. -+ */ -+ PRPackedBool mPrefsLoaded; -+}; -+ -+NS_IMPL_ISUPPORTS2(nsDBusService, nsIObserver, nsISupportsWeakReference) -+ -+nsDBusService::nsDBusService() { -+ mConnection = nsnull; -+ mGotNetworkStatus = PR_FALSE; -+ mPrefsLoaded = PR_FALSE; -+} -+ -+nsDBusService::~nsDBusService() { -+ if (mConnection) { -+ dbus_connection_unref(mConnection); -+ } -+ if (mReconnectTimer) { -+ mReconnectTimer->Cancel(); -+ } -+} -+ -+void nsDBusService::SetGeckoNetworkStatus() { -+ // Don't set Gecko status until after prefs have been loaded. When -+ // prefs are loaded, we'll get called again. -+ if (!mPrefsLoaded || !mGotNetworkStatus) -+ return; -+ -+ // ignore set requests if special pref is set -+ nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); -+ if (prefs) { -+ PRBool ignore = PR_FALSE; -+ prefs->GetBoolPref("browser.ignoreNM", &ignore); -+ if (!ignore) { -+ prefs->SetBoolPref("browser.offline", !mNetworkOnline); -+ nsCOMPtr ios(do_GetService(NS_IOSERVICE_CONTRACTID)); -+ if (ios) { -+ ios->SetOffline(!mNetworkOnline); -+ } -+ } -+ } -+} -+ -+void nsDBusService::UpdateNetworkStatus(DBusMessage* msg) { -+ PRInt32 result; -+ if (dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT32, &result, -+ DBUS_TYPE_INVALID)) { -+ mGotNetworkStatus = PR_TRUE; -+ mNetworkOnline = result == NM_STATE_CONNECTED; -+ SetGeckoNetworkStatus(); -+ } -+} -+ -+static void NetworkStatusNotify(DBusPendingCall *pending, -+ void* user_data) { -+ DBusMessage* msg = dbus_pending_call_steal_reply(pending); -+ if (!msg) -+ return; -+ if (dbus_message_get_type(msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) { -+ NS_STATIC_CAST(nsDBusService*, user_data)->UpdateNetworkStatus(msg); -+ } -+ dbus_message_unref(msg); -+} -+ -+void nsDBusService::RequestNetworkStatus() { -+ DBusMessage* msg = -+ dbus_message_new_method_call(NM_DBUS_SERVICE, NM_DBUS_PATH, -+ NM_DBUS_INTERFACE, "state"); -+ if (!msg) -+ return; -+ -+ DBusPendingCall* reply; -+ if (dbus_connection_send_with_reply(mConnection, msg, &reply, -1)) { -+ dbus_pending_call_set_notify(reply, NetworkStatusNotify, this, NULL); -+ dbus_pending_call_unref(reply); -+ } -+ dbus_message_unref(msg); -+} -+ -+void nsDBusService::DoTimerCallback(nsITimer *aTimer) { -+ if (aTimer == mReconnectTimer.get()) { -+ nsresult rv = ConnectToDBus(); -+ if (NS_SUCCEEDED(rv)) { -+ mReconnectTimer->Cancel(); -+ mReconnectTimer = nsnull; -+ } -+ } -+} -+ -+static void TimerCallback(nsITimer *aTimer, void *aClosure) { -+ NS_STATIC_CAST(nsDBusService*, aClosure)->DoTimerCallback(aTimer); -+} -+ -+void nsDBusService::HandleDBusDisconnect() { -+ if (mConnection) { -+ dbus_connection_unref(mConnection); -+ mConnection = nsnull; -+ } -+ -+ nsresult rv; -+ mReconnectTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); -+ if (NS_FAILED(rv)) -+ return; -+ rv = mReconnectTimer->InitWithFuncCallback(TimerCallback, this, -+ 5000, nsITimer::TYPE_REPEATING_SLACK); -+ if (NS_FAILED(rv)) { -+ mReconnectTimer = nsnull; -+ return; -+ } -+} -+ -+PRBool nsDBusService::HandleMessage(DBusMessage* message) { -+ if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, -+ "Disconnected")) { -+ HandleDBusDisconnect(); -+ return PR_FALSE; -+ } -+ -+ if (dbus_message_is_signal(message, NM_DBUS_INTERFACE, -+ NM_DBUS_SIGNAL_STATE_CHANGE)) { -+ UpdateNetworkStatus(message); -+ return PR_TRUE; -+ } -+ -+ return PR_FALSE; -+} -+ -+NS_IMETHODIMP nsDBusService::Observe(nsISupports *aSubject, -+ const char *aTopic, -+ const PRUnichar *aData) { -+ if (!aTopic) -+ return NS_OK; -+ -+ if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) { -+ mPrefsLoaded = PR_TRUE; -+ SetGeckoNetworkStatus(); -+ } -+ return NS_OK; -+} -+ -+static DBusHandlerResult dbus_filter(DBusConnection* connection, -+ DBusMessage* message, -+ void* user_data) { -+ return NS_STATIC_CAST(nsDBusService*, user_data)->HandleMessage(message) -+ ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -+} -+ -+nsresult nsDBusService::ConnectToDBus() { -+ DBusError error; -+ dbus_error_init(&error); -+ -+ mConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (!mConnection) { -+ dbus_error_free(&error); -+ return NS_ERROR_FAILURE; -+ } -+ -+ dbus_connection_set_exit_on_disconnect(mConnection, PR_FALSE); -+ dbus_connection_setup_with_g_main(mConnection, NULL); -+ -+ if (!dbus_connection_add_filter(mConnection, dbus_filter, this, NULL)) { -+ dbus_error_free(&error); -+ return NS_ERROR_FAILURE; -+ } -+ -+ dbus_bus_add_match(mConnection, -+ "type='signal'," -+ "interface='" NM_DBUS_INTERFACE "'," -+ "sender='" NM_DBUS_SERVICE "'," -+ "path='" NM_DBUS_PATH "'", &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ return NS_ERROR_FAILURE; -+ } -+ -+ RequestNetworkStatus(); -+ -+ dbus_error_free(&error); -+ -+ return NS_OK; -+} -+ -+nsresult nsDBusService::Init() { -+ nsresult rv; -+ nsCOMPtr observerService = -+ do_GetService("@mozilla.org/observer-service;1", &rv); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ rv = observerService->AddObserver(this, NS_PREFSERVICE_READ_TOPIC_ID, -+ PR_FALSE); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ if (!g_thread_supported ()) -+ g_thread_init (NULL); -+ dbus_g_thread_init(); -+ -+ return ConnectToDBus(); -+} -+ -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDBusService, Init) -+ -+static NS_METHOD -+RegisterDBus(nsIComponentManager *aCompMgr, -+ nsIFile *aPath, -+ const char *registryLocation, -+ const char *componentType, -+ const nsModuleComponentInfo *info) { -+ nsresult rv; -+ -+ nsCOMPtr -+ categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, -+ "DBus Module", -+ NS_DBUS_CONTRACTID, -+ PR_TRUE, PR_TRUE, nsnull); -+ } -+ -+ return rv; -+} -+ -+static NS_METHOD -+UnRegisterDBus(nsIComponentManager *aCompMgr, -+ nsIFile *aPath, -+ const char *registryLocation, -+ const nsModuleComponentInfo *info) { -+ nsresult rv; -+ nsCOMPtr -+ categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ rv = categoryManager->DeleteCategoryEntry(APPSTARTUP_CATEGORY, -+ "DBus Module", -+ PR_TRUE); -+ } -+ return rv; -+} -+ -+static const nsModuleComponentInfo components[] = { -+ { NS_DBUS_CLASSNAME, -+ NS_DBUS_CID, -+ NS_DBUS_CONTRACTID, -+ nsDBusServiceConstructor, -+ RegisterDBus, -+ UnRegisterDBus, -+ }, -+}; -+ -+NS_IMPL_NSGETMODULE(nsDBusModule, components) diff --git a/em-356370.patch b/em-356370.patch deleted file mode 100644 index 65d404b3..00000000 --- a/em-356370.patch +++ /dev/null @@ -1,25 +0,0 @@ -References: -https://bugzilla.novell.com/show_bug.cgi?id=217374 -https://bugzilla.mozilla.org/show_bug.cgi?id=356370 - -Index: toolkit/mozapps/extensions/src/nsExtensionManager.js.in -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in,v -retrieving revision 1.144.2.60 -diff -u -p -6 -r1.144.2.60 nsExtensionManager.js.in ---- toolkit/mozapps/extensions/src/nsExtensionManager.js.in 17 Sep 2006 22:17:11 -0000 1.144.2.60 -+++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in 29 Nov 2006 07:54:31 -0000 -@@ -4008,12 +4008,13 @@ ExtensionManager.prototype = { - for (var i = 0; i < allItems.length; ++i) { - var item = allItems[i]; - - // An item entry is valid only if it is not disabled, not about to - // be disabled, and not about to be uninstalled. - var installLocation = this.getInstallLocation(item.id); -+ if (! installLocation) continue; - if (installLocation.name in StartupCache.entries && - item.id in StartupCache.entries[installLocation.name] && - StartupCache.entries[installLocation.name][item.id]) { - var op = StartupCache.entries[installLocation.name][item.id].op; - if (op == OP_NEEDS_INSTALL || op == OP_NEEDS_UPGRADE || - op == OP_NEEDS_UNINSTALL || op == OP_NEEDS_DISABLE) diff --git a/find-external-requires.sh b/find-external-requires.sh new file mode 100644 index 00000000..1168ff2c --- /dev/null +++ b/find-external-requires.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# Finds requirements provided outside of the current file set + +filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` + +provides=`echo "$filelist" | /usr/lib/rpm/find-provides` + +{ +for f in $filelist ; do + echo $f | /usr/lib/rpm/find-requires | while read req ; do + found=0 + for p in $provides ; do + if [ "$req" = "$p" ]; then + found=1 + fi + done + if [ "$found" = "0" ]; then + echo $req + fi + done +done +} | sort -u diff --git a/firefox-2.0.0.12-source.tar.bz2 b/firefox-2.0.0.12-source.tar.bz2 deleted file mode 100644 index 928556ac..00000000 --- a/firefox-2.0.0.12-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e693cdb4c76e985979bb913b5591bbd7406625ee1bb7fe6c373009ee502e7c77 -size 37730299 diff --git a/firefox-2.9.94-source.tar.bz2 b/firefox-2.9.94-source.tar.bz2 new file mode 100644 index 00000000..00c5f198 --- /dev/null +++ b/firefox-2.9.94-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2098d8bad5e527fd631d94d35c91b655222c06c09f0ad73349ed96867b37766e +size 36208890 diff --git a/firefox-348446-empty-lists.patch b/firefox-348446-empty-lists.patch deleted file mode 100644 index 78b1f85d..00000000 --- a/firefox-348446-empty-lists.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mozilla/toolkit/components/printing/content/printdialog.js -=================================================================== ---- mozilla.orig/toolkit/components/printing/content/printdialog.js -+++ mozilla/toolkit/components/printing/content/printdialog.js -@@ -93,7 +93,7 @@ function initDialog() - gPrefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService).getBranch(null); - if (gPrefService.getBoolPref("config.lockdown.savepage")) { -- dialog.fileRadio.setAttribute("disabled", "true"); -+ dialog.fileCheck.setAttribute("disabled", "true"); - } - if (gPrefService.getBoolPref("config.lockdown.printing")) { - dialog.printButton.setAttribute("disabled", "true"); diff --git a/firefox-libxul-sdk.patch b/firefox-libxul-sdk.patch new file mode 100644 index 00000000..43a50b02 --- /dev/null +++ b/firefox-libxul-sdk.patch @@ -0,0 +1,20 @@ +Index: browser/locales/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/browser/locales/Makefile.in,v +retrieving revision 1.59 +diff -u -r1.59 Makefile.in +--- browser/locales/Makefile.in 10 Feb 2008 06:09:54 -0000 1.59 ++++ browser/locales/Makefile.in 29 Feb 2008 08:48:09 -0000 +@@ -172,9 +172,11 @@ + endif + + libs-%: ++ifndef LIBXUL_SDK + @$(MAKE) -C ../../toolkit/locales libs-$* +- @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* ++endif ++ @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref + ifdef MOZ_BRANDING_DIRECTORY + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/MozillaFirefox.xml b/firefox-mimeinfo.xml similarity index 100% rename from MozillaFirefox.xml rename to firefox-mimeinfo.xml diff --git a/firefox-no-update.patch b/firefox-no-update.patch index c4bb6d21..6a76420b 100644 --- a/firefox-no-update.patch +++ b/firefox-no-update.patch @@ -1,8 +1,59 @@ +Index: browser/components/preferences/advanced.js +=================================================================== +RCS file: /cvsroot/mozilla/browser/components/preferences/advanced.js,v +retrieving revision 1.27 +diff -u -p -6 -r1.27 advanced.js +--- browser/components/preferences/advanced.js 9 Oct 2007 17:24:35 -0000 1.27 ++++ browser/components/preferences/advanced.js 28 Nov 2007 15:30:36 -0000 +@@ -241,12 +241,14 @@ var gAdvancedPane = { + getService(Components.interfaces.nsIApplicationUpdateService); + + var enabledPref = document.getElementById("app.update.enabled"); + var enableAppUpdate = document.getElementById("enableAppUpdate"); + + enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; ++ enableAppUpdate.disabled = true; ++ enableAppUpdate.hidden = true; + }, + + /** + * Enables/disables UI for "when updates are found" based on the values, + * and "locked" states of associated preferences. + */ +Index: browser/base/content/baseMenuOverlay.xul +=================================================================== +RCS file: /cvsroot/mozilla/browser/base/content/baseMenuOverlay.xul,v +retrieving revision 1.16 +diff -u -p -6 -r1.16 baseMenuOverlay.xul +--- browser/base/content/baseMenuOverlay.xul 1 Apr 2007 05:22:56 -0000 1.16 ++++ browser/base/content/baseMenuOverlay.xul 29 Nov 2007 13:11:29 -0000 +@@ -94,17 +94,17 @@ + #endif + +- +