From 2028cb321b5f76c968fb9b0bf0357eb19409888ef29ff624e38a34ee72a51ae0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 8 Jan 2007 11:23:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=1 --- .gitattributes | 23 + 358797.patch | 37 + MozillaFirefox.changes | 1238 +++++++ MozillaFirefox.desktop | 12 + MozillaFirefox.desktop.nld | 35 + MozillaFirefox.spec | 1213 +++++++ abuild.patch | 129 + add-plugins.sh.in | 70 + bookmarks.html.nld | 74 + bookmarks.html.suse | 36 + cjk-postscript-fonts.dif | 28 + configure.patch | 6180 +++++++++++++++++++++++++++++++++ credits.patch | 14 + cups-paper.patch | 858 +++++ dbus.patch | 565 +++ firefox-2.0-source.tar.bz2 | 3 + firefox-appname.patch | 26 + firefox-no-update.patch | 106 + firefox-suse-default-prefs.js | 21 + firefox-ui-lockdown.patch | 367 ++ firefox.1 | 125 + firefox.schemas | 287 ++ firefox48.png | 3 + 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.tar.bz2 | 3 + locale.patch | 11 + make-perl.patch | 17 + misc.dif | 20 + mozilla.sh.in | 165 + nspr-prdtoa.patch | 17 + nss-opt.patch | 22 + pango-cairo.patch | 134 + plastikfox-theme.tar.bz2 | 3 + postscript.patch | 29 + proxy-dev.patch | 168 + ready | 0 rpath.patch | 21 + search-addons.tar.bz2 | 3 + skin-selection.patch | 51 + startup.patch | 1075 ++++++ system-extensions.patch | 58 + system-proxies.patch | 894 +++++ tab-close.patch | 13 + tango-theme.tar.bz2 | 3 + visibility.patch | 31 + 50 files changed, 18343 insertions(+) create mode 100644 .gitattributes create mode 100644 358797.patch create mode 100644 MozillaFirefox.changes create mode 100644 MozillaFirefox.desktop create mode 100644 MozillaFirefox.desktop.nld create mode 100644 MozillaFirefox.spec create mode 100644 abuild.patch create mode 100644 add-plugins.sh.in create mode 100644 bookmarks.html.nld create mode 100644 bookmarks.html.suse create mode 100644 cjk-postscript-fonts.dif create mode 100644 configure.patch create mode 100644 credits.patch create mode 100644 cups-paper.patch create mode 100644 dbus.patch create mode 100644 firefox-2.0-source.tar.bz2 create mode 100644 firefox-appname.patch create mode 100644 firefox-no-update.patch create mode 100644 firefox-suse-default-prefs.js create mode 100644 firefox-ui-lockdown.patch create mode 100644 firefox.1 create mode 100644 firefox.schemas create mode 100644 firefox48.png create mode 100644 gcc-undefined-ops.patch create mode 100644 gconf-backend.patch create mode 100644 gecko-lockdown.patch create mode 100644 gnome-vfs-default.patch create mode 100644 gnome-vfs.patch create mode 100644 greasemonkey.patch create mode 100644 l10n.tar.bz2 create mode 100644 locale.patch create mode 100644 make-perl.patch create mode 100644 misc.dif create mode 100644 mozilla.sh.in create mode 100644 nspr-prdtoa.patch create mode 100644 nss-opt.patch create mode 100644 pango-cairo.patch create mode 100644 plastikfox-theme.tar.bz2 create mode 100644 postscript.patch create mode 100644 proxy-dev.patch create mode 100644 ready create mode 100644 rpath.patch create mode 100644 search-addons.tar.bz2 create mode 100644 skin-selection.patch create mode 100644 startup.patch create mode 100644 system-extensions.patch create mode 100644 system-proxies.patch create mode 100644 tab-close.patch create mode 100644 tango-theme.tar.bz2 create mode 100644 visibility.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..9b03811c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/358797.patch b/358797.patch new file mode 100644 index 00000000..df184bee --- /dev/null +++ b/358797.patch @@ -0,0 +1,37 @@ +Index: parser/htmlparser/src/nsParser.cpp +=================================================================== +RCS file: /cvsroot/mozilla/parser/htmlparser/src/nsParser.cpp,v +retrieving revision 3.370.4.4 +diff -u -p -6 -r3.370.4.4 nsParser.cpp +--- parser/htmlparser/src/nsParser.cpp 13 Jul 2006 17:28:08 -0000 3.370.4.4 ++++ parser/htmlparser/src/nsParser.cpp 1 Nov 2006 23:28:14 -0000 +@@ -1870,19 +1870,27 @@ nsParser::ParseFragment(const nsAString& + if (NS_FAILED(result)) { + mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; + return result; + } + + nsCOMPtr fragSink = do_QueryInterface(mSink); +- NS_ASSERTION(fragSink, "ParseFragment requires a fragment content sink"); ++ if (!fragSink) { ++ NS_ERROR("ParseFragment requires a fragment content sink"); ++ mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; ++ return kUnknownError; ++ } + + if (!aXMLMode) { + // First, we have to flush any tags that don't belong in the head if there + // was no in the context. + // XXX This is extremely ugly. Maybe CNavDTD should have FlushMisplaced()? +- NS_ASSERTION(mParserContext, "Parsing didn't create a parser context?"); ++ if (!mParserContext) { ++ NS_ERROR("Parsing didn't create a parser context?"); ++ mFlags |= NS_PARSER_FLAG_OBSERVERS_ENABLED; ++ return kInvalidParserContext; ++ } + nsCOMPtr dtd = do_QueryInterface(mParserContext->mDTD); + + if (dtd) { + CStartToken bodyToken(NS_LITERAL_STRING("BODY"), eHTMLTag_body); + nsCParserNode bodyNode(&bodyToken, 0); + diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes new file mode 100644 index 00000000..c8c01e44 --- /dev/null +++ b/MozillaFirefox.changes @@ -0,0 +1,1238 @@ +------------------------------------------------------------------- +Mon Jan 8 11:16:08 CET 2007 - meissner@suse.de + +- Do not provide MozillaFirebird, just obsolete it. + +------------------------------------------------------------------- +Fri Dec 1 02:22:49 CET 2006 - maw@suse.de + +- Update gecko-lockdown.patch (#220616). + +------------------------------------------------------------------- +Thu Nov 30 19:02:54 CET 2006 - maw@suse.de + +- Update firefox-suse-default-prefs.js, adding + 'pref("browser.backspace_action", 2);' (#217374) + +------------------------------------------------------------------- +Thu Nov 30 08:17:28 CET 2006 - aj@suse.de + +- Fix last change (#224431). + +------------------------------------------------------------------- +Wed Nov 29 11:45:47 CET 2006 - aj@suse.de + +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. + +------------------------------------------------------------------- +Tue Nov 28 08:09:48 CET 2006 - aj@suse.de + +- Sync from Buildservice with following critical fixes (thanks + Wolfgang Rosenauer!): + * fixed system-proxies.patch to actually work (#223881). + * Rearrange Bookmarks to pass trademark review. + +------------------------------------------------------------------- +Mon Nov 27 19:40:44 CET 2006 - aj@suse.de + +- Fix tango theme (#223796). + +------------------------------------------------------------------- +Mon Nov 27 17:40:50 CET 2006 - aj@suse.de + +- Use www.opensuse.org as home page. + +------------------------------------------------------------------- +Sun Nov 12 11:28:00 CET 2006 - aj@suse.de + +- Set novell.com as home page. +- Update from BuildService (thanks Wolfgang!): + - fixed crash in htmlparser (#217257, bmo #358797) + - added gconf2 as PreReq (#212505) + - added 32bit libaoss.so as requirement (#216266) + - Removed SUSE searchplugin (Portal not available anymore) + (#216054) + - Removed obsolete xul-picker.patch and system-nspr.patch + - Fixed building on 10.1 and 10.0 (dbus) + - Removed obsolete throbber preference + +------------------------------------------------------------------- +Thu Nov 9 19:09:46 CET 2006 - jhargadon@suse.de + +- updated tango theme + +------------------------------------------------------------------- +Sun Oct 29 12:05:46 CET 2006 - aj@suse.de + +- Another fix for 214125, patch by Wolfgang Rosenauer. + +------------------------------------------------------------------- +Thu Oct 26 06:58:59 CEST 2006 - aj@suse.de + +- Fix gcc warnings about undefined operations, patch by + Robert O'Callahan. +- Update system-proxies.patch to fix error box (214125), patch by + Robert O'Callahan. + +------------------------------------------------------------------- +Mon Oct 23 21:54:54 CEST 2006 - aj@suse.de + +- Update to current CVS version of 2.0. +- Use www.opensuse.org as default home page for now (#203547). + +------------------------------------------------------------------- +Sat Oct 21 08:53:50 CEST 2006 - aj@suse.de + +- Disable non-working plasticfox and tango themes. + +------------------------------------------------------------------- +Fri Oct 20 20:16:29 CEST 2006 - aj@suse.de + +- Fix building of locales. + +------------------------------------------------------------------- +Fri Oct 20 11:27:23 CEST 2006 - mkoenig@suse.de + +- update to version 2.0rc3: + * New features: Visual Refresh, Built-in phishing protection, + Enhanced search capabilities, Improved tabbed browsing, + Resuming your browsing session, Previewing and subscribing + to Web feeds, Inline spell checking, Live Titles, + Improved Add-ons manager, JavaScript 1.7, Extended search + plugin format, Updates to the extension system, + Client-side session and persistent storage, SVG text + +------------------------------------------------------------------- +Tue Oct 17 11:26:44 CEST 2006 - meissner@suse.de + +- disabled debugging. + +-------------------------------------------------------------------- +Tue Sep 12 20:27:02 CEST 2006 - stark@suse.de + +- security update to version 1.5.0.7 + +------------------------------------------------------------------- +Mon Aug 21 12:53:50 CEST 2006 - stark@suse.de + +- added greasemonkey helper change (#199920) +- fixed packager.mk for new make version + +------------------------------------------------------------------- +Fri Aug 11 20:51:48 CEST 2006 - stark@suse.de + +- fixed crash in dbus component (patch by thoenig #197928) +- use external adresses for PAC configuration (#196506) + +------------------------------------------------------------------- +Mon Aug 7 09:26:58 CEST 2006 - stark@suse.de + +- added symlink for Firefox 1.0.x compatibility + +------------------------------------------------------------------- +Sat Jul 29 08:48:53 CEST 2006 - stark@suse.de + +- update to regression release 1.5.0.6 (#195043) + +------------------------------------------------------------------- +Thu Jul 27 06:20:36 CEST 2006 - stark@suse.de + +- security update to version 1.5.0.5 (#195043) + * observer-lock.patch integrated now +- fixed leak in JS' liveconnect (#186066) +- fixed desktop file for old distributions + (StartupNotify=false) + +------------------------------------------------------------------- +Thu Jun 29 20:13:28 CEST 2006 - stark@suse.de + +- fixed printing crash if the last used printer is not available + anymore (#187013) + +------------------------------------------------------------------- +Fri Jun 16 22:11:22 CEST 2006 - stark@suse.de + +- added 48x48 icon (#185777) + +------------------------------------------------------------------- +Mon Jun 12 20:20:02 CEST 2006 - stark@suse.de + +- fix overwrite confirmation for GTK filesaver (#179531) +- get network.negotiate-auth.trusted-uris and + network.negotiate-auth.delegation-uris from gconf if + system-settings are enabled (#184489) + +------------------------------------------------------------------- +Thu Jun 1 20:34:43 CEST 2006 - stark@suse.de + +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) + +------------------------------------------------------------------- +Tue May 23 21:11:11 CEST 2006 - stark@suse.de + +- complete implementation of startup-notification (#115417) + (including autoconf and remote support) +- different home-pages for SLE10 and SL (#177881) + +------------------------------------------------------------------- +Tue May 16 06:27:26 CEST 2006 - stark@suse.de + +- fixed potential deadlock in nsObserverList::RemoveObserver + (#173986, bmo #338069) +- base startup notification on libstartup-notification (#115417) + +------------------------------------------------------------------- +Thu May 11 09:39:27 CEST 2006 - stark@suse.de + +- save printer settings properly (#174082, bmo #324072) +- added startup notification support for showing load activity + in Gnome and to avoid focus stealing prevention (#115417) +- added StartupNotify=true to desktop file (#115417) +- provide legacy symlink for NLD9 update compatibility (#173138) +- fixed system-proxies patch to avoid unwanted wpad requests + (#171743, #167613) + +------------------------------------------------------------------- +Mon May 8 14:55:52 CEST 2006 - stark@suse.de + +- preconfigure the theme according to the used desktop (#151163) + +------------------------------------------------------------------- +Thu Apr 27 10:24:07 CEST 2006 - stark@suse.de + +- last minute change for 1.5.0.3 + +------------------------------------------------------------------- +Wed Apr 26 14:23:33 CEST 2006 - stark@suse.de + +- security update to 1.5.0.3 +- fix for typo in postscript.patch + +------------------------------------------------------------------- +Tue Apr 25 14:14:51 CEST 2006 - stark@suse.de + +- fixed iframe crash (#169039, bmo #334515) +- fixed img tag misuse (#168710, bmo #334341) + +------------------------------------------------------------------- +Mon Apr 24 08:04:16 CEST 2006 - stark@suse.de + +- improved postscript output (bmo #334485) +- changed defaults for printer properties (#6534) +- overwrite gnome-vfs' file protocol by providing "desktop-launch" + (#131501) +- get available paper sizes from CUPS (#65482) +- replaced/removed complicated gconfd reload in %post (#167989) +- fixed memory leak in clipboard caching (bmo #289897) + +------------------------------------------------------------------- +Tue Apr 11 08:35:53 CEST 2006 - stark@suse.de + +- added (optional) plastikfox theme (#151163) +- get some more security related patches (#148876) +- finally fixed the default proxy configuration by adding a new + UI option (#132398) + +------------------------------------------------------------------- +Mon Apr 3 11:41:13 CEST 2006 - stark@suse.de + +- fixed keyword fixup patch (#162532) + +------------------------------------------------------------------- +Tue Mar 28 07:17:04 CEST 2006 - stark@suse.de + +- don't use keyword fixup for pasted text (#160034, bmo #331522) + +------------------------------------------------------------------- +Mon Mar 20 09:28:58 CET 2006 - stark@suse.de + +- added Tango theme +- fixed reading proxies from gconf (#132398) + +------------------------------------------------------------------- +Sun Mar 12 09:04:05 CET 2006 - stark@suse.de + +- tweaked bookmarks (fixed URLs) +- added Khmer (km-*) to pango locales (#157397) + +------------------------------------------------------------------- +Sat Mar 4 21:08:45 CET 2006 - stark@suse.de + +- fixed crash with multipart JPEGs (bmo #328684) (#140416) +- got latest security fixes from upstream (#148876) + +------------------------------------------------------------------- +Wed Feb 22 13:24:58 CET 2006 - stark@suse.de + +- fixed plugin loading when launched from Thunderbird (#151614) +- merged dbus reconnection patch (#150042) +- default to autodetect proxy (network.proxy.type=4) (#151811) +- added GTK category to desktop file + +------------------------------------------------------------------- +Tue Feb 14 06:45:24 CET 2006 - stark@suse.de + +- modified lockdown patches (#67281, #67282) +- applied set of security patches (#148876) + bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947 + +------------------------------------------------------------------- +Tue Feb 7 20:09:43 CET 2006 - stark@suse.de + +- fixed disabling of Pango (#148788) + +------------------------------------------------------------------- +Thu Feb 2 21:51:30 CET 2006 - stark@suse.de + +- define gssapi lib explicitely (#147670) +- use only official Firefox-Icon +- changed home-download patch + +------------------------------------------------------------------- +Sun Jan 29 09:54:49 CET 2006 - stark@suse.de + +- throbber URL is default again +- removed firefox-showpass patch +- removed additional CA certs from builtin NSS + +------------------------------------------------------------------- +Fri Jan 27 17:55:21 CET 2006 - stark@suse.de + +- got some l10n changes from 1.8.0 branch + +------------------------------------------------------------------- +Fri Jan 27 08:15:09 CET 2006 - stark@suse.de + +- final 1.5.0.1 version +- make it possible to choose $HOME as download directory + (#144894, bmo #300856) + +------------------------------------------------------------------- +Wed Jan 25 21:33:43 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sun Jan 22 17:06:57 CET 2006 - stark@suse.de + +- disable Pango if MOZ_ENABLE_PANGO is not set + and no typical language which needs Pango is used (#143428) + +------------------------------------------------------------------- +Wed Jan 18 10:27:30 CET 2006 - stark@suse.de + +- fixed DumpStackToFile() for glibc 2.4 +- added default (font) settings + +------------------------------------------------------------------- +Thu Jan 12 10:23:58 CET 2006 - stark@suse.de + +- update to 1.5.0.1pre (20060111) +- updated man-page +- fixed hovered tab close button +- only Requires mozilla-nspr instead of PreReq since + there is no postinstall registration necessary anymore +- use system NSS from CODE10 on +- use -fstack-protector where available +- changed unixproxy component to work on older distributions + +------------------------------------------------------------------- +Mon Jan 2 13:39:09 CET 2006 - stark@suse.de + +- added unixproxy component written by Robert O'Callahan (#132398) + (bmo #66057) +- added official translations +- preload libaoss for plugin sound (#117079) + +------------------------------------------------------------------- +Wed Dec 28 08:16:03 CET 2005 - stark@suse.de + +- get some patches from 1.8.0 branch +- readded modification to gconf-backend (bmo #321315) +- readded lockdown stuff +- enable additional extension install directory (#120329) + (/usr/lib/browser-extensions/firefox) +- added patch to make the XUL filechooser optional + (MOZ_XUL_PICKER) + +------------------------------------------------------------------- +Wed Dec 14 16:08:12 CET 2005 - stark@suse.de + +- fixed patch for parsing -remote parameter +- removed default-plugin patch (not needed anymore) + +------------------------------------------------------------------- +Fri Dec 9 17:21:29 CET 2005 - stark@suse.de + +- fix to ignore X composite extension (#135373) +- fixed parsing of -remote parameters (#134396) +- activated locales as released + +------------------------------------------------------------------- +Tue Nov 29 21:33:13 CET 2005 - stark@suse.de + +- update to 1.5 (20051128) +- don't override startup URL when changing Gecko versions (#135314) +- added patch for GTK2 handling (#134831) +- readded add-plugins stuff for compatibility + +------------------------------------------------------------------- +Fri Nov 18 07:41:41 CET 2005 - stark@suse.de + +- update to 1.5rc3 (20051117) + +------------------------------------------------------------------- +Mon Oct 31 08:58:14 CET 2005 - stark@suse.de + +- updated l10n archive (20051030) +- fixed postinstall script to copy plugin links instead of files + +------------------------------------------------------------------- +Fri Oct 28 06:43:27 CEST 2005 - stark@suse.de + +- update to 1.5rc1 (20051027) +- fixed profile locking on FAT partitions (bmo #313360) +- introduced an rpath again + +------------------------------------------------------------------- +Wed Oct 19 20:03:48 CEST 2005 - stark@suse.de + +- update to snapshot 1.5 (20051019) +- moved installation to /usr/%{_lib}/firefox +- added dbus component to be able to get network status from + NetworkManager (bmo #312793) +- remove all update UI for application +- removed diable-gconf (no registration at build time anymore) +- removed rebuild-databases.sh (no system registration anymore) +- open links in new windows (#128087) + +------------------------------------------------------------------- +Thu Oct 6 20:44:53 CEST 2005 - stark@suse.de + +- update to Firefox 1.5b2 (20051005) +- added supported translations + +------------------------------------------------------------------- +Sat Oct 1 15:09:18 CEST 2005 - stark@suse.de + +- update to Firefox 1.5b1 (20050930) RPM version 1.4.1 +- removed rebuild-databases.sh calls +- removed add-plugins.sh calls and corresponding triggers +- enabled SVG and Canvas support +- fixed gconf urlhandler registration + +------------------------------------------------------------------- +Tue Sep 20 10:24:16 CEST 2005 - stark@suse.de + +- security update to 1.0.7 (#117619) + * MFSA 2005-57: IDN heap overrun using soft-hyphens (bmo #307259) + (enabled IDN pref again) + * MFSA 2005-58: + CAN-2005-2701 Heap overrun in XBM image processing + CAN-2005-2702 Crash on "zero-width non-joiner" sequence + CAN-2005-2703 XMLHttpRequest header spoofing + CAN-2005-2704 Object spoofing using XBL + CAN-2005-2705 JavaScript integer overflow + CAN-2005-2706 Privilege escalation using about: scheme + CAN-2005-2707 Chrome window spoofing + Regression fixes +- register beagle extension if it gets installed (#116787) + +------------------------------------------------------------------- +Tue Sep 13 15:41:37 CEST 2005 - aj@suse.de + +- Change SUSE bookmarks. + +------------------------------------------------------------------- +Sun Sep 11 17:05:07 CEST 2005 - stark@suse.de + +- disable IDN per default (#116070) +- unlocalize bookmarks (#114279) + +------------------------------------------------------------------- +Thu Sep 8 08:52:13 CEST 2005 - stark@suse.de + +- fixed some filemodes (#114849) + +------------------------------------------------------------------- +Sun Sep 4 00:03:53 CEST 2005 - stark@suse.de + +- fixed gconf-backend patch to be able to use + system prefs (#114054) + +------------------------------------------------------------------- +Thu Sep 1 13:22:17 CEST 2005 - stark@suse.de + +- changed default font to sans-serif (#114464) +- removed de-de parts of the bookmark-links (#114279) + +------------------------------------------------------------------- +Mon Aug 22 06:10:12 CEST 2005 - stark@suse.de + +- install gconf schema for lockdown also on non-NLD +- added backports (firefox-backports.patch) + * gtk_im_context_set_cursor_location() is not used (bmo #281339) + * fixed crash in imgCacheValidator::OnStartRequest() + (bmo #293307) +- workaround for linking with pangoxft and pangox + (broken by gtk 2.8 update) (#105764) +- remove extensions on deinstallation +- include dragonegg (kparts) plugin (#105468) + +------------------------------------------------------------------- +Thu Aug 18 13:08:55 CEST 2005 - stark@suse.de + +- fixed regression in profile locking change (bmo #303633) +- added rtsp handler to global config (#104434) +- don't blacklist help: protocol (bmo #304833) +- fixed Gdk-WARNING at startup (gtk.patch) +- fixed crash with gtk 2.7 (bmo #300226, bnc #104586) +- fixed installation of the beagle plugin +- update industrial theme to 1.0.11 (#104564) +- included lockdownV2 (removed obsolete gconf.diff) +- linked firefox-bin with rpath to progdir + +------------------------------------------------------------------- +Fri Aug 5 09:51:26 CEST 2005 - stark@suse.de + +- fixed profile locking (bmo #151188) +- install beagle extension globally + +------------------------------------------------------------------- +Fri Jul 29 06:58:24 CEST 2005 - stark@suse.de + +- don't require and provide NSS libs (#98002) +- fixed printing error 'You cannot print while in print preview' + (#96991, bmo #302445) + +------------------------------------------------------------------- +Wed Jul 27 09:34:12 CEST 2005 - stark@suse.de + +- fixed Firefox on ppc (stack-direction.patch) (#97359) +- removed open-pref from startscript as it is done + automatically now (#73042) +- updated Novell searchplugins + +------------------------------------------------------------------- +Mon Jul 25 12:32:13 CEST 2005 - stark@suse.de + +- GTK filechooser is now modal (#8533) +- backed out patch to add tooltips to print-preview + because it breaks localization + +------------------------------------------------------------------- +Fri Jul 22 10:54:39 CEST 2005 - stark@suse.de + +- fixed another problem in printing patch + +------------------------------------------------------------------- +Tue Jul 19 10:44:59 CEST 2005 - stark@suse.de + +- fixed error in ft-xft-ps2.patch +- disabled stripping in spec instead of patch +- added NSPR to PreReq + +------------------------------------------------------------------- +Mon Jul 18 08:43:24 CEST 2005 - stark@suse.de + +- fixed some more regressions with final 1.0.6 +- fixed width calculation in Postscript module (bmo #290292) +- fixed plugin event starvation (bnc #94749, #94751, bmo #301161) + +------------------------------------------------------------------- +Fri Jul 15 11:24:47 CEST 2005 - stark@suse.de + +- searchplugins can now be installed per profile (#8176) + +------------------------------------------------------------------- +Fri Jul 15 06:54:02 CEST 2005 - stark@suse.de + +- update to 1.0.6 which restores API compatibility + +------------------------------------------------------------------- +Tue Jul 12 06:20:37 CEST 2005 - stark@suse.de + +- update to 1.0.5 final (#88509) +- don't strip explicitely +- don't ship beagle.xpi + +------------------------------------------------------------------- +Wed Jul 6 14:13:09 CEST 2005 - stark@suse.de + +- update to 1.0.5-pre (20050705) +- use RPM_OPT_FLAGS for NSS component +- fixed implicit declarations and uninitialized used variables +- added patch for bmo #87969 + +------------------------------------------------------------------- +Tue Jul 5 10:17:16 CEST 2005 - stark@suse.de + +- fixed regression from security update (#95069, bmo #298478) + +------------------------------------------------------------------- +Mon Jun 27 21:46:58 CEST 2005 - stark@suse.de + +- don't use system-prefs by default on NLD +- removed basic lockdown stuff for SUSE Linux + (it's not needed and caused problems: bnc #75418) +- fixed NLD lockdown patch (bnc #75418) +- don't write prefs back to gconf for now + +------------------------------------------------------------------- +Wed Jun 22 07:32:42 CEST 2005 - stark@suse.de + +- new NLD lockdown patch which is syncing user prefs to gconf +- update to 1.0.5pre security-release + +------------------------------------------------------------------- +Thu Jun 9 06:56:02 CEST 2005 - stark@suse.de + +- new revision of NLD lockdown patch +- fixed remote usage behaviour in start script (bnc #41903) +- got more bugfixes from the branch + +------------------------------------------------------------------- +Thu Jun 2 10:31:48 CEST 2005 - stark@suse.de + +- fixed neededforbuild + +------------------------------------------------------------------- +Wed Jun 1 20:15:25 CEST 2005 - stark@suse.de + +- fixed IDN for 64bit platforms (bmo #236425, bnc #46268) + +------------------------------------------------------------------- +Fri May 20 15:12:06 CEST 2005 - stark@suse.de + +- fixed keybinding for KP separator (bnc #84147) +- pulled security related patch from upstream branch +- update plastikfox theme to version 1.6 + +------------------------------------------------------------------- +Thu May 12 06:16:25 CEST 2005 - stark@suse.de + +- update to final 1.0.4 release + +------------------------------------------------------------------- +Tue May 10 06:38:05 CEST 2005 - stark@suse.de + +- update to 1.0.4 security release +- removed s390(x) patches (upstream) +- made two more files %verify (81692) +- updated NLD lockdown patch (81304) + +------------------------------------------------------------------- +Thu Apr 28 09:45:53 CEST 2005 - stark@suse.de + +- use static NSPR libs from new location + +------------------------------------------------------------------- +Sat Apr 23 15:56:08 CEST 2005 - stark@suse.de + +- activate usage of system NSPR for distributions after 9.3 +- add patch to be able to use systen NSPR at all + +------------------------------------------------------------------- +Fri Apr 22 02:06:06 CEST 2005 - ro@suse.de + +- use mozilla-gcc4.patch + +------------------------------------------------------------------- +Thu Apr 21 12:51:19 CEST 2005 - stark@suse.de + +- don't execute gconf magic within build environment + +------------------------------------------------------------------- +Sat Apr 16 13:05:37 CEST 2005 - stark@suse.de + +- update to final 1.0.3 release + +------------------------------------------------------------------- +Fri Apr 15 00:10:54 CEST 2005 - ro@suse.de + +- fix problem in postinstall script + +------------------------------------------------------------------- +Wed Apr 14 09:20:02 CEST 2005 - stark@suse.de + +- included fixed lockdown patch for NLD +- linked proxies within Firefox with gnome settings (NLD) +- added gconfd restart procedure to install script + (only needed if gconf changes are done) (#76852) + +------------------------------------------------------------------- +Sat Apr 2 21:03:11 CEST 2005 - stark@suse.de + +- update to security pre-release 1.0.3 (#75692) + * Manual plug-in install, javascript vulnerability (bmo #288556) + * Access memory vulnerability (bmo #288688) + +------------------------------------------------------------------- +Fri Apr 1 11:32:44 CEST 2005 - stark@suse.de + +- added advanced lockdown features for ZLM integration (NLD-only) + +------------------------------------------------------------------- +Tue Mar 22 12:33:15 CET 2005 - stark@suse.de + +- update to final 1.0.2 +- use new theme handling on NLD +- added default-plugin-less-annoying from mozilla +- use GTK2 for Flash +- use system NSPR on SUSE releases after 9.3 +- made startscript PIS aware +- set g-application-name correctly (bmo #281979) +- added man-page +- use GTK system colors +- modify useragent string and add vendor id +- activate smooth-scrolling by default (#74310) + +------------------------------------------------------------------- +Tue Mar 22 08:59:06 CET 2005 - stark@suse.de + +- don't register beagle automatically (#74062) +- added default bookmarks for SUSE LINUX + +------------------------------------------------------------------- +Mon Mar 21 18:20:39 CET 2005 - max@suse.de + +- Fixed a typo in the shell code that handles inclusion of the + Acrobat Reader plugin (#70861). + +------------------------------------------------------------------- +Thu Mar 17 21:01:11 CET 2005 - stark@suse.de + +- updates from upcoming 1.0.2 +- added again logic to use Adobe Reader 7 (#70861) +- fixed crash in ICO decoding (#67142, bmo #245631) +- preinstall beagle extension (#72920) +- bugfixes in trigger scripts +- fixed industrial theming for Gnome (#72918) + +------------------------------------------------------------------- +Sat Mar 12 12:42:16 CET 2005 - stark@suse.de + +- fixed more security related bugs + (bmo #284551, #284627, #285595) + +------------------------------------------------------------------- +Wed Mar 9 21:42:05 CET 2005 - stark@suse.de + +- update also GNOME desktop file (#71810) +- added firefox-gnome.png to filelist +- use correct Firefox icon + +------------------------------------------------------------------- +Mon Mar 7 16:13:29 CET 2005 - adrian@suse.de + +- use standard icon again for the default desktop file and + add a Gnome-only desktop file for the Gnome icon +- add plastikfox chrome theme to fix button order within KDE +- add patch for automatic theme selection for KDE and Gnome +- do register extensions in rebuild-databases.sh instead of %install, + to fix needed timestamps + +------------------------------------------------------------------- +Mon Mar 7 20:47:00 CET 2005 - stark@suse.de + +- disable inclusion of acrobat plugin again (#70861) +- don't use gconfd in registration phase (#66381) + +------------------------------------------------------------------- +Fri Mar 4 07:54:47 CET 2005 - stark@suse.de + +- extend add-plugins to recognize Java 1.5 (#66909) +- changed comment in desktop-file (#66867) + +------------------------------------------------------------------- +Tue Feb 22 09:33:44 CET 2005 - stark@suse.de + +- make --display parameter working in all cases (bnc #66043) +- revised postscript patch +- final 1.0.1 codebase + +------------------------------------------------------------------- +Mon Feb 21 13:09:30 CET 2005 - stark@suse.de + +- added patch to create Postscript level 2 (instead of 3) + (special thanks to Jungshik Shin) +- disabled freetype explicitly to be able to use the above patch + (freetype wasn't used anymore since some time anyway) + +------------------------------------------------------------------- +Fri Feb 18 09:10:10 CET 2005 - stark@suse.de + +- got more patches from branch to get another IDN fix and to + fix bug #51019 +- enabled IDN again + +------------------------------------------------------------------- +Wed Feb 16 09:20:39 CET 2005 - stark@suse.de + +- bumped version number to 1.0.1 + +------------------------------------------------------------------- +Tue Feb 15 10:26:04 CET 2005 - stark@suse.de + +- got updates from 1.0.1 branch + +------------------------------------------------------------------- +Thu Feb 10 06:57:33 CET 2005 - stark@suse.de + +- additional fireflashing fix (#50635, bmo #280664) +- some more security related fixes + (bmo #268483, #273498, #277322) +- fire up GTK2 filepicker if GNOME is running + +------------------------------------------------------------------- +Tue Feb 8 07:51:13 CET 2005 - stark@suse.de + +- some prefs are ignored (bmo #261934) +- disabled default IDN (#50566) +- fixed some more bugzilla.mozilla.org bugs: + #276482, #280056, #280603 + +------------------------------------------------------------------- +Sun Feb 6 13:10:12 CET 2005 - stark@suse.de + +- use same desktop categories for Professional and NLD +- added some lockdown stuff for printing and page saving + (bmo #280488) + +------------------------------------------------------------------- +Wed Feb 2 13:58:53 CET 2005 - stark@suse.de + +- modified gconf.diff to honor ignore_hosts (bmo #280742) +- added a JS crasher fix (bmo #268535) +- added more fixes (bmo #255441, #273024, #275405, #275634) + +------------------------------------------------------------------- +Fri Jan 28 12:39:37 CET 2005 - stark@suse.de + +- added gplflash inclusion +- improved JRE inclusion +- reactivated usage of Acrobat Reader plugin + (ready for acroread 7) + +------------------------------------------------------------------- +Sat Jan 22 13:16:47 CET 2005 - stark@suse.de + +- added some backported bugfixes + +------------------------------------------------------------------- +Sat Dec 18 10:30:11 CET 2004 - stark@suse.de + +- updated industrial theme to 1.0.9 +- use slightly changed icon for menu-entry (bnc #275) +- use original desktop file for NLD again + +------------------------------------------------------------------- +Thu Dec 16 19:37:48 CET 2004 - stark@suse.de + +- newer patch for GNOME associations (bnc #362) +- fix overwriting of files with GTK picker (Ximian #65068) +- readded the industrial default theme patch for NLD + +------------------------------------------------------------------- +Wed Dec 15 11:50:56 CET 2004 - stark@suse.de + +- activate GTK filepicker for NLD again +- fix for GNOME helper applications with parameters +- make GNOME associations the default on NLD + +------------------------------------------------------------------- +Sat Dec 4 16:11:01 CET 2004 - stark@suse.de + +- fixed build on s390/s390x +- added patch to be able to install-global without running X + (bmo #265859) + +------------------------------------------------------------------- +Thu Nov 18 21:48:05 CET 2004 - stark@suse.de + +- update industrial theme to 1.0.8 (still not activated) +- added patch to make home-directory the default download dir + (on NLD is still used Desktop) + +------------------------------------------------------------------- +Thu Nov 11 09:01:58 CET 2004 - stark@suse.de + +- made initial window height smaller again + +------------------------------------------------------------------- +Tue Nov 9 09:09:06 CET 2004 - stark@suse.de + +- update to final 1.0 release (20041109) + +------------------------------------------------------------------- +Thu Nov 4 08:22:36 CET 2004 - stark@suse.de + +- update to 1.0rc2 + +------------------------------------------------------------------- +Sat Oct 30 21:27:29 CEST 2004 - stark@suse.de + +- added missing s390(x) patch + +------------------------------------------------------------------- +Wed Oct 27 07:26:25 CEST 2004 - stark@suse.de + +- update to 1.0rc1 codebase +- printing via XFT/fontconfig +- freetype changes to avoid API conflicts with newer freetype2 +- fixed build for s390/s390x +- removed AMD64 patch (included upstream) +- added translations sub-package +- removed "Show folder" patch for NLD (resolved upstream) +- don't use gnome-filepicker patch for NLD for now +- removed hppa buildfix (included upstream) +- removed untitled.patch (bmo #24068) resolved by (bmo #262478) +- use make -C browser/installer now to prepare installation +- don't check for default browser at startup (#47587) +- updated industrial.jar (0.99.13) (disabled) + +------------------------------------------------------------------- +Fri Oct 15 13:51:54 CEST 2004 - stark@suse.de + +- inherit locale from system +- fixed chrome registration + +------------------------------------------------------------------- +Wed Oct 6 23:11:01 CEST 2004 - joeshaw@suse.de + + - disable gconf settings as default (Ximian #67718) + +------------------------------------------------------------------- +Wed Oct 6 07:04:05 CEST 2004 - stark@suse.de + +- fixed inclusion of RealPlayer plugin again + +------------------------------------------------------------------- +Tue Oct 5 10:09:04 CEST 2004 - stark@suse.de + +- small important fix in firefox-download.patch (Ximian #65472) + +------------------------------------------------------------------- +Sun Oct 3 00:02:09 CEST 2004 - stark@suse.de + +- added security-fix from 0.10.1 (mozilla.org #259708) (#46687) + +------------------------------------------------------------------- +Fri Oct 1 12:49:38 CEST 2004 - stark@suse.de + +- final fix for downloading to Desktop folder (Ximian #65756) +- remove Postscript from printer names (Ximian #65560) + +------------------------------------------------------------------- +Thu Sep 30 16:14:10 CEST 2004 - shprasad@suse.de + +- Modified the MozillaFirefox.desktop file. + Changed the name 'Firefox' to 'Firefox Web Browser'. + Also changed it for all languages. + +------------------------------------------------------------------- +Wed Sep 29 15:54:46 CEST 2004 - stark@suse.de + +- fix inclusion of RealPlayer plugin (Ximian #65711) + +------------------------------------------------------------------- +Mon Sep 27 17:51:24 CEST 2004 - joeshaw@suse.de + +- Update the industrial default patch, for some reason it didn't + take before. + +------------------------------------------------------------------- +Fri Sep 24 07:34:48 CEST 2004 - stark@suse.de + +- fix for Ximian #65176 (mozilla.org #240068) +- revised patch for update function (Ximian #65615) + +------------------------------------------------------------------- +Thu Sep 23 20:21:39 CEST 2004 - joeshaw@suse.de + +- Uncomment the patch which tells the UI that industrial is the + default. + +------------------------------------------------------------------- +Thu Sep 23 12:38:06 CEST 2004 - stark@suse.de + +- open Nautilus on NLD for 'Show folder' in download settings + (Ximian #65472) by sragavan@novell.com +- save to Desktop folder if selected (Ximian #65756) + by sragavan@novell.com + +------------------------------------------------------------------- +Wed Sep 22 10:23:01 CEST 2004 - stark@suse.de + +- synced NLD package with 9.2 version +- GTK2 filepicker does now ask for confirmation when overwriting + files (Ximian #65068) by sagarwala@novell.com +- no direct update function (Ximian #65615) by rganesan@novell.com +- throbber linked to Novell (Ximian #66283) by rganesan@novell.com +- make industrial the default theme for NLD + (Ximian #65542) by joeshaw@suse.de + +------------------------------------------------------------------- +Mon Sep 20 22:00:55 CEST 2004 - joeshaw@suse.de + +- Add default bookmarks. Ximian #65546. +- Add the industrial theme, but it's not the default yet. +- Remove acroread from add-plugins because it's badly behaved. + Ximian #65499. + +------------------------------------------------------------------- +Mon Sep 20 17:57:38 CEST 2004 - federico@ximian.com + +- Added MozillaFirefox-toplevel-window-height.diff for + http://bugzilla.ximian.com/show_bug.cgi?id=65543 + +------------------------------------------------------------------- +Sun Sep 19 15:42:30 CEST 2004 - stark@suse.de + +- use GNOME system prefs only for NLD by default + (fixes bug #45575) + +------------------------------------------------------------------- +Fri Sep 17 08:59:32 CEST 2004 - stark@suse.de + +- joeshaw@suse.de: Update GConf patch so that proxy settings work + correctly (Ximian #64461) +- don't search Java on every path (Ximian #65383) +- added some missing fixes for official release +- added new java package name for triggers (#45257) + +------------------------------------------------------------------- +Sat Sep 11 13:25:41 CEST 2004 - stark@suse.de + +- update to official 1.0PR (0.10) +- adopted gnome-filepicker patch +- removed obsolete CUPS hack from start-script + (Ximian #65635, #65560) + +------------------------------------------------------------------- +Thu Sep 9 21:35:42 CEST 2004 - stark@suse.de + +- fixed endianess on AMD64 in JS component (#34743) + +------------------------------------------------------------------- +Mon Sep 6 17:33:07 CEST 2004 - stark@suse.de + +- fixed filelist + +------------------------------------------------------------------- +Mon Sep 6 13:48:03 CEST 2004 - stark@suse.de + +- update to 1.0PR (aka 0.10) + +------------------------------------------------------------------- +Fri Sep 3 21:35:47 CEST 2004 - stark@suse.de + +- added ppc64 patch + +------------------------------------------------------------------- +Thu Sep 2 03:08:59 CEST 2004 - dave@suse.de + +- Fixed up the .desktop installation on nld + +------------------------------------------------------------------- +Wed Sep 1 15:05:48 CEST 2004 - shprasad@suse.de + +- Doesn't ask to set Firefox as default web-browser. + +------------------------------------------------------------------- +Tue Aug 31 14:01:18 CEST 2004 - stark@suse.de + +- next new version for filepicker stuff +- deactivated native filepicker for NLD +- update to snapshot (20040831) + +------------------------------------------------------------------- +Tue Aug 24 17:35:52 CEST 2004 - stark@suse.de + +- new version of gnome-filepicker patch +- added patch for config + +------------------------------------------------------------------- +Fri Aug 20 17:12:48 CEST 2004 - stark@suse.de + +- update to snapshot (20040820) + +------------------------------------------------------------------- +Thu Aug 19 08:46:42 CEST 2004 - stark@suse.de + +- added workaround for mozilla bug #246313 + (Firefox does not start: getting "cannot open display" error) + +------------------------------------------------------------------- +Wed Aug 18 15:07:22 CEST 2004 - stark@suse.de + +- added some patches from Ximian + - use GNOME filepicker + - use more gconf settings + - set startup homepage to Novell + +------------------------------------------------------------------- +Tue Aug 17 13:12:35 CEST 2004 - stark@suse.de + +- update to pre-1.0.0 (20040817) + +------------------------------------------------------------------- +Thu Aug 5 06:27:41 CEST 2004 - stark@suse.de + +- security update to 0.9.3 + (including #43312 and others) +- handle RealPlayer 9 plugin + +------------------------------------------------------------------- +Mon Aug 2 15:11:51 CEST 2004 - ro@suse.de + +- recode desktop file to utf-8 + +------------------------------------------------------------------- +Wed Jul 28 08:46:31 CEST 2004 - stark@suse.de + +- added fix against certificate spoofing (#43312) + +------------------------------------------------------------------- +Fri Jul 23 06:31:41 CEST 2004 - stark@suse.de + +- update to 0.9.2 +- added workaround for extension registry +- removed old (incompatible) mozex extension + +------------------------------------------------------------------- +Tue Jun 29 06:27:59 CEST 2004 - stark@suse.de + +- update to 0.9.1 +- added hint to run as root first + +------------------------------------------------------------------- +Tue Jun 15 12:42:28 CEST 2004 - stark@suse.de + +- update to 0.9 +- added patch for newer freetype + +------------------------------------------------------------------- +Mon Mar 29 11:43:51 CEST 2004 - stark@suse.de + +- update to 0.8.0+ (20040503) +- removed firefox logos and activate official branding for + milestone builds +- changed profile-dir to .firefox +- added some needed files +- enabled gnomevfs extension + +------------------------------------------------------------------- +Fri Apr 2 10:31:45 CEST 2004 - stark@suse.de + +- removing relocation of TEMP directory (#34391) + +------------------------------------------------------------------- +Fri Mar 26 18:09:34 CET 2004 - uli@suse.de + +- fixed hang during build on s390* (bug #35440) + +------------------------------------------------------------------- +Wed Mar 3 06:52:00 CET 2004 - stark@suse.de + +- removed unused patches for GTK2 build +- more fixes for (#35179) + +------------------------------------------------------------------- +Mon Mar 1 07:32:52 CET 2004 - stark@suse.de + +- improved start-script to interact with thunderbird (#35179) + +------------------------------------------------------------------- +Thu Feb 26 06:57:05 CET 2004 - stark@suse.de + +- use official releasedate +- added official (trademarked) artwork +- added firefox icon to /usr/share/pixmaps +- cleaned up spec-file (there will be no GTK1 version) + +------------------------------------------------------------------- +Tue Feb 24 16:43:17 CET 2004 - stark@suse.de + +- fixed optimization for non-x86 archs + +------------------------------------------------------------------- +Tue Feb 24 07:43:35 CET 2004 - stark@suse.de + +- adopted file-list and build options to original distribution +- added prdtoa fix (#32963) +- added hook for static firefox build to rebuild-databases.sh +- added compiler flags for security/ (nss-opt.patch) +- included mozex (mozex.mozdev.org) +- added -Os as optimization flag + +------------------------------------------------------------------- +Mon Feb 9 21:59:37 CET 2004 - stark@suse.de + +- renamed to MozillaFirefox +- update to final version 0.8 + +------------------------------------------------------------------- +Fri Feb 6 08:39:15 CET 2004 - stark@suse.de + +- update to Firebird 0.8 (20040205) +- added mips build fix +- set PS printer list in MozillaFirebird.sh +- use lib64 again for biarch platforms + +------------------------------------------------------------------- +Sat Jan 10 10:33:54 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Fri Aug 22 11:32:07 CEST 2003 - stark@suse.de + +- upstream sync for 0.6.1post + +------------------------------------------------------------------- +Sun Aug 10 22:01:12 CEST 2003 - stark@suse.de + +- removed dmoz from searchplugins-filelist + +------------------------------------------------------------------- +Fri Aug 8 10:30:50 CEST 2003 - stark@suse.de + +- update to 0.6.1post (TRUNK) +- use -fno-strict-aliasing + +------------------------------------------------------------------- +Thu Jul 31 11:25:39 CEST 2003 - stark@suse.de + +- update to 0.6.1 (MOZILLA_1_4_BRANCH) +- synchronized with mozilla-source +- created file-list + +------------------------------------------------------------------- +Thu Jul 10 09:45:49 CEST 2003 - stark@suse.de + +- update to snapshot 20030709 +- fixed generation of symlink MozillaFirebird-xremote-client + +------------------------------------------------------------------- +Fri Jun 20 06:53:08 CEST 2003 - stark@suse.de + +- update to snapshot 20030622 (0.7pre) + +------------------------------------------------------------------- +Mon May 19 08:54:46 CEST 2003 - stark@suse.de + +- update to snapshot 20030518 (0.6) + +------------------------------------------------------------------- +Sun May 7 10:11:16 CEST 2003 - stark@suse.de + +- update to snapshot 20030507 + +------------------------------------------------------------------- +Wed Apr 30 13:26:43 CEST 2003 - stark@suse.de + +- initial SuSE package + diff --git a/MozillaFirefox.desktop b/MozillaFirefox.desktop new file mode 100644 index 00000000..b6df4375 --- /dev/null +++ b/MozillaFirefox.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Firefox +GenericName=Web Browser +Comment=Web Browser +TryExec=firefox +Exec=firefox %u +Icon=firefox +Terminal=false +StartupNotify=true +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +Type=Application diff --git a/MozillaFirefox.desktop.nld b/MozillaFirefox.desktop.nld new file mode 100644 index 00000000..a7a3227f --- /dev/null +++ b/MozillaFirefox.desktop.nld @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 00000000..0e16ace0 --- /dev/null +++ b/MozillaFirefox.spec @@ -0,0 +1,1213 @@ +# +# spec file for package MozillaFirefox (Version 2.0) +# +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: MozillaFirefox +BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel update-desktop-files zip +%if %suse_version <= 1010 +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-1-glib-devel +%endif +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Provides: web_browser +Provides: firefox +Obsoletes: MozillaFirebird +%if %sles_version == 10 +Obsoletes: mozilla +%endif +Version: 2.0 +Release: 41 +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-2.0-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 +Source5: search-addons.tar.bz2 +Source6: MozillaFirefox.desktop.nld +Source7: l10n.tar.bz2 +Source8: plastikfox-theme.tar.bz2 +Source9: bookmarks.html.nld +Source10: bookmarks.html.suse +Source11: firefox48.png +Source16: firefox.1 +Source17: firefox-suse-default-prefs.js +Source18: firefox.schemas +Patch1: visibility.patch +Patch2: rpath.patch +Patch3: gcc-undefined-ops.patch +Patch4: pango-cairo.patch +Patch5: abuild.patch +# NSPR bmo #270502 +Patch6: nspr-prdtoa.patch +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 +Patch14: credits.patch +# bmo #273524 (only for NLD) +Patch16: gnome-vfs-default.patch +# integration +Patch17: firefox-appname.patch +Patch18: firefox-no-update.patch +Patch19: dbus.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 #307877 +Patch28: tab-close.patch +# bmo #331522 +Patch32: postscript.patch +Patch33: proxy-dev.patch +# integration +Patch34: skin-selection.patch +Patch36: greasemonkey.patch +Patch37: make-perl.patch +Patch38: 358797.patch +# pango-cairo.patch dbus.patch startup.patch +Patch100: configure.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: libstdc++ fileutils textutils /bin/sh gconf2 +Requires: /usr/lib/libaoss.so +%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 +%define _unpackaged_files_terminate_build 0 +%define releasedate 2006102300 +%define progname firefox +%if %suse_version < 1010 +%define progdir /opt/MozillaFirefox/%_lib +%else +%define progdir %{_prefix}/%_lib/firefox +%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 +Mozilla Firefox, formerly known as Phoenix and Firebird, is a redesign +of the Mozilla browser component, similar to Galeon, K-Meleon and +Camino, but written using the XUL user interface language and designed +to be cross-platform. It is a stand-alone application instead of part +of the Mozilla Application Suite. + + + +Authors: +-------- + Mozilla Foundation + +%package translations +Summary: Translations for MozillaFirefox +Group: Productivity/Networking/Web/Browsers +PreReq: %{name} = %{version} + +%description translations +This package contains several optional languages for the user interface +of MozillaFirefox. + + + +Authors: +-------- + Mozilla Foundation + +%prep +%setup -q -n mozilla -b 7 -b 4 -b 8 +cd $RPM_BUILD_DIR/mozilla +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +# lockdown stuff +%patch8 +%patch9 +%patch10 +%patch11 +%patch12 +%patch13 +%patch14 +%patch17 +%patch18 +%patch19 +# system NSS +%patch22 +%patch23 +%patch24 +%patch25 +%patch27 +%patch28 +%if %nld9 +%patch16 +%endif +%patch32 +%patch33 +%patch34 +%patch36 +%patch37 +%patch38 +%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" +%if %suse_version > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +%endif +export CXXFLAGS="$CFLAGS" +export RPATH="-Wl,-rpath -Wl,%{progdir}" +export MOZCONFIG=$RPM_BUILD_DIR/mozconfig +cat << EOF > $MOZCONFIG +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} +. \$topsrcdir/browser/config/mozconfig +ac_add_options --prefix=%{_prefix} +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-jpeg +ac_add_options --with-system-png +ac_add_options --with-system-mng +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 --disable-installer +ac_add_options --enable-static +ac_add_options --disable-shared +ac_add_options --disable-tests +ac_add_options --disable-debug +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 +EOF +%endif +make -f client.mk build + +%install +make -C browser/installer STRIP=/bin/true +# copy tree into RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{progdir} +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 +# Removed he since it's broken +#for locale in ar bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE hu it ja ko lt mk nb-NO nl pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW ; do + case $locale in + he|hy-AM|ro|sq) + # broken locales, do not work + ;; + *) + make -C browser/locales libs-$locale + cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ + $RPM_BUILD_ROOT/%{progdir}/chrome + cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ + $RPM_BUILD_ROOT/%{progdir}/chrome + echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list + echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list + esac +done +%endif +# overwrite the mozilla start-script and link it to /usr/bin +mkdir --parents $RPM_BUILD_ROOT/usr/bin +sed "s:%%PREFIX:%{_prefix}:g +s:%%PROGDIR:%{progdir}:g +s:%%APPNAME:%{progname}:g +s:%%PROFILE:.mozilla/firefox:g" \ + %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh +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 +# SCHEMA File +mkdir -p $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas +install -m 644 %{SOURCE18} \ + $RPM_BUILD_ROOT/etc/opt/gnome/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/ +# apply SUSE defaults +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 +rm suse-default-prefs +# use correct locale for useragent +cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox-l10n.js << EOF +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +EOF +########## +# ADDONS +# +(cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE5}) +# browserconfig.properties +sed "s;browser.startup.homepage=.*;browser.startup.homepage=%{default_home_page};g +s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=%{default_home_page};g" \ + dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +startup.homepage_override_url=%{default_home_page} +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/opt/gnome/share/icons/hicolor/48x48/apps/ +install %{SOURCE11} $RPM_BUILD_ROOT/opt/gnome/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} Application 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 + +%clean +rm -rf $RPM_BUILD_ROOT +%if %has_system_nspr && !%has_system_nss +rm -f %{my_provides} +rm -f %{my_requires} +%endif + +%post +%if %suse_version >= 1010 +# move plugins to new location +if [ "$1" = "2" ]; then + if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then + rm -rf /opt/MozillaFirefox/%{_lib}/plugins/libnullplugin.so + cp -fud /opt/MozillaFirefox/%{_lib}/plugins/* %{progdir}/plugins + rm -rf /opt/MozillaFirefox/%{_lib}/plugins + fi +fi +%endif +if [ ! -f /.buildenv ]; then + export GCONF_CONFIG_SOURCE=`/opt/gnome/bin/gconftool-2 --get-default-source` + /opt/gnome/bin/gconftool-2 --makefile-install-rule /etc/opt/gnome/gconf/schemas/firefox.schemas > /dev/null 2>&1 +%if %suse_version <= 1000 + # restart gconfd + killall -HUP gconfd-2 2>&1 >/dev/null +%endif +fi +%if %suse_version <= 1000 +%{progdir}/add-plugins.sh > /dev/null 2>&1 +%endif +exit 0 +%if %suse_version <= 1000 + +%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 +%endif + +%files +%defattr(-,root,root) +%if %suse_version < 1010 +%dir /opt/MozillaFirefox +%endif +%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 +%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 +%exclude %{progdir}/removed-files +%exclude %{progdir}/firefox +%{progdir}/readme.txt +%if %nld9 +/opt/gnome/share/applications/%{name}.desktop +%else +/usr/share/applications/%{name}.desktop +%endif +/etc/opt/gnome/gconf/schemas/firefox.schemas +/usr/share/pixmaps/firefox* +%if %milestone +/opt/gnome/share/icons/hicolor/ +%endif +/usr/bin/%{progname} +%doc %{_mandir}/man1/firefox.1.gz +%if %localize + +%files translations -f %{_tmppath}/translations.list +%defattr(-,root,root) +%endif + +%changelog -n MozillaFirefox +* Mon Jan 08 2007 - meissner@suse.de +- Do not provide MozillaFirebird, just obsolete it. +* Fri Dec 01 2006 - maw@suse.de +- Update gecko-lockdown.patch (#220616). +* Thu Nov 30 2006 - maw@suse.de +- Update firefox-suse-default-prefs.js, adding + 'pref("browser.backspace_action", 2);' (#217374) +* Thu Nov 30 2006 - aj@suse.de +- Fix last change (#224431). +* Wed Nov 29 2006 - aj@suse.de +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. +* Tue Nov 28 2006 - aj@suse.de +- Sync from Buildservice with following critical fixes (thanks + Wolfgang Rosenauer!): + * fixed system-proxies.patch to actually work (#223881). + * Rearrange Bookmarks to pass trademark review. +* Mon Nov 27 2006 - aj@suse.de +- Fix tango theme (#223796). +* Mon Nov 27 2006 - aj@suse.de +- Use www.opensuse.org as home page. +* Sun Nov 12 2006 - aj@suse.de +- Set novell.com as home page. +- Update from BuildService (thanks Wolfgang!): + - fixed crash in htmlparser (#217257, bmo #358797) + - added gconf2 as PreReq (#212505) + - added 32bit libaoss.so as requirement (#216266) + - Removed SUSE searchplugin (Portal not available anymore) + (#216054) + - Removed obsolete xul-picker.patch and system-nspr.patch + - Fixed building on 10.1 and 10.0 (dbus) + - Removed obsolete throbber preference +* Thu Nov 09 2006 - jhargadon@suse.de +- updated tango theme +* Sun Oct 29 2006 - aj@suse.de +- Another fix for 214125, patch by Wolfgang Rosenauer. +* Thu Oct 26 2006 - aj@suse.de +- Fix gcc warnings about undefined operations, patch by + Robert O'Callahan. +- Update system-proxies.patch to fix error box (214125), patch by + Robert O'Callahan. +* Mon Oct 23 2006 - aj@suse.de +- Update to current CVS version of 2.0. +- Use www.opensuse.org as default home page for now (#203547). +* Sat Oct 21 2006 - aj@suse.de +- Disable non-working plasticfox and tango themes. +* Fri Oct 20 2006 - aj@suse.de +- Fix building of locales. +* Fri Oct 20 2006 - mkoenig@suse.de +- update to version 2.0rc3: + * New features: Visual Refresh, Built-in phishing protection, + Enhanced search capabilities, Improved tabbed browsing, + Resuming your browsing session, Previewing and subscribing + to Web feeds, Inline spell checking, Live Titles, + Improved Add-ons manager, JavaScript 1.7, Extended search + plugin format, Updates to the extension system, + Client-side session and persistent storage, SVG text +* Tue Oct 17 2006 - meissner@suse.de +- disabled debugging. +* Tue Sep 12 2006 - stark@suse.de +- security update to version 1.5.0.7 +* Mon Aug 21 2006 - stark@suse.de +- added greasemonkey helper change (#199920) +- fixed packager.mk for new make version +* Fri Aug 11 2006 - stark@suse.de +- fixed crash in dbus component (patch by thoenig #197928) +- use external adresses for PAC configuration (#196506) +* Mon Aug 07 2006 - stark@suse.de +- added symlink for Firefox 1.0.x compatibility +* Sat Jul 29 2006 - stark@suse.de +- update to regression release 1.5.0.6 (#195043) +* Thu Jul 27 2006 - stark@suse.de +- security update to version 1.5.0.5 (#195043) + * observer-lock.patch integrated now +- fixed leak in JS' liveconnect (#186066) +- fixed desktop file for old distributions + (StartupNotify=false) +* Thu Jun 29 2006 - stark@suse.de +- fixed printing crash if the last used printer is not available + anymore (#187013) +* Fri Jun 16 2006 - stark@suse.de +- added 48x48 icon (#185777) +* Mon Jun 12 2006 - stark@suse.de +- fix overwrite confirmation for GTK filesaver (#179531) +- get network.negotiate-auth.trusted-uris and + network.negotiate-auth.delegation-uris from gconf if + system-settings are enabled (#184489) +* Thu Jun 01 2006 - stark@suse.de +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) +* Tue May 23 2006 - stark@suse.de +- complete implementation of startup-notification (#115417) + (including autoconf and remote support) +- different home-pages for SLE10 and SL (#177881) +* Tue May 16 2006 - stark@suse.de +- fixed potential deadlock in nsObserverList::RemoveObserver + (#173986, bmo #338069) +- base startup notification on libstartup-notification (#115417) +* Thu May 11 2006 - stark@suse.de +- save printer settings properly (#174082, bmo #324072) +- added startup notification support for showing load activity + in Gnome and to avoid focus stealing prevention (#115417) +- added StartupNotify=true to desktop file (#115417) +- provide legacy symlink for NLD9 update compatibility (#173138) +- fixed system-proxies patch to avoid unwanted wpad requests + (#171743, #167613) +* Mon May 08 2006 - stark@suse.de +- preconfigure the theme according to the used desktop (#151163) +* Thu Apr 27 2006 - stark@suse.de +- last minute change for 1.5.0.3 +* Wed Apr 26 2006 - stark@suse.de +- security update to 1.5.0.3 +- fix for typo in postscript.patch +* Tue Apr 25 2006 - stark@suse.de +- fixed iframe crash (#169039, bmo #334515) +- fixed img tag misuse (#168710, bmo #334341) +* Mon Apr 24 2006 - stark@suse.de +- improved postscript output (bmo #334485) +- changed defaults for printer properties (#6534) +- overwrite gnome-vfs' file protocol by providing "desktop-launch" + (#131501) +- get available paper sizes from CUPS (#65482) +- replaced/removed complicated gconfd reload in %%post (#167989) +- fixed memory leak in clipboard caching (bmo #289897) +* Tue Apr 11 2006 - stark@suse.de +- added (optional) plastikfox theme (#151163) +- get some more security related patches (#148876) +- finally fixed the default proxy configuration by adding a new + UI option (#132398) +* Mon Apr 03 2006 - stark@suse.de +- fixed keyword fixup patch (#162532) +* Tue Mar 28 2006 - stark@suse.de +- don't use keyword fixup for pasted text (#160034, bmo #331522) +* Mon Mar 20 2006 - stark@suse.de +- added Tango theme +- fixed reading proxies from gconf (#132398) +* Sun Mar 12 2006 - stark@suse.de +- tweaked bookmarks (fixed URLs) +- added Khmer (km-*) to pango locales (#157397) +* Sat Mar 04 2006 - stark@suse.de +- fixed crash with multipart JPEGs (bmo #328684) (#140416) +- got latest security fixes from upstream (#148876) +* Wed Feb 22 2006 - stark@suse.de +- fixed plugin loading when launched from Thunderbird (#151614) +- merged dbus reconnection patch (#150042) +- default to autodetect proxy (network.proxy.type=4) (#151811) +- added GTK category to desktop file +* Tue Feb 14 2006 - stark@suse.de +- modified lockdown patches (#67281, #67282) +- applied set of security patches (#148876) + bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947 +* Tue Feb 07 2006 - stark@suse.de +- fixed disabling of Pango (#148788) +* Thu Feb 02 2006 - stark@suse.de +- define gssapi lib explicitely (#147670) +- use only official Firefox-Icon +- changed home-download patch +* Sun Jan 29 2006 - stark@suse.de +- throbber URL is default again +- removed firefox-showpass patch +- removed additional CA certs from builtin NSS +* Fri Jan 27 2006 - stark@suse.de +- got some l10n changes from 1.8.0 branch +* Fri Jan 27 2006 - stark@suse.de +- final 1.5.0.1 version +- make it possible to choose $HOME as download directory + (#144894, bmo #300856) +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Sun Jan 22 2006 - stark@suse.de +- disable Pango if MOZ_ENABLE_PANGO is not set + and no typical language which needs Pango is used (#143428) +* Wed Jan 18 2006 - stark@suse.de +- fixed DumpStackToFile() for glibc 2.4 +- added default (font) settings +* Thu Jan 12 2006 - stark@suse.de +- update to 1.5.0.1pre (20060111) +- updated man-page +- fixed hovered tab close button +- only Requires mozilla-nspr instead of PreReq since + there is no postinstall registration necessary anymore +- use system NSS from CODE10 on +- use -fstack-protector where available +- changed unixproxy component to work on older distributions +* Mon Jan 02 2006 - stark@suse.de +- added unixproxy component written by Robert O'Callahan (#132398) + (bmo #66057) +- added official translations +- preload libaoss for plugin sound (#117079) +* Wed Dec 28 2005 - stark@suse.de +- get some patches from 1.8.0 branch +- readded modification to gconf-backend (bmo #321315) +- readded lockdown stuff +- enable additional extension install directory (#120329) + (/usr/lib/browser-extensions/firefox) +- added patch to make the XUL filechooser optional + (MOZ_XUL_PICKER) +* Wed Dec 14 2005 - stark@suse.de +- fixed patch for parsing -remote parameter +- removed default-plugin patch (not needed anymore) +* Fri Dec 09 2005 - stark@suse.de +- fix to ignore X composite extension (#135373) +- fixed parsing of -remote parameters (#134396) +- activated locales as released +* Tue Nov 29 2005 - stark@suse.de +- update to 1.5 (20051128) +- don't override startup URL when changing Gecko versions (#135314) +- added patch for GTK2 handling (#134831) +- readded add-plugins stuff for compatibility +* Fri Nov 18 2005 - stark@suse.de +- update to 1.5rc3 (20051117) +* Mon Oct 31 2005 - stark@suse.de +- updated l10n archive (20051030) +- fixed postinstall script to copy plugin links instead of files +* Fri Oct 28 2005 - stark@suse.de +- update to 1.5rc1 (20051027) +- fixed profile locking on FAT partitions (bmo #313360) +- introduced an rpath again +* Wed Oct 19 2005 - stark@suse.de +- update to snapshot 1.5 (20051019) +- moved installation to /usr/%%{_lib}/firefox +- added dbus component to be able to get network status from + NetworkManager (bmo #312793) +- remove all update UI for application +- removed diable-gconf (no registration at build time anymore) +- removed rebuild-databases.sh (no system registration anymore) +- open links in new windows (#128087) +* Thu Oct 06 2005 - stark@suse.de +- update to Firefox 1.5b2 (20051005) +- added supported translations +* Sat Oct 01 2005 - stark@suse.de +- update to Firefox 1.5b1 (20050930) RPM version 1.4.1 +- removed rebuild-databases.sh calls +- removed add-plugins.sh calls and corresponding triggers +- enabled SVG and Canvas support +- fixed gconf urlhandler registration +* Tue Sep 20 2005 - stark@suse.de +- security update to 1.0.7 (#117619) + * MFSA 2005-57: IDN heap overrun using soft-hyphens (bmo #307259) + (enabled IDN pref again) + * MFSA 2005-58: + CAN-2005-2701 Heap overrun in XBM image processing + CAN-2005-2702 Crash on "zero-width non-joiner" sequence + CAN-2005-2703 XMLHttpRequest header spoofing + CAN-2005-2704 Object spoofing using XBL + CAN-2005-2705 JavaScript integer overflow + CAN-2005-2706 Privilege escalation using about: scheme + CAN-2005-2707 Chrome window spoofing + Regression fixes +- register beagle extension if it gets installed (#116787) +* Tue Sep 13 2005 - aj@suse.de +- Change SUSE bookmarks. +* Sun Sep 11 2005 - stark@suse.de +- disable IDN per default (#116070) +- unlocalize bookmarks (#114279) +* Thu Sep 08 2005 - stark@suse.de +- fixed some filemodes (#114849) +* Sun Sep 04 2005 - stark@suse.de +- fixed gconf-backend patch to be able to use + system prefs (#114054) +* Thu Sep 01 2005 - stark@suse.de +- changed default font to sans-serif (#114464) +- removed de-de parts of the bookmark-links (#114279) +* Mon Aug 22 2005 - stark@suse.de +- install gconf schema for lockdown also on non-NLD +- added backports (firefox-backports.patch) + * gtk_im_context_set_cursor_location() is not used (bmo #281339) + * fixed crash in imgCacheValidator::OnStartRequest() + (bmo #293307) +- workaround for linking with pangoxft and pangox + (broken by gtk 2.8 update) (#105764) +- remove extensions on deinstallation +- include dragonegg (kparts) plugin (#105468) +* Thu Aug 18 2005 - stark@suse.de +- fixed regression in profile locking change (bmo #303633) +- added rtsp handler to global config (#104434) +- don't blacklist help: protocol (bmo #304833) +- fixed Gdk-WARNING at startup (gtk.patch) +- fixed crash with gtk 2.7 (bmo #300226, bnc #104586) +- fixed installation of the beagle plugin +- update industrial theme to 1.0.11 (#104564) +- included lockdownV2 (removed obsolete gconf.diff) +- linked firefox-bin with rpath to progdir +* Fri Aug 05 2005 - stark@suse.de +- fixed profile locking (bmo #151188) +- install beagle extension globally +* Fri Jul 29 2005 - stark@suse.de +- don't require and provide NSS libs (#98002) +- fixed printing error 'You cannot print while in print preview' + (#96991, bmo #302445) +* Wed Jul 27 2005 - stark@suse.de +- fixed Firefox on ppc (stack-direction.patch) (#97359) +- removed open-pref from startscript as it is done + automatically now (#73042) +- updated Novell searchplugins +* Mon Jul 25 2005 - stark@suse.de +- GTK filechooser is now modal (#8533) +- backed out patch to add tooltips to print-preview + because it breaks localization +* Fri Jul 22 2005 - stark@suse.de +- fixed another problem in printing patch +* Tue Jul 19 2005 - stark@suse.de +- fixed error in ft-xft-ps2.patch +- disabled stripping in spec instead of patch +- added NSPR to PreReq +* Mon Jul 18 2005 - stark@suse.de +- fixed some more regressions with final 1.0.6 +- fixed width calculation in Postscript module (bmo #290292) +- fixed plugin event starvation (bnc #94749, #94751, bmo #301161) +* Fri Jul 15 2005 - stark@suse.de +- searchplugins can now be installed per profile (#8176) +* Fri Jul 15 2005 - stark@suse.de +- update to 1.0.6 which restores API compatibility +* Tue Jul 12 2005 - stark@suse.de +- update to 1.0.5 final (#88509) +- don't strip explicitely +- don't ship beagle.xpi +* Wed Jul 06 2005 - stark@suse.de +- update to 1.0.5-pre (20050705) +- use RPM_OPT_FLAGS for NSS component +- fixed implicit declarations and uninitialized used variables +- added patch for bmo #87969 +* Tue Jul 05 2005 - stark@suse.de +- fixed regression from security update (#95069, bmo #298478) +* Mon Jun 27 2005 - stark@suse.de +- don't use system-prefs by default on NLD +- removed basic lockdown stuff for SUSE Linux + (it's not needed and caused problems: bnc #75418) +- fixed NLD lockdown patch (bnc #75418) +- don't write prefs back to gconf for now +* Wed Jun 22 2005 - stark@suse.de +- new NLD lockdown patch which is syncing user prefs to gconf +- update to 1.0.5pre security-release +* Thu Jun 09 2005 - stark@suse.de +- new revision of NLD lockdown patch +- fixed remote usage behaviour in start script (bnc #41903) +- got more bugfixes from the branch +* Thu Jun 02 2005 - stark@suse.de +- fixed neededforbuild +* Wed Jun 01 2005 - stark@suse.de +- fixed IDN for 64bit platforms (bmo #236425, bnc #46268) +* Fri May 20 2005 - stark@suse.de +- fixed keybinding for KP separator (bnc #84147) +- pulled security related patch from upstream branch +- update plastikfox theme to version 1.6 +* Thu May 12 2005 - stark@suse.de +- update to final 1.0.4 release +* Tue May 10 2005 - stark@suse.de +- update to 1.0.4 security release +- removed s390(x) patches (upstream) +- made two more files %%verify (81692) +- updated NLD lockdown patch (81304) +* Thu Apr 28 2005 - stark@suse.de +- use static NSPR libs from new location +* Sat Apr 23 2005 - stark@suse.de +- activate usage of system NSPR for distributions after 9.3 +- add patch to be able to use systen NSPR at all +* Fri Apr 22 2005 - ro@suse.de +- use mozilla-gcc4.patch +* Thu Apr 21 2005 - stark@suse.de +- don't execute gconf magic within build environment +* Sat Apr 16 2005 - stark@suse.de +- update to final 1.0.3 release +* Fri Apr 15 2005 - ro@suse.de +- fix problem in postinstall script +* Thu Apr 14 2005 - stark@suse.de +- included fixed lockdown patch for NLD +- linked proxies within Firefox with gnome settings (NLD) +- added gconfd restart procedure to install script + (only needed if gconf changes are done) (#76852) +* Sat Apr 02 2005 - stark@suse.de +- update to security pre-release 1.0.3 (#75692) + * Manual plug-in install, javascript vulnerability (bmo #288556) + * Access memory vulnerability (bmo #288688) +* Fri Apr 01 2005 - stark@suse.de +- added advanced lockdown features for ZLM integration (NLD-only) +* Tue Mar 22 2005 - stark@suse.de +- update to final 1.0.2 +- use new theme handling on NLD +- added default-plugin-less-annoying from mozilla +- use GTK2 for Flash +- use system NSPR on SUSE releases after 9.3 +- made startscript PIS aware +- set g-application-name correctly (bmo #281979) +- added man-page +- use GTK system colors +- modify useragent string and add vendor id +- activate smooth-scrolling by default (#74310) +* Tue Mar 22 2005 - stark@suse.de +- don't register beagle automatically (#74062) +- added default bookmarks for SUSE LINUX +* Mon Mar 21 2005 - max@suse.de +- Fixed a typo in the shell code that handles inclusion of the + Acrobat Reader plugin (#70861). +* Thu Mar 17 2005 - stark@suse.de +- updates from upcoming 1.0.2 +- added again logic to use Adobe Reader 7 (#70861) +- fixed crash in ICO decoding (#67142, bmo #245631) +- preinstall beagle extension (#72920) +- bugfixes in trigger scripts +- fixed industrial theming for Gnome (#72918) +* Sat Mar 12 2005 - stark@suse.de +- fixed more security related bugs + (bmo #284551, #284627, #285595) +* Wed Mar 09 2005 - stark@suse.de +- update also GNOME desktop file (#71810) +- added firefox-gnome.png to filelist +- use correct Firefox icon +* Mon Mar 07 2005 - stark@suse.de +- disable inclusion of acrobat plugin again (#70861) +- don't use gconfd in registration phase (#66381) +* Mon Mar 07 2005 - adrian@suse.de +- use standard icon again for the default desktop file and + add a Gnome-only desktop file for the Gnome icon +- add plastikfox chrome theme to fix button order within KDE +- add patch for automatic theme selection for KDE and Gnome +- do register extensions in rebuild-databases.sh instead of %%install, + to fix needed timestamps +* Fri Mar 04 2005 - stark@suse.de +- extend add-plugins to recognize Java 1.5 (#66909) +- changed comment in desktop-file (#66867) +* Tue Feb 22 2005 - stark@suse.de +- make --display parameter working in all cases (bnc #66043) +- revised postscript patch +- final 1.0.1 codebase +* Mon Feb 21 2005 - stark@suse.de +- added patch to create Postscript level 2 (instead of 3) + (special thanks to Jungshik Shin) +- disabled freetype explicitly to be able to use the above patch + (freetype wasn't used anymore since some time anyway) +* Fri Feb 18 2005 - stark@suse.de +- got more patches from branch to get another IDN fix and to + fix bug #51019 +- enabled IDN again +* Wed Feb 16 2005 - stark@suse.de +- bumped version number to 1.0.1 +* Tue Feb 15 2005 - stark@suse.de +- got updates from 1.0.1 branch +* Thu Feb 10 2005 - stark@suse.de +- additional fireflashing fix (#50635, bmo #280664) +- some more security related fixes + (bmo #268483, #273498, #277322) +- fire up GTK2 filepicker if GNOME is running +* Tue Feb 08 2005 - stark@suse.de +- some prefs are ignored (bmo #261934) +- disabled default IDN (#50566) +- fixed some more bugzilla.mozilla.org bugs: + [#276482], #280056, #280603 +* Sun Feb 06 2005 - stark@suse.de +- use same desktop categories for Professional and NLD +- added some lockdown stuff for printing and page saving + (bmo #280488) +* Wed Feb 02 2005 - stark@suse.de +- modified gconf.diff to honor ignore_hosts (bmo #280742) +- added a JS crasher fix (bmo #268535) +- added more fixes (bmo #255441, #273024, #275405, #275634) +* Fri Jan 28 2005 - stark@suse.de +- added gplflash inclusion +- improved JRE inclusion +- reactivated usage of Acrobat Reader plugin + (ready for acroread 7) +* Sat Jan 22 2005 - stark@suse.de +- added some backported bugfixes +* Sat Dec 18 2004 - stark@suse.de +- updated industrial theme to 1.0.9 +- use slightly changed icon for menu-entry (bnc #275) +- use original desktop file for NLD again +* Thu Dec 16 2004 - stark@suse.de +- newer patch for GNOME associations (bnc #362) +- fix overwriting of files with GTK picker (Ximian #65068) +- readded the industrial default theme patch for NLD +* Wed Dec 15 2004 - stark@suse.de +- activate GTK filepicker for NLD again +- fix for GNOME helper applications with parameters +- make GNOME associations the default on NLD +* Sat Dec 04 2004 - stark@suse.de +- fixed build on s390/s390x +- added patch to be able to install-global without running X + (bmo #265859) +* Thu Nov 18 2004 - stark@suse.de +- update industrial theme to 1.0.8 (still not activated) +- added patch to make home-directory the default download dir + (on NLD is still used Desktop) +* Thu Nov 11 2004 - stark@suse.de +- made initial window height smaller again +* Tue Nov 09 2004 - stark@suse.de +- update to final 1.0 release (20041109) +* Thu Nov 04 2004 - stark@suse.de +- update to 1.0rc2 +* Sat Oct 30 2004 - stark@suse.de +- added missing s390(x) patch +* Wed Oct 27 2004 - stark@suse.de +- update to 1.0rc1 codebase +- printing via XFT/fontconfig +- freetype changes to avoid API conflicts with newer freetype2 +- fixed build for s390/s390x +- removed AMD64 patch (included upstream) +- added translations sub-package +- removed "Show folder" patch for NLD (resolved upstream) +- don't use gnome-filepicker patch for NLD for now +- removed hppa buildfix (included upstream) +- removed untitled.patch (bmo #24068) resolved by (bmo #262478) +- use make -C browser/installer now to prepare installation +- don't check for default browser at startup (#47587) +- updated industrial.jar (0.99.13) (disabled) +* Fri Oct 15 2004 - stark@suse.de +- inherit locale from system +- fixed chrome registration +* Wed Oct 06 2004 - joeshaw@suse.de +- disable gconf settings as default (Ximian #67718) +* Wed Oct 06 2004 - stark@suse.de +- fixed inclusion of RealPlayer plugin again +* Tue Oct 05 2004 - stark@suse.de +- small important fix in firefox-download.patch (Ximian #65472) +* Sun Oct 03 2004 - stark@suse.de +- added security-fix from 0.10.1 (mozilla.org #259708) (#46687) +* Fri Oct 01 2004 - stark@suse.de +- final fix for downloading to Desktop folder (Ximian #65756) +- remove Postscript from printer names (Ximian #65560) +* Thu Sep 30 2004 - shprasad@suse.de +- Modified the MozillaFirefox.desktop file. + Changed the name 'Firefox' to 'Firefox Web Browser'. + Also changed it for all languages. +* Wed Sep 29 2004 - stark@suse.de +- fix inclusion of RealPlayer plugin (Ximian #65711) +* Mon Sep 27 2004 - joeshaw@suse.de +- Update the industrial default patch, for some reason it didn't + take before. +* Fri Sep 24 2004 - stark@suse.de +- fix for Ximian #65176 (mozilla.org #240068) +- revised patch for update function (Ximian #65615) +* Thu Sep 23 2004 - joeshaw@suse.de +- Uncomment the patch which tells the UI that industrial is the + default. +* Thu Sep 23 2004 - stark@suse.de +- open Nautilus on NLD for 'Show folder' in download settings + (Ximian #65472) by sragavan@novell.com +- save to Desktop folder if selected (Ximian #65756) + by sragavan@novell.com +* Wed Sep 22 2004 - stark@suse.de +- synced NLD package with 9.2 version +- GTK2 filepicker does now ask for confirmation when overwriting + files (Ximian #65068) by sagarwala@novell.com +- no direct update function (Ximian #65615) by rganesan@novell.com +- throbber linked to Novell (Ximian #66283) by rganesan@novell.com +- make industrial the default theme for NLD + (Ximian #65542) by joeshaw@suse.de +* Mon Sep 20 2004 - joeshaw@suse.de +- Add default bookmarks. Ximian #65546. +- Add the industrial theme, but it's not the default yet. +- Remove acroread from add-plugins because it's badly behaved. + Ximian #65499. +* Mon Sep 20 2004 - federico@ximian.com +- Added MozillaFirefox-toplevel-window-height.diff for + http://bugzilla.ximian.com/show_bug.cgi?id=65543 +* Sun Sep 19 2004 - stark@suse.de +- use GNOME system prefs only for NLD by default + (fixes bug #45575) +* Fri Sep 17 2004 - stark@suse.de +- joeshaw@suse.de: Update GConf patch so that proxy settings work + correctly (Ximian #64461) +- don't search Java on every path (Ximian #65383) +- added some missing fixes for official release +- added new java package name for triggers (#45257) +* Sat Sep 11 2004 - stark@suse.de +- update to official 1.0PR (0.10) +- adopted gnome-filepicker patch +- removed obsolete CUPS hack from start-script + (Ximian #65635, #65560) +* Thu Sep 09 2004 - stark@suse.de +- fixed endianess on AMD64 in JS component (#34743) +* Mon Sep 06 2004 - stark@suse.de +- fixed filelist +* Mon Sep 06 2004 - stark@suse.de +- update to 1.0PR (aka 0.10) +* Fri Sep 03 2004 - stark@suse.de +- added ppc64 patch +* Thu Sep 02 2004 - dave@suse.de +- Fixed up the .desktop installation on nld +* Wed Sep 01 2004 - shprasad@suse.de +- Doesn't ask to set Firefox as default web-browser. +* Tue Aug 31 2004 - stark@suse.de +- next new version for filepicker stuff +- deactivated native filepicker for NLD +- update to snapshot (20040831) +* Tue Aug 24 2004 - stark@suse.de +- new version of gnome-filepicker patch +- added patch for config +* Fri Aug 20 2004 - stark@suse.de +- update to snapshot (20040820) +* Thu Aug 19 2004 - stark@suse.de +- added workaround for mozilla bug #246313 + (Firefox does not start: getting "cannot open display" error) +* Wed Aug 18 2004 - stark@suse.de +- added some patches from Ximian + - use GNOME filepicker + - use more gconf settings + - set startup homepage to Novell +* Tue Aug 17 2004 - stark@suse.de +- update to pre-1.0.0 (20040817) +* Thu Aug 05 2004 - stark@suse.de +- security update to 0.9.3 + (including #43312 and others) +- handle RealPlayer 9 plugin +* Mon Aug 02 2004 - ro@suse.de +- recode desktop file to utf-8 +* Wed Jul 28 2004 - stark@suse.de +- added fix against certificate spoofing (#43312) +* Fri Jul 23 2004 - stark@suse.de +- update to 0.9.2 +- added workaround for extension registry +- removed old (incompatible) mozex extension +* Tue Jun 29 2004 - stark@suse.de +- update to 0.9.1 +- added hint to run as root first +* Tue Jun 15 2004 - stark@suse.de +- update to 0.9 +- added patch for newer freetype +* Fri Apr 02 2004 - stark@suse.de +- removing relocation of TEMP directory (#34391) +* Mon Mar 29 2004 - stark@suse.de +- update to 0.8.0+ (20040503) +- removed firefox logos and activate official branding for + milestone builds +- changed profile-dir to .firefox +- added some needed files +- enabled gnomevfs extension +* Fri Mar 26 2004 - uli@suse.de +- fixed hang during build on s390* (bug #35440) +* Wed Mar 03 2004 - stark@suse.de +- removed unused patches for GTK2 build +- more fixes for (#35179) +* Mon Mar 01 2004 - stark@suse.de +- improved start-script to interact with thunderbird (#35179) +* Thu Feb 26 2004 - stark@suse.de +- use official releasedate +- added official (trademarked) artwork +- added firefox icon to /usr/share/pixmaps +- cleaned up spec-file (there will be no GTK1 version) +* Tue Feb 24 2004 - stark@suse.de +- fixed optimization for non-x86 archs +* Tue Feb 24 2004 - stark@suse.de +- adopted file-list and build options to original distribution +- added prdtoa fix (#32963) +- added hook for static firefox build to rebuild-databases.sh +- added compiler flags for security/ (nss-opt.patch) +- included mozex (mozex.mozdev.org) +- added -Os as optimization flag +* Mon Feb 09 2004 - stark@suse.de +- renamed to MozillaFirefox +- update to final version 0.8 +* Fri Feb 06 2004 - stark@suse.de +- update to Firebird 0.8 (20040205) +- added mips build fix +- set PS printer list in MozillaFirebird.sh +- use lib64 again for biarch platforms +* Sat Jan 10 2004 - adrian@suse.de +- build as user +* Fri Aug 22 2003 - stark@suse.de +- upstream sync for 0.6.1post +* Sun Aug 10 2003 - stark@suse.de +- removed dmoz from searchplugins-filelist +* Fri Aug 08 2003 - stark@suse.de +- update to 0.6.1post (TRUNK) +- use -fno-strict-aliasing +* Thu Jul 31 2003 - stark@suse.de +- update to 0.6.1 (MOZILLA_1_4_BRANCH) +- synchronized with mozilla-source +- created file-list +* Thu Jul 10 2003 - stark@suse.de +- update to snapshot 20030709 +- fixed generation of symlink MozillaFirebird-xremote-client +* Fri Jun 20 2003 - stark@suse.de +- update to snapshot 20030622 (0.7pre) +* Mon May 19 2003 - stark@suse.de +- update to snapshot 20030518 (0.6) +* Wed May 07 2003 - stark@suse.de +- update to snapshot 20030507 +* Wed Apr 30 2003 - stark@suse.de +- initial SuSE package diff --git a/abuild.patch b/abuild.patch new file mode 100644 index 00000000..5e253444 --- /dev/null +++ b/abuild.patch @@ -0,0 +1,129 @@ +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 new file mode 100644 index 00000000..fa8b226b --- /dev/null +++ b/add-plugins.sh.in @@ -0,0 +1,70 @@ +#! /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 new file mode 100644 index 00000000..99c989ab --- /dev/null +++ b/bookmarks.html.nld @@ -0,0 +1,74 @@ + + + +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 new file mode 100644 index 00000000..4683c886 --- /dev/null +++ b/bookmarks.html.suse @@ -0,0 +1,36 @@ + + + +Bookmarks +

Bookmarks

+ +

+

Get Bookmark Add-ons +
+

Bookmarks Toolbar Folder

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

+

openSUSE

+

+

openSUSE +
openSUSE Download +
Novell / Linux +
SUSE Linux Cool Solutions +
SUSE Linux Support +

+

+

Getting Started +
Latest Headlines +

+

+

Mozilla Firefox

+

+

Help and Tutorials +
Customize Firefox +
Get Involved +
About Us +

+

+

diff --git a/cjk-postscript-fonts.dif b/cjk-postscript-fonts.dif new file mode 100644 index 00000000..7cda3c82 --- /dev/null +++ b/cjk-postscript-fonts.dif @@ -0,0 +1,28 @@ +--- modules/libpref/src/init/all.js ++++ modules/libpref/src/init/all.js +@@ -2250,8 +2250,10 @@ + 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", ""); +@@ -2260,8 +2262,10 @@ + 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 new file mode 100644 index 00000000..9fabf633 --- /dev/null +++ b/configure.patch @@ -0,0 +1,6180 @@ +--- configure ++++ configure +@@ -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 +@@ -1241,13 +1246,13 @@ + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 +-echo "configure:1245: checking for host c compiler" >&5 ++echo "configure:1250: checking for host c compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1251: checking for $ac_word" >&5 ++echo "configure:1256: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1282,13 +1287,13 @@ + fi + echo "$ac_t""$HOST_CC" 1>&6 + echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 +-echo "configure:1286: checking for host c++ compiler" >&5 ++echo "configure:1291: checking for host c++ compiler" >&5 + for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1292: checking for $ac_word" >&5 ++echo "configure:1297: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1337,7 +1342,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1341: checking for $ac_word" >&5 ++echo "configure:1346: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1372,7 +1377,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1376: checking for $ac_word" >&5 ++echo "configure:1381: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1407,16 +1412,16 @@ + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1411: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1416: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1431,16 +1436,16 @@ + CFLAGS="$HOST_CXXFLAGS" + + echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1435: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1440: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1469,7 +1474,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1473: checking for $ac_word" >&5 ++echo "configure:1478: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1503,7 +1508,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1507: checking for $ac_word" >&5 ++echo "configure:1512: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1533,7 +1538,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1537: checking for $ac_word" >&5 ++echo "configure:1542: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1584,7 +1589,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1588: checking for $ac_word" >&5 ++echo "configure:1593: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1616,7 +1621,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1625: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1627,12 +1632,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1631 "configure" ++#line 1636 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1658,12 +1663,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1667: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1667: checking whether we are using GNU C" >&5 ++echo "configure:1672: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1672,7 +1677,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1691,7 +1696,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1695: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1700: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1727,7 +1732,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1731: checking for $ac_word" >&5 ++echo "configure:1736: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1763,7 +1768,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1767: checking for $ac_word" >&5 ++echo "configure:1772: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1795,7 +1800,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1799: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1804: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1806,12 +1811,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1810 "configure" ++#line 1815 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1837,12 +1842,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1846: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1846: checking whether we are using GNU C++" >&5 ++echo "configure:1851: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1851,7 +1856,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -1870,7 +1875,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1874: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1879: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1901,57 +1906,6 @@ + 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:1923: \"$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*) +@@ -1965,7 +1919,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1969: checking for $ac_word" >&5 ++echo "configure:1923: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2000,7 +1954,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2004: checking for $ac_word" >&5 ++echo "configure:1958: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2035,7 +1989,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2039: checking for $ac_word" >&5 ++echo "configure:1993: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2076,7 +2030,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2080: checking for $ac_word" >&5 ++echo "configure:2034: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2111,7 +2065,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2115: checking for $ac_word" >&5 ++echo "configure:2069: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2146,7 +2100,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2150: checking for $ac_word" >&5 ++echo "configure:2104: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2184,7 +2138,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2188: checking for $ac_word" >&5 ++echo "configure:2142: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2214,7 +2168,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2218: checking for $ac_word" >&5 ++echo "configure:2172: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2265,7 +2219,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2269: checking for $ac_word" >&5 ++echo "configure:2223: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2297,7 +2251,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2255: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2308,12 +2262,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2312 "configure" ++#line 2266 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2339,12 +2293,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2343: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2348: checking whether we are using GNU C" >&5 ++echo "configure:2302: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2353,7 +2307,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2372,7 +2326,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2376: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2330: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2408,7 +2362,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2412: checking for $ac_word" >&5 ++echo "configure:2366: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2440,7 +2394,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2444: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2451,12 +2405,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2455 "configure" ++#line 2409 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2482,12 +2436,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2486: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2491: checking whether we are using GNU C++" >&5 ++echo "configure:2445: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2496,7 +2450,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -2515,7 +2469,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2519: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2473: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2546,61 +2500,10 @@ + 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:2568: \"$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:2604: checking for $ac_word" >&5 ++echo "configure:2507: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2632,7 +2535,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2636: checking for $ac_word" >&5 ++echo "configure:2539: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2673,7 +2576,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2677: checking for $ac_word" >&5 ++echo "configure:2580: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2708,7 +2611,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2712: checking for $ac_word" >&5 ++echo "configure:2615: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2743,7 +2646,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2747: checking for $ac_word" >&5 ++echo "configure:2650: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2778,7 +2681,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2782: checking for $ac_word" >&5 ++echo "configure:2685: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2867,7 +2770,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2871: checking for $ac_word" >&5 ++echo "configure:2774: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2909,14 +2812,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2934,14 +2837,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { + unsigned *test = new unsigned(42); + ; return 0; } + EOF +-if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2997,7 +2900,7 @@ + _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` + # Add flags if necessary + echo $ac_n "checking for midl flags""... $ac_c" 1>&6 +-echo "configure:3001: checking for midl flags" >&5 ++echo "configure:2904: checking for midl flags" >&5 + if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then + # Starting with MIDL version 6.0.359, the MIDL compiler + # generates /Oicf /robust stubs by default, which is not +@@ -3019,9 +2922,9 @@ + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` + _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` + echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 +-echo "configure:3023: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2926: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3033,7 +2936,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else +@@ -3049,7 +2952,7 @@ + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3053: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:2956: checking for windres version >= $WINDRES_VERSION" >&5 + _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` + echo "$ac_t""$_WINDRES_VERSION" 1>&6 + _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` +@@ -3076,7 +2979,7 @@ + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3080: checking how to run the C preprocessor" >&5 ++echo "configure:2983: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3091,13 +2994,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3108,13 +3011,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3125,13 +3028,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3159,17 +3062,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3163: checking for $ac_hdr" >&5 ++echo "configure:3066: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3200,10 +3103,10 @@ + if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:3204: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3107: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:3207: checking whether cc understands -c and -o together" >&5 ++echo "configure:3110: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -3215,16 +3118,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -3260,7 +3163,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3264: checking how to run the C preprocessor" >&5 ++echo "configure:3167: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3275,13 +3178,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3292,13 +3195,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3309,13 +3212,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3340,7 +3243,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3344: checking how to run the C++ preprocessor" >&5 ++echo "configure:3247: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3353,12 +3256,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3405,7 +3308,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:3409: checking for a BSD compatible install" >&5 ++echo "configure:3312: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3458,7 +3361,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3462: checking whether ln -s works" >&5 ++echo "configure:3365: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3483,7 +3386,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3487: checking for $ac_word" >&5 ++echo "configure:3390: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3523,7 +3426,7 @@ + fi + + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3527: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3430: checking for minimum required perl version >= $PERL_VERSION" >&5 + _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + echo "$ac_t""$_perl_version" 1>&6 +@@ -3533,7 +3436,7 @@ + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3537: checking for full perl installation" >&5 ++echo "configure:3440: checking for full perl installation" >&5 + _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + if test "$_perl_res" != 0; then +@@ -3546,7 +3449,7 @@ + # Extract the first word of "doxygen", so it can be a program name with args. + set dummy doxygen; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3550: checking for $ac_word" >&5 ++echo "configure:3453: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3582,7 +3485,7 @@ + # Extract the first word of "whoami", so it can be a program name with args. + set dummy whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3586: checking for $ac_word" >&5 ++echo "configure:3489: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3618,7 +3521,7 @@ + # Extract the first word of "autoconf", so it can be a program name with args. + set dummy autoconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3622: checking for $ac_word" >&5 ++echo "configure:3525: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3654,7 +3557,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3658: checking for $ac_word" >&5 ++echo "configure:3561: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3692,7 +3595,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3696: checking for $ac_word" >&5 ++echo "configure:3599: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3733,7 +3636,7 @@ + # Extract the first word of "makedepend", so it can be a program name with args. + set dummy makedepend; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3737: checking for $ac_word" >&5 ++echo "configure:3640: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3768,7 +3671,7 @@ + # Extract the first word of "xargs", so it can be a program name with args. + set dummy xargs; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3772: checking for $ac_word" >&5 ++echo "configure:3675: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3831,7 +3734,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3835: checking for $ac_word" >&5 ++echo "configure:3738: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3881,7 +3784,7 @@ + # Extract the first word of "sdp", so it can be a program name with args. + set dummy sdp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3885: checking for $ac_word" >&5 ++echo "configure:3788: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3977,7 +3880,7 @@ + fi + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:3981: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3884: checking for valid compiler/Mac OS X SDK combination" >&5 + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -3986,7 +3889,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { return 0; } +@@ -3994,7 +3897,7 @@ + result=yes + ; return 0; } + EOF +-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else +@@ -4019,7 +3922,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4023: checking for $ac_word" >&5 ++echo "configure:3926: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4062,7 +3965,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4066: checking for $ac_word" >&5 ++echo "configure:3969: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4130,7 +4033,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. + # --without-x overrides everything else, but does not touch the cache. + echo $ac_n "checking for X""... $ac_c" 1>&6 +-echo "configure:4134: checking for X" >&5 ++echo "configure:4037: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -4192,12 +4095,12 @@ + + # First, try using that file with no special directory specified. + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4266,14 +4169,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" + # We can link X programs with no special library path. +@@ -4379,17 +4282,17 @@ + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +-echo "configure:4383: checking whether -R must be followed by a space" >&5 ++echo "configure:4286: checking whether -R must be followed by a space" >&5 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else +@@ -4405,14 +4308,14 @@ + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else +@@ -4444,7 +4347,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4448: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4351: checking for dnet_ntoa in -ldnet" >&5 + ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4452,7 +4355,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4488,7 +4391,7 @@ + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:4492: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4395: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4496,7 +4399,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4417: \"$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 +@@ -4539,12 +4442,12 @@ + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:4543: checking for gethostbyname" >&5 ++echo "configure:4446: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -4591,7 +4494,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4595: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4498: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4599,7 +4502,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4643,12 +4546,12 @@ + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +-echo "configure:4647: checking for connect" >&5 ++echo "configure:4550: checking for connect" >&5 + if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" + else +@@ -4695,7 +4598,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4699: checking for connect in -lsocket" >&5 ++echo "configure:4602: checking for connect in -lsocket" >&5 + ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4703,7 +4606,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4741,12 +4644,12 @@ + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4745: checking for remove" >&5 ++echo "configure:4648: checking for remove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" + else +@@ -4793,7 +4696,7 @@ + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4797: checking for remove in -lposix" >&5 ++echo "configure:4700: checking for remove in -lposix" >&5 + ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4801,7 +4704,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lposix $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4839,12 +4742,12 @@ + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4843: checking for shmat" >&5 ++echo "configure:4746: checking for shmat" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" + else +@@ -4891,7 +4794,7 @@ + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4895: checking for shmat in -lipc" >&5 ++echo "configure:4798: checking for shmat in -lipc" >&5 + ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4899,7 +4802,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lipc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4946,7 +4849,7 @@ + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +-echo "configure:4950: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4853: checking for IceConnectionNumber in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4954,7 +4857,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5406,7 +5309,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5410: checking whether ld has archive extraction flags" >&5 ++echo "configure:5313: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5423,14 +5326,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -5465,17 +5368,17 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5469: checking for 64-bit OS" >&5 ++echo "configure:5372: checking for 64-bit OS" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -5635,9 +5538,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5639: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5542: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5684,17 +5587,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5688: checking for $ac_hdr" >&5 ++echo "configure:5591: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5736,7 +5639,7 @@ + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5740: checking for main in -lbind" >&5 ++echo "configure:5643: checking for main in -lbind" >&5 + ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5744,14 +5647,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5772,7 +5675,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5776: checking for main in -lzeta" >&5 ++echo "configure:5679: checking for main in -lzeta" >&5 + ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5780,14 +5683,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5851,18 +5754,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:5855: checking for -dead_strip option to ld" >&5 ++echo "configure:5758: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6730,14 +6633,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -6765,7 +6668,7 @@ + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:6769: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6672: checking for Forte compiler version >= WS6U2" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -6775,7 +6678,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -6913,7 +6816,7 @@ + ;; + *-darwin*) + echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 +-echo "configure:6917: checking for -exported_symbols_list option to ld" >&5 ++echo "configure:6820: checking for -exported_symbols_list option to ld" >&5 + if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6953,12 +6856,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:6957: checking for ANSI C header files" >&5 ++echo "configure:6860: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -6966,7 +6869,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6983,7 +6886,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7001,7 +6904,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7022,7 +6925,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7033,7 +6936,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7057,12 +6960,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7061: checking for working const" >&5 ++echo "configure:6964: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7132,12 +7035,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7136: checking for mode_t" >&5 ++echo "configure:7039: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7165,12 +7068,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7169: checking for off_t" >&5 ++echo "configure:7072: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7198,12 +7101,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7202: checking for pid_t" >&5 ++echo "configure:7105: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7231,12 +7134,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7235: checking for size_t" >&5 ++echo "configure:7138: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7264,12 +7167,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7268: checking for st_blksize in struct stat" >&5 ++echo "configure:7171: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7277,7 +7180,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7298,12 +7201,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7302: checking for siginfo_t" >&5 ++echo "configure:7205: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7311,7 +7214,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7345,12 +7248,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7349: checking for int16_t" >&5 ++echo "configure:7252: checking for int16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7358,7 +7261,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else +@@ -7380,12 +7283,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7384: checking for int32_t" >&5 ++echo "configure:7287: checking for int32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7393,7 +7296,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7415,12 +7318,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7419: checking for int64_t" >&5 ++echo "configure:7322: checking for int64_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7428,7 +7331,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7450,12 +7353,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7454: checking for int64" >&5 ++echo "configure:7357: checking for int64" >&5 + if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7463,7 +7366,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7485,12 +7388,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7489: checking for uint" >&5 ++echo "configure:7392: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7498,7 +7401,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7520,12 +7423,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7524: checking for uint_t" >&5 ++echo "configure:7427: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7533,7 +7436,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7555,12 +7458,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7559: checking for uint16_t" >&5 ++echo "configure:7462: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7568,7 +7471,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7599,12 +7502,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7603: checking for uname.domainname" >&5 ++echo "configure:7506: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7612,7 +7515,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -7636,12 +7539,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7640: checking for uname.__domainname" >&5 ++echo "configure:7543: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7649,7 +7552,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -7682,7 +7585,7 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7686: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7589: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7690,14 +7593,14 @@ + ac_cv_have_usable_wchar="maybe" + else + cat > conftest.$ac_ext < + int main () { + return (sizeof(wchar_t) != 2) || + (wchar_t)-1 < (wchar_t) 0 ; } + EOF +-if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_have_usable_wchar="yes" + else +@@ -7732,7 +7635,7 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7736: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7639: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7740,14 +7643,17 @@ + ac_cv_have_usable_wchar_option="maybe" + else + cat > conftest.$ac_ext < + int main () { + return (sizeof(wchar_t) != 2) || + (wchar_t)-1 < (wchar_t) 0 ; } + EOF +-if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_have_usable_wchar_option="yes" + else +@@ -7783,7 +7689,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7787: checking for visibility(hidden) attribute" >&5 ++echo "configure:7693: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7808,7 +7714,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7812: checking for visibility(default) attribute" >&5 ++echo "configure:7718: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7833,7 +7739,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:7837: checking for visibility pragma support" >&5 ++echo "configure:7743: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7858,7 +7764,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:7862: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7768: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7901,12 +7807,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:7905: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7811: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -7914,7 +7820,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:7918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -7939,7 +7845,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:7943: checking for opendir in -ldir" >&5 ++echo "configure:7849: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -7947,7 +7853,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -7980,7 +7886,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:7984: checking for opendir in -lx" >&5 ++echo "configure:7890: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -7988,7 +7894,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8031,17 +7937,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8035: checking for $ac_hdr" >&5 ++echo "configure:7941: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8071,17 +7977,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8075: checking for $ac_hdr" >&5 ++echo "configure:7981: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8111,17 +8017,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8115: checking for $ac_hdr" >&5 ++echo "configure:8021: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8151,17 +8057,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8155: checking for $ac_hdr" >&5 ++echo "configure:8061: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8191,17 +8097,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8195: checking for $ac_hdr" >&5 ++echo "configure:8101: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8232,17 +8138,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8236: checking for $ac_hdr" >&5 ++echo "configure:8142: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8273,17 +8179,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8277: checking for $ac_hdr" >&5 ++echo "configure:8183: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8320,17 +8226,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8324: checking for new" >&5 ++echo "configure:8230: checking for new" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8371,17 +8277,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8375: checking for $ac_hdr" >&5 ++echo "configure:8281: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8415,7 +8321,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8419: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8325: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8423,7 +8329,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8464,7 +8370,7 @@ + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8468: checking for atan in -lm" >&5 ++echo "configure:8374: checking for atan in -lm" >&5 + ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8472,7 +8378,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8517,7 +8423,7 @@ + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8521: checking for dlopen in -ldl" >&5 ++echo "configure:8427: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8525,7 +8431,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8553,17 +8459,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:8557: checking for dlfcn.h" >&5 ++echo "configure:8463: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8599,7 +8505,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8603: checking for demangle in -lC_r" >&5 ++echo "configure:8509: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8607,7 +8513,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8648,7 +8554,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8652: checking for demangle in -lC" >&5 ++echo "configure:8558: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8656,7 +8562,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8698,7 +8604,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8702: checking for socket in -lsocket" >&5 ++echo "configure:8608: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8706,7 +8612,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8762,7 +8668,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:8766: checking for XDrawLines in -lX11" >&5 ++echo "configure:8672: checking for XDrawLines in -lX11" >&5 + ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8770,7 +8676,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8803,7 +8709,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:8807: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8713: checking for XextAddDisplay in -lXext" >&5 + ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8811,7 +8717,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8846,7 +8752,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8850: checking for XtFree in -lXt" >&5 ++echo "configure:8756: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8854,7 +8760,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8886,7 +8792,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:8890: checking for IceFlush in -lICE" >&5 ++echo "configure:8796: checking for IceFlush in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8894,7 +8800,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8926,7 +8832,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:8930: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:8836: checking for SmcCloseConnection in -lSM" >&5 + ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8934,7 +8840,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8966,7 +8872,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:8970: checking for XtFree in -lXt" >&5 ++echo "configure:8876: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8974,7 +8880,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9019,7 +8925,7 @@ + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9023: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:8929: checking for XineramaIsActive in -lXinerama" >&5 + ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9027,7 +8933,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9060,17 +8966,17 @@ + + ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +-echo "configure:9064: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:8970: checking for X11/extensions/Xinerama.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9093,7 +8999,7 @@ + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9097: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9003: checking for XShmCreateImage in -lXext" >&5 + ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9101,7 +9007,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9134,17 +9040,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9138: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9044: checking for X11/extensions/XShm.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9174,7 +9080,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9178: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9084: checking for XieFloGeometry in -lXIE" >&5 + ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9182,7 +9088,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9215,17 +9121,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9219: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9125: checking for X11/extensions/XIElib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9299,7 +9205,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9303: checking for $ac_word" >&5 ++echo "configure:9209: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9335,7 +9241,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9339: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9245: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9383,7 +9289,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -9409,7 +9315,7 @@ + } + + EOF +-if { (eval echo configure:9413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9461,7 +9367,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9465: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9371: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9483,7 +9389,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9487: checking for pthread_create in -lpthread" >&5 ++echo "configure:9393: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9505,7 +9411,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9509: checking for pthread_create in -lc_r" >&5 ++echo "configure:9415: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9527,7 +9433,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9531: checking for pthread_create in -lc" >&5 ++echo "configure:9437: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9583,7 +9489,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9587: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9493: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9606,7 +9512,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:9610: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9516: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9728,7 +9634,7 @@ + + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9732: checking whether mmap() sees write()s" >&5 ++echo "configure:9638: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -9767,11 +9673,11 @@ + result="yes" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -9796,13 +9702,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9800: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9706: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP +@@ -9820,7 +9726,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -9842,7 +9748,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:9846: checking for 8-bit clean memcmp" >&5 ++echo "configure:9752: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9850,7 +9756,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -9880,12 +9786,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9884: checking for $ac_func" >&5 ++echo "configure:9790: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -9935,12 +9841,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9939: checking for $ac_func" >&5 ++echo "configure:9845: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -9992,12 +9898,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9996: checking for $ac_func" >&5 ++echo "configure:9902: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10056,19 +9962,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10060: checking for wcrtomb" >&5 ++echo "configure:9966: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10088,19 +9994,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10092: checking for mbrtowc" >&5 ++echo "configure:9998: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10129,12 +10035,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10133: checking for res_ninit()" >&5 ++echo "configure:10039: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -10176,12 +10082,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10180: checking for gnu_get_libc_version()" >&5 ++echo "configure:10086: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -10221,7 +10127,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10225: checking for iconv in -lc" >&5 ++echo "configure:10131: checking for iconv in -lc" >&5 + ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10229,7 +10135,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10262,7 +10168,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10266: checking for iconv in -liconv" >&5 ++echo "configure:10172: checking for iconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10270,7 +10176,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10303,7 +10209,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10307: checking for libiconv in -liconv" >&5 ++echo "configure:10213: checking for libiconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10311,7 +10217,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10352,12 +10258,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10356: checking for iconv()" >&5 ++echo "configure:10262: checking for iconv()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10371,7 +10277,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10395,12 +10301,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10399: checking for iconv() with const input" >&5 ++echo "configure:10305: checking for iconv() with const input" >&5 + if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10415,7 +10321,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10444,19 +10350,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10448: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10354: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } + EOF +-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -10488,7 +10394,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10492: checking for an implementation of va_copy()" >&5 ++echo "configure:10398: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10498,7 +10404,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10512,7 +10418,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -10529,7 +10435,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:10533: checking for an implementation of __va_copy()" >&5 ++echo "configure:10439: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10539,7 +10445,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10553,7 +10459,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -10570,7 +10476,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:10574: checking whether va_lists can be copied by value" >&5 ++echo "configure:10480: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10580,7 +10486,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10594,7 +10500,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -10693,7 +10599,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10697: checking for C++ exceptions flag" >&5 ++echo "configure:10603: checking for C++ exceptions flag" >&5 + + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10728,12 +10634,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10732: checking for gcc 3.0 ABI" >&5 ++echo "configure:10638: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -10770,12 +10676,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10774: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10680: checking for C++ \"explicit\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -10806,12 +10712,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10810: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10716: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -10851,12 +10757,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:10855: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10761: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct X { int a; }; + class Y {}; +@@ -10866,7 +10772,7 @@ + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:10870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -10888,12 +10794,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:10892: checking whether partial template specialization works" >&5 ++echo "configure:10798: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Foo {}; + template class Foo {}; +@@ -10901,7 +10807,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:10905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -10922,12 +10828,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:10926: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10832: checking whether operators must be re-defined for templates derived from templates" >&5 + if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template +@@ -10939,7 +10845,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -10961,12 +10867,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:10965: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:10871: checking whether we need to cast a derived template to pass as its base class" >&5 + if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template class Derived : public Base { }; +@@ -10975,7 +10881,7 @@ + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:10979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -10996,12 +10902,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11000: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:10906: checking whether the compiler can resolve const ambiguities for templates" >&5 + if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class ptrClass { +@@ -11022,7 +10928,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11044,12 +10950,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11048: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:10954: checking whether the C++ \"using\" keyword can change access" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11096,12 +11002,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11100: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11006: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11138,19 +11044,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11142: checking for \"std::\" namespace" >&5 ++echo "configure:11048: checking for \"std::\" namespace" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + return std::min(0, 1); + ; return 0; } + EOF +-if { (eval echo configure:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11171,12 +11077,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11175: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11081: checking whether standard template operator!=() is ambiguous" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + struct T1 {}; +@@ -11186,7 +11092,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11208,12 +11114,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11212: checking for C++ reinterpret_cast" >&5 ++echo "configure:11118: checking for C++ reinterpret_cast" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <(z); + ; return 0; } + EOF +-if { (eval echo configure:11225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11242,7 +11148,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11246: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11152: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11250,8 +11156,11 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11290,19 +11199,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11294: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11203: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11325,12 +11234,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11329: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11238: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + template class Foo {}; +@@ -11341,7 +11250,7 @@ + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11373,19 +11282,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11377: checking for LC_MESSAGES" >&5 ++echo "configure:11286: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:11389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -11466,7 +11375,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11470: checking for $ac_word" >&5 ++echo "configure:11379: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11501,7 +11410,7 @@ + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11505: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11414: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -11603,7 +11512,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11607: checking for $ac_word" >&5 ++echo "configure:11516: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11638,7 +11547,7 @@ + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11642: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11551: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -11711,7 +11620,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11715: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11624: checking for jpeg_destroy_compress in -ljpeg" >&5 + ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11719,7 +11628,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11759,7 +11668,7 @@ + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include +@@ -11773,7 +11682,7 @@ + } + + EOF +-if { (eval echo configure:11777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else +@@ -11814,7 +11723,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11818: checking for gzread in -lz" >&5 ++echo "configure:11727: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11822,7 +11731,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11861,7 +11770,7 @@ + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < +@@ -11882,7 +11791,7 @@ + } + + EOF +-if { (eval echo configure:11886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else +@@ -11925,7 +11834,7 @@ + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:11929: checking for png_get_valid in -lpng" >&5 ++echo "configure:11838: checking for png_get_valid in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11933,7 +11842,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11972,7 +11881,7 @@ + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include +@@ -11986,7 +11895,7 @@ + } + + EOF +-if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else +@@ -12086,8 +11995,8 @@ + MOZ_ENABLE_GTK2=1 + MOZ_ENABLE_XREMOTE=1 + MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} +- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' +- TK_LIBS='$(MOZ_GTK2_LIBS)' ++ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' ++ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' + cat >> confdefs.h <<\EOF + #define MOZ_WIDGET_GTK2 1 + EOF +@@ -12236,7 +12145,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12240: checking for $ac_word" >&5 ++echo "configure:12149: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12271,7 +12180,7 @@ + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12275: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12184: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -12294,7 +12203,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -12372,7 +12281,7 @@ + } + + EOF +-if { (eval echo configure:12376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -12407,7 +12316,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -12417,7 +12326,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" +@@ -12469,7 +12378,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12473: checking for $ac_word" >&5 ++echo "configure:12382: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12513,19 +12422,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12517: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12426: checking for gtk+-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12524: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12433: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +-echo "configure:12529: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12438: checking MOZ_GTK2_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" +@@ -12590,7 +12499,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12594: checking for $ac_word" >&5 ++echo "configure:12503: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12642,7 +12551,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12646: checking for main in -lqt" >&5 ++echo "configure:12555: checking for main in -lqt" >&5 + ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12650,14 +12559,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12676,7 +12585,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12680: checking for main in -lqt-mt" >&5 ++echo "configure:12589: checking for main in -lqt-mt" >&5 + ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12684,14 +12593,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt-mt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12727,9 +12636,9 @@ + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12731: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12640: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -12740,7 +12649,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -12771,6 +12680,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:12710: 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:12754: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 ++echo "configure:12761: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 ++ MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` ++ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 ++echo "configure:12766: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ++ ## 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 ++ ++ ++ ++ ++ + + + +@@ -13336,7 +13377,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13340: checking for $ac_word" >&5 ++echo "configure:13381: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13380,19 +13421,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13384: checking for xft" >&5 ++echo "configure:13425: checking for xft" >&5 + + if $PKG_CONFIG --exists "xft" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13391: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13432: checking MOZ_XFT_CFLAGS" >&5 + MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` + echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +-echo "configure:13396: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13437: checking MOZ_XFT_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" +@@ -13427,7 +13468,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13431: checking for $ac_word" >&5 ++echo "configure:13472: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13470,31 +13511,31 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 +-echo "configure:13475: checking for pango >= 1.1.0" >&5 ++ echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6 ++echo "configure:13516: checking for pangoxft >= 1.1.0 pangox" >&5 + +- if $PKG_CONFIG --exists "pango >= 1.1.0" ; then ++ if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + +- echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13482: checking _PANGOCHK_CFLAGS" >&5 +- _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` +- echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 ++ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 ++echo "configure:13523: checking MOZ_PANGO_CFLAGS" >&5 ++ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"` ++ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + +- echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13487: checking _PANGOCHK_LIBS" >&5 ++ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 ++echo "configure:13528: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic +- _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" +- echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 ++ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`" ++ echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 + else +- _PANGOCHK_CFLAGS="" +- _PANGOCHK_LIBS="" ++ MOZ_PANGO_CFLAGS="" ++ MOZ_PANGO_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"` +- echo $_PANGOCHK_PKG_ERRORS ++ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"` ++ echo $MOZ_PANGO_PKG_ERRORS + fi + + +@@ -13508,7 +13549,7 @@ + if test $succeeded = yes; then + : + else +- { echo "configure: error: Library requirements (pango >= 1.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ { echo "configure: error: Library requirements (pangoxft >= 1.1.0 pangox) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + + fi +@@ -13517,6 +13558,8 @@ + + + ++ ++ + # Check whether --enable-pango or --disable-pango was given. + if test "${enable_pango+set}" = set; then + enableval="$enable_pango" +@@ -13543,7 +13586,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13547: checking for $ac_word" >&5 ++echo "configure:13590: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13587,19 +13630,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13591: checking for pangoxft >= 1.6.0" >&5 ++echo "configure:13634: checking for pangoxft >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13598: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13641: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13603: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13646: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`" +@@ -13627,10 +13670,110 @@ + { echo "configure: error: Library requirements (pangoxft >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:13681: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$PKG_CONFIG" in ++ /*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++if test -n "$PKG_CONFIG"; then ++ echo "$ac_t""$PKG_CONFIG" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pangocairo >= 1.10.0""... $ac_c" 1>&6 ++echo "configure:13725: checking for pangocairo >= 1.10.0" >&5 ++ ++ if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6 ++echo "configure:13732: checking PANGOCAIRO_CHK_CFLAGS" >&5 ++ PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"` ++ echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6 ++echo "configure:13737: checking PANGOCAIRO_CHK_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`" ++ echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6 ++ else ++ PANGOCAIRO_CHK_CFLAGS="" ++ PANGOCAIRO_CHK_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ ++ MOZ_PANGOCAIRO=1 ++ cat >> confdefs.h <<\EOF ++#define MOZ_PANGOCAIRO 1 ++EOF ++ ++ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" ++ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" ++ ++ else ++ : ++ fi ++ + + + + ++ + fi + + if test "$MOZ_X11" +@@ -13667,7 +13810,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13671: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13814: checking for XpGetPrinterList in -lXp" >&5 + ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -13675,7 +13818,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -13759,7 +13902,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13763: checking for $ac_word" >&5 ++echo "configure:13906: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13803,19 +13946,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13807: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:13950: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 + + if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13814: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:13957: checking MOZ_GNOMEVFS_CFLAGS" >&5 + MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +-echo "configure:13819: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:13962: checking MOZ_GNOMEVFS_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" +@@ -13866,7 +14009,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13870: checking for $ac_word" >&5 ++echo "configure:14013: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13910,19 +14053,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:13914: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14057: checking for gconf-2.0 >= $GCONF_VERSION" >&5 + + if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13921: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14064: checking MOZ_GCONF_CFLAGS" >&5 + MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` + echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +-echo "configure:13926: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14069: checking MOZ_GCONF_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" +@@ -13959,6 +14102,7 @@ + + + ++ + + if test "$MOZ_ENABLE_LIBGNOME" + then +@@ -13969,7 +14113,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13973: checking for $ac_word" >&5 ++echo "configure:14117: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14013,19 +14157,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14017: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14161: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14024: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14168: checking MOZ_LIBGNOME_CFLAGS" >&5 + MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` + echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +-echo "configure:14029: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14173: checking MOZ_LIBGNOME_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" +@@ -14103,7 +14247,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14107: checking for $ac_word" >&5 ++echo "configure:14251: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14147,19 +14291,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14151: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14295: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14158: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14302: checking MOZ_GNOMEUI_CFLAGS" >&5 + MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +-echo "configure:14163: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14307: checking MOZ_GNOMEUI_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" +@@ -14210,6 +14354,221 @@ + + + ++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:14382: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ 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:14426: checking for dbus-glib-1" >&5 ++ ++ if $PKG_CONFIG --exists "dbus-glib-1" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 ++echo "configure:14433: checking MOZ_DBUS_GLIB_CFLAGS" >&5 ++ MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` ++ echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 ++echo "configure:14438: checking MOZ_DBUS_GLIB_LIBS" >&5 ++ ## 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:14473: 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:14517: checking for gthread-2.0" >&5 ++ ++ if $PKG_CONFIG --exists "gthread-2.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 ++echo "configure:14524: checking MOZ_GTHREAD_CFLAGS" >&5 ++ MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` ++ echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 ++echo "configure:14529: checking MOZ_GTHREAD_LIBS" >&5 ++ ## 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" \ +@@ -14645,7 +15004,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14649: checking for $ac_word" >&5 ++echo "configure:15008: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14681,7 +15040,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14685: checking for $ac_word" >&5 ++echo "configure:15044: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14756,6 +15115,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||'` +@@ -14928,7 +15294,7 @@ + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:14932: checking for Gdiplus.h" >&5 ++echo "configure:15298: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -14938,7 +15304,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include +@@ -14947,7 +15313,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:14951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -15027,7 +15393,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15031: checking for $ac_word" >&5 ++echo "configure:15397: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15072,7 +15438,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15076: checking for $ac_word" >&5 ++echo "configure:15442: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15141,13 +15507,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15145: checking for iconv" >&5 ++echo "configure:15511: checking for iconv" >&5 + for ac_prog in $HOST_ICONV "iconv" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15151: checking for $ac_word" >&5 ++echo "configure:15517: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15493,18 +15859,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15497: checking for valid debug flags" >&5 ++echo "configure:15863: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15545,18 +15911,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:15549: checking for valid optimization flags" >&5 ++echo "configure:15915: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15773,7 +16139,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15777: checking for malloc in -lefence" >&5 ++echo "configure:16143: checking for malloc in -lefence" >&5 + ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -15781,7 +16147,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -15893,12 +16259,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:15897: checking for $ac_func" >&5 ++echo "configure:16263: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16167,12 +16533,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16171: checking for $ac_func" >&5 ++echo "configure:16537: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16336,7 +16702,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:16340: checking for gcc -pipe support" >&5 ++echo "configure:16706: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include ' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c +@@ -16351,14 +16717,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -16400,16 +16766,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:16404: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16770: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" +@@ -16430,16 +16796,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16434: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16800: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -16457,16 +16823,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16461: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16827: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -16512,18 +16878,21 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:16516: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16882: checking whether C++ compiler has -pedantic long long bug" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="no" + else +@@ -16553,13 +16922,16 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16557: checking for correct temporary object destruction order" >&5 ++echo "configure:16926: checking for correct temporary object destruction order" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -16599,12 +16971,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:16603: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16975: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -16634,7 +17006,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:16638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -16926,7 +17298,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:16930: checking for $ac_word" >&5 ++echo "configure:17302: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -16970,19 +17342,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:16974: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17346: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:16981: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17353: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:16986: checking LIBIDL_LIBS" >&5 ++echo "configure:17358: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -17105,7 +17477,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17109: checking for $ac_word" >&5 ++echo "configure:17481: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17140,7 +17512,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17144: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17163,7 +17535,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17239,7 +17611,7 @@ + } + + EOF +-if { (eval echo configure:17243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17273,7 +17645,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17283,7 +17655,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17327,7 +17699,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17331: checking for $ac_word" >&5 ++echo "configure:17703: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17362,7 +17734,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17366: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17389,7 +17761,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17475,7 +17847,7 @@ + } + + EOF +-if { (eval echo configure:17479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17509,7 +17881,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -17520,7 +17892,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -17648,7 +18020,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17652: checking for $ac_word" >&5 ++echo "configure:18024: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17683,7 +18055,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17687: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17706,7 +18078,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17782,7 +18154,7 @@ + } + + EOF +-if { (eval echo configure:17786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17816,7 +18188,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17826,7 +18198,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17870,7 +18242,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17874: checking for $ac_word" >&5 ++echo "configure:18246: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17905,7 +18277,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17909: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17932,7 +18304,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18018,7 +18390,7 @@ + } + + EOF +-if { (eval echo configure:18022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18052,7 +18424,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -18063,7 +18435,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -18104,7 +18476,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18108: checking for $ac_word" >&5 ++echo "configure:18480: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18148,19 +18520,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18152: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18524: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18159: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18531: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18164: checking LIBIDL_LIBS" >&5 ++echo "configure:18536: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -18196,7 +18568,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18200: checking for $ac_word" >&5 ++echo "configure:18572: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18233,7 +18605,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18237: checking for ORBit libIDL usability" >&5 ++echo "configure:18609: checking for ORBit libIDL usability" >&5 + _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` + _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` + _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` +@@ -18250,7 +18622,7 @@ + result="maybe" + else + cat > conftest.$ac_ext < +@@ -18265,7 +18637,7 @@ + } + + EOF +-if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + _LIBIDL_FOUND=1 + result="yes" +@@ -18322,7 +18694,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18326: checking for $ac_word" >&5 ++echo "configure:18698: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18366,19 +18738,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18370: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18377: checking GLIB_CFLAGS" >&5 ++echo "configure:18749: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:18382: checking GLIB_LIBS" >&5 ++echo "configure:18754: checking GLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" +@@ -18462,7 +18834,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18466: checking for $ac_word" >&5 ++echo "configure:18838: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18497,7 +18869,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18501: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18520,7 +18892,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18596,7 +18968,7 @@ + } + + EOF +-if { (eval echo configure:18600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18630,7 +19002,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -18640,7 +19012,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18720,19 +19092,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:18724: checking for working alloca.h" >&5 ++echo "configure:19096: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -18753,12 +19125,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18757: checking for alloca" >&5 ++echo "configure:19129: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -18818,12 +19190,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18822: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19194: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:18852: checking for $ac_func" >&5 ++echo "configure:19224: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -18903,7 +19275,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:18907: checking stack direction for C alloca" >&5 ++echo "configure:19279: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18911,7 +19283,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -18979,17 +19351,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:18983: checking for $ac_hdr" >&5 ++echo "configure:19355: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:18993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -19080,7 +19452,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19084: checking for $ac_word" >&5 ++echo "configure:19456: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19124,19 +19496,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19128: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19135: checking CAIRO_CFLAGS" >&5 ++echo "configure:19507: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +-echo "configure:19140: checking CAIRO_LIBS" >&5 ++echo "configure:19512: checking CAIRO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" +@@ -19201,7 +19573,7 @@ + # Extract the first word of "python", so it can be a program name with args. + set dummy python; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19205: checking for $ac_word" >&5 ++echo "configure:19577: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19477,14 +19849,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -19791,7 +20163,7 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext < +@@ -19807,7 +20179,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:19811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20025,34 +20397,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 + +@@ -20299,6 +20652,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 +@@ -20335,23 +20691,30 @@ + s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g + s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g + s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g +-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g +-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g +-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g + s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g + s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g ++s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g ++s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g ++s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g + s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g ++s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g + s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g + s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g + 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/credits.patch b/credits.patch new file mode 100644 index 00000000..17959523 --- /dev/null +++ b/credits.patch @@ -0,0 +1,14 @@ +Index: browser/base/content/credits.xhtml +================================================================================ +--- browser/base/content/credits.xhtml ++++ browser/base/content/credits.xhtml +@@ -431,6 +431,9 @@ +

  • Kohei Yoshino
    • +
  • Boris Zbarsky
    • + ++ ++

    openSUSE RPM packaging

    ++
    • Wolfgang Rosenauer
    + + &credit.translation; + diff --git a/cups-paper.patch b/cups-paper.patch new file mode 100644 index 00000000..8a209eb6 --- /dev/null +++ b/cups-paper.patch @@ -0,0 +1,858 @@ +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 new file mode 100644 index 00000000..2f4f98a6 --- /dev/null +++ b/dbus.patch @@ -0,0 +1,565 @@ +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,68 @@ ++# ###### 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 = $(MOZ_DBUS_GLIB_LIBS) \ ++ $(MOZ_GTHREAD_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) ++ ++CPPSRCS = \ ++ nsDBusModule.cpp \ ++ $(NULL) ++ ++include $(topsrcdir)/config/rules.mk ++ ++CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS) ++CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS)) +--- extensions/dbus/nsDBusModule.cpp ++++ extensions/dbus/nsDBusModule.cpp +@@ -0,0 +1,414 @@ ++/* -*- 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; ++ ++ nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (prefs) { ++ 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/firefox-2.0-source.tar.bz2 b/firefox-2.0-source.tar.bz2 new file mode 100644 index 00000000..5d8d38ca --- /dev/null +++ b/firefox-2.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5631f4936535866481f6ce190446b516288eb1e94bdb6d34e9b93464b203345d +size 37350148 diff --git a/firefox-appname.patch b/firefox-appname.patch new file mode 100644 index 00000000..16a41b46 --- /dev/null +++ b/firefox-appname.patch @@ -0,0 +1,26 @@ +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -173,7 +173,7 @@ + + // Whether or not the application should check at startup each time if it + // is the default browser. +-pref("browser.shell.checkDefaultBrowser", true); ++pref("browser.shell.checkDefaultBrowser", false); + + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore +--- browser/components/shell/src/nsGNOMEShellService.cpp ++++ browser/components/shell/src/nsGNOMEShellService.cpp +@@ -133,7 +133,11 @@ + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); + NS_ENSURE_SUCCESS(rv, rv); + +- return appPath->GetNativePath(mAppPath); ++ /* This path to firefox is hardcoded for the default path setting */ ++ mAppPath.Assign ("/usr/bin/firefox"); ++ ++ //return appPath->GetNativePath(mAppPath); ++ return NS_OK; + } + + NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH) diff --git a/firefox-no-update.patch b/firefox-no-update.patch new file mode 100644 index 00000000..c4bb6d21 --- /dev/null +++ b/firefox-no-update.patch @@ -0,0 +1,106 @@ +Index: browser/app/profile/firefox.js +================================================================================ +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -77,65 +77,6 @@ + // Dictionary download preference + pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/"); + +-// App-specific update preferences +- +-// Whether or not app updates are enabled +-pref("app.update.enabled", true); +- +-// This preference turns on app.update.mode and allows automatic download and +-// install to take place. We use a separate boolean toggle for this to make +-// the UI easier to construct. +-pref("app.update.auto", true); +- +-// Defines how the Application Update Service notifies the user about updates: +-// +-// AUM Set to: Minor Releases: Major Releases: +-// 0 download no prompt download no prompt +-// 1 download no prompt download no prompt if no incompatibilities +-// 2 download no prompt prompt +-// +-// See chart in nsUpdateService.js.in for more details +-// +-pref("app.update.mode", 1); +- +-// If set to true, the Update Service will present no UI for any event. +-pref("app.update.silent", false); +- +-// Update service URL: +-pref("app.update.url", "https://aus2.mozilla.org/update/2/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/update.xml"); +-// app.update.url.manual is in branding section +-// app.update.url.details is in branding section +- +-// User-settable override to app.update.url for testing purposes. +-//pref("app.update.url.override", ""); +- +-// Interval: Time between checks for a new version (in seconds) +-// default=1 day +-pref("app.update.interval", 86400); +-// Interval: Time before prompting the user to download a new version that +-// is available (in seconds) default=1 day +-pref("app.update.nagTimer.download", 86400); +-// Interval: Time before prompting the user to restart to install the latest +-// download (in seconds) default=30 minutes +-pref("app.update.nagTimer.restart", 1800); +-// Interval: When all registered timers should be checked (in milliseconds) +-// default=5 seconds +-pref("app.update.timer", 600000); +- +-// Whether or not we show a dialog box informing the user that the update was +-// successfully applied. This is off in Firefox by default since we show a +-// upgrade start page instead! Other apps may wish to show this UI, and supply +-// a whatsNewURL field in their brand.properties that contains a link to a page +-// which tells users what's new in this new update. +-pref("app.update.showInstalledUI", false); +- +-// 0 = suppress prompting for incompatibilities if there are updates available +-// to newer versions of installed addons that resolve them. +-// 1 = suppress prompting for incompatibilities only if there are VersionInfo +-// updates available to installed addons that resolve them, not newer +-// versions. +-pref("app.update.incompatible.mode", 0); +- + // Symmetric (can be overridden by individual extensions) update preferences. + // e.g. + // extensions.{GUID}.update.enabled +--- browser/base/content/baseMenuOverlay.xul ++++ browser/base/content/baseMenuOverlay.xul +@@ -76,7 +76,7 @@ + label="&helpMenu.label;" + accesskey="&helpMenu.accesskey;"> + #endif +- ++ + +-#ifndef XP_MACOSX +- +-#endif ++ oncommand="checkForUpdates();" ++ hidden="true"/> +