--- thunderbird-2.0.0.23+build1+nobinonly.orig/thunderbird-2.0.0.23-source.tar.bz2.cdbs-config_list
+++ thunderbird-2.0.0.23+build1+nobinonly/thunderbird-2.0.0.23-source.tar.bz2.cdbs-config_list
@@ -0,0 +1,92 @@
+mozilla/build/autoconf/config.guess
+mozilla/build/autoconf/config.sub
+mozilla/mail/installer/windows/config.it
+mozilla/nsprpub/build/autoconf/config.guess
+mozilla/nsprpub/build/autoconf/config.sub
+mozilla/nsprpub/config/config.mk
+mozilla/security/nss/cmd/crmf-cgi/config.mk
+mozilla/security/nss/cmd/crmftest/config.mk
+mozilla/security/nss/cmd/lib/config.mk
+mozilla/security/nss/cmd/libpkix/config.mk
+mozilla/security/nss/cmd/libpkix/testutil/config.mk
+mozilla/security/nss/cmd/zlib/config.mk
+mozilla/security/nss/lib/base/config.mk
+mozilla/security/nss/lib/certdb/config.mk
+mozilla/security/nss/lib/certhigh/config.mk
+mozilla/security/nss/lib/ckfw/builtins/config.mk
+mozilla/security/nss/lib/ckfw/config.mk
+mozilla/security/nss/lib/ckfw/capi/config.mk
+mozilla/security/nss/lib/ckfw/dbm/config.mk
+mozilla/security/nss/lib/ckfw/nssmkey/config.mk
+mozilla/security/nss/lib/crmf/config.mk
+mozilla/security/nss/lib/cryptohi/config.mk
+mozilla/security/nss/lib/dev/config.mk
+mozilla/security/nss/lib/freebl/config.mk
+mozilla/security/nss/lib/jar/config.mk
+mozilla/security/nss/lib/libpkix/include/config.mk
+mozilla/security/nss/lib/libpkix/config.mk
+mozilla/security/nss/lib/libpkix/pkix/certsel/config.mk
+mozilla/security/nss/lib/libpkix/pkix/config.mk
+mozilla/security/nss/lib/libpkix/pkix/checker/config.mk
+mozilla/security/nss/lib/libpkix/pkix/crlsel/config.mk
+mozilla/security/nss/lib/libpkix/pkix/params/config.mk
+mozilla/security/nss/lib/libpkix/pkix/results/config.mk
+mozilla/security/nss/lib/libpkix/pkix/store/config.mk
+mozilla/security/nss/lib/libpkix/pkix/top/config.mk
+mozilla/security/nss/lib/libpkix/pkix/util/config.mk
+mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/config.mk
+mozilla/security/nss/lib/libpkix/pkix_pl_nss/config.mk
+mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/config.mk
+mozilla/security/nss/lib/libpkix/pkix_pl_nss/system/config.mk
+mozilla/security/nss/lib/nss/config.mk
+mozilla/security/nss/lib/pk11wrap/config.mk
+mozilla/security/nss/lib/pkcs12/config.mk
+mozilla/security/nss/lib/pkcs7/config.mk
+mozilla/security/nss/lib/pki/config.mk
+mozilla/security/nss/lib/pki1/config.mk
+mozilla/security/nss/lib/smime/config.mk
+mozilla/security/nss/lib/softoken/legacydb/config.mk
+mozilla/security/nss/lib/softoken/config.mk
+mozilla/security/nss/lib/sqlite/config.mk
+mozilla/security/nss/lib/ssl/config.mk
+mozilla/security/nss/lib/util/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/ssl/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/trivial/config.h.in
+mozilla/security/coreconf/config.mk
+mozilla/directory/c-sdk/config/autoconf/config.guess
+mozilla/directory/c-sdk/config/autoconf/config.sub
+mozilla/directory/c-sdk/config/config.mk
+mozilla/db/sqlite3/src/config.h
+mozilla/toolkit/components/viewconfig/content/config.js
+mozilla/toolkit/components/viewconfig/content/config.xul
+mozilla/toolkit/locales/en-US/chrome/global/config.dtd
+mozilla/toolkit/locales/en-US/chrome/global/config.properties
+mozilla/toolkit/themes/pinstripe/global/config.css
+mozilla/toolkit/themes/winstripe/global/config.css
+mozilla/tools/leaky/config.h
+mozilla/extensions/cck/browser/resources/content/cckwizard/config.xul
+mozilla/extensions/irc/xul/content/config.css
+mozilla/extensions/irc/xul/content/config.js
+mozilla/extensions/irc/xul/content/config.xul
+mozilla/extensions/irc/xul/locale/en-US/config.dtd
+mozilla/extensions/xmlterm/config/config.mk
+mozilla/config/config.mk
+mozilla/js/src/config.mk
+mozilla/xpinstall/packager/build/win/gre/config.it
+mozilla/xpinstall/packager/build/win/mfcembed/config.it
+mozilla/xpinstall/packager/build/win/mozilla/config.it
+mozilla/xpinstall/packager/os2/config.it
+mozilla/xpinstall/packager/unix/config.it
+mozilla/xpinstall/packager/win_gre/config.it
+mozilla/xpinstall/packager/win_mfcembed/config.it
+mozilla/xpinstall/packager/windows/config.it
+mozilla/xpinstall/wizard/unix/src2/config.ini
+mozilla/themes/classic/global/config.css
+mozilla/themes/modern/global/config.css
+mozilla/xpfe/global/resources/content/config.js
+mozilla/xpfe/global/resources/content/config.xul
+mozilla/xpfe/global/resources/locale/en-US/config.dtd
+mozilla/xpfe/global/resources/locale/en-US/config.properties
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.install
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.install
@@ -0,0 +1,29 @@
+debian/tmp/usr/lib/thunderbird/*.so usr/lib/thunderbird
+debian/tmp/usr/lib/thunderbird/components usr/lib/thunderbird
+debian/tmp/usr/lib/thunderbird/thunderbird-bin usr/lib/thunderbird
+debian/tmp/usr/lib/thunderbird/run-mozilla.sh usr/lib/thunderbird
+debian/tmp/usr/bin/thunderbird usr/lib/thunderbird
+
+debian/tmp/usr/lib/thunderbird/defaults/autoconfig usr/share/thunderbird/defaults
+debian/tmp/usr/lib/thunderbird/defaults/pref usr/share/thunderbird/defaults
+debian/tmp/usr/lib/thunderbird/defaults/wallet usr/share/thunderbird/defaults
+debian/tmp/usr/lib/thunderbird/defaults/messenger usr/share/thunderbird/defaults
+debian/tmp/usr/lib/thunderbird/isp/ usr/share/thunderbird
+debian/tmp/usr/lib/thunderbird/greprefs usr/share/thunderbird
+debian/tmp/usr/lib/thunderbird/res usr/share/thunderbird
+debian/tmp/usr/lib/thunderbird/icons usr/share/thunderbird
+debian/tmp/usr/lib/thunderbird/chrome usr/share/thunderbird/
+debian/tmp/usr/lib/thunderbird/icons/default.xpm usr/share/thunderbird/chrome/icons/default
+build-tree/mozilla/other-licenses/branding/thunderbird/content/icon64.png usr/share/thunderbird/icons/
+
+debian/tmp/usr/lib/thunderbird/defaults/profile etc/thunderbird/
+
+debian/thunderbird.desktop usr/share/applications
+
+debian/thunderbird.js etc/thunderbird/pref
+debian/thunderbird.cfg usr/lib/thunderbird
+
+debian/thunderbird-restart-required.update-notifier usr/share/thunderbird
+
+debian/tmp/usr/lib/thunderbird/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/thunderbird/extensions
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird-dev.install
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird-dev.install
@@ -0,0 +1,11 @@
+debian/tmp/usr/lib/pkgconfig/thunderbird-xpcom.pc usr/lib/pkgconfig
+debian/tmp/usr/lib/pkgconfig/thunderbird-js.pc usr/lib/pkgconfig
+debian/tmp/usr/lib/pkgconfig/thunderbird-gtkmozembed.pc usr/lib/pkgconfig
+debian/tmp/usr/lib/pkgconfig/thunderbird-plugin.pc usr/lib/pkgconfig
+
+debian/tmp/usr/share/idl/thunderbird/* usr/share/idl/thunderbird/
+debian/tmp/usr/include/thunderbird/* usr/include/thunderbird
+debian/tmp/usr/bin/thunderbird-config usr/bin
+
+debian/tmp/usr/lib/thunderbird/regxpcom usr/lib/thunderbird
+debian/tmp/usr/lib/thunderbird/xp* usr/lib/thunderbird
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird-dom-inspector.install
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird-dom-inspector.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/thunderbird/extensions/inspector@mozilla.org usr/lib/thunderbird/extensions
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.cfg
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.cfg
@@ -0,0 +1,2 @@
+//
+lockPref("app.update.enabled", false);
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.desktop
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.desktop
@@ -0,0 +1,31 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Mozilla Thunderbird Mail/News
+Comment=Read/Write Mail/News with Mozilla Thunderbird
+GenericName=Mail Client
+Exec=thunderbird %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=thunderbird.png
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png
+StartupWMClass=Thunderbird-bin
+StartupNotify=true
+Name[cs]=Poštovní klient Thunderbird
+Name[ca]=Client de correu Thunderbird
+Name[fi]=Thunderbird-sähköposti
+Name[fr]=Messagerie Thunderbird
+Name[pl]=Klient poczty Thunderbird
+Name[pt_BR]=Cliente de E-mail Thunderbird
+Name[sv]=E-postklienten Thunderbird
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[de]=Emails lesen und verfassen
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[it]=Leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Ler e escrever suas mensagens
+Comment[sv]=Läs och skriv e-post
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/compat
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/compat
@@ -0,0 +1 @@
+5
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.menu
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.menu
@@ -0,0 +1,4 @@
+?package(thunderbird):needs="x11" section="Applications/Network/Communication" \
+	title="Thunderbird Mail" \
+	icon="/usr/share/pixmaps/thunderbird.png" \
+	command="thunderbird" hints="Mail"
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.links
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.links
@@ -0,0 +1,27 @@
+usr/lib/thunderbird/thunderbird usr/bin/thunderbird
+usr/lib/nss/libnssckbi.so usr/lib/thunderbird/libnssckbi.so
+usr/share/thunderbird/chrome usr/lib/thunderbird/chrome
+usr/share/thunderbird/defaults usr/lib/thunderbird/defaults
+usr/share/thunderbird/greprefs usr/lib/thunderbird/greprefs
+usr/share/thunderbird/isp usr/lib/thunderbird/isp
+usr/share/thunderbird/icons usr/lib/thunderbird/icons
+usr/share/thunderbird/res usr/lib/thunderbird/res
+usr/share/thunderbird/searchplugins usr/lib/thunderbird/searchjplugins
+
+/etc/thunderbird/pref /usr/share/thunderbird/defaults/syspref
+/etc/thunderbird/profile /usr/share/thunderbird/defaults/profile
+
+/usr/share/thunderbird/icons/icon64.png /usr/share/pixmaps/thunderbird.png
+
+/usr/share/myspell/dicts /usr/lib/thunderbird/dictionaries
+
+usr/lib/libnspr4.so.0d usr/lib/thunderbird/libnspr4.so
+usr/lib/libplc4.so.0d usr/lib/thunderbird/libplc4.so
+usr/lib/libplds4.so.0d usr/lib/thunderbird/libplds4.so
+
+usr/lib/nss/libnssckbi.so usr/lib/thunderbird/libnssckbi.so
+usr/lib/libnss3.so.0d usr/lib/thunderbird/libnss3.so
+usr/lib/libsmime3.so.0d usr/lib/thunderbird/libsmime3.so
+usr/lib/libsoftokn3.so.0d usr/lib/thunderbird/libsoftokn3.so
+usr/lib/libssl3.so.0d usr/lib/thunderbird/libssl3.so
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/changelog
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/changelog
@@ -0,0 +1,3718 @@
+thunderbird (2.0.0.23+build1+nobinonly-0ubuntu0.8.04.1netbook1natick1) natick; urgency=low
+
+  * Merged with netbook-common. Remaining changes:
+    - 90_fit_1024x600_mailnews_abCardOverlay.xul.patch: redesign UI
+      (LP: #379310)
+
+ -- Bruno Dilly <bruno.dilly@canonical.com>  Tue, 25 Aug 2009 19:22:37 -0300
+
+thunderbird (2.0.0.23+build1+nobinonly-0ubuntu0.8.04.1netbook1) netbook-common; urgency=low
+
+  * Merge with hardy-security. Remaining changes:
+    - 90_fit_1024x600_AccountManager.dtd.patch: fit 1024x600 for account
+      settings
+    - 90_fit_1024x600_mailnews_abCardOverlay.xul.patch fit 1024x600 for
+      newCard dialog
+    - 90_fit_1024x600_am-server.xul.patch: Add scrollbar in server settings
+
+ -- Nicolas Valcárcel Scerpella (Canonical) <nvalcarcel@canonical.com>  Fri, 21 Aug 2009 16:28:05 -0500
+
+thunderbird (2.0.0.23+build1+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * security/stability update 2.0.0.23 (USN-817-1)
+  * adjust patches to new upstream codebase
+    - update debian/patches/autoconf-regen
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 17 Aug 2009 16:32:02 +0200
+
+thunderbird (2.0.0.22+build1+nobinonly-0ubuntu0.8.04.1netbook1natick1) natick; urgency=low
+
+  * Merged with netbook-common. Remaining changes:
+    - redesign UI
+
+ -- Nicolas Valcárcel Scerpella (Canonical) <nvalcarcel@canonical.com>  Thu, 02 Jul 2009 15:13:27 -0500
+
+thunderbird (2.0.0.22+build1+nobinonly-0ubuntu0.8.04.1netbook1) netbook-common; urgency=low
+
+  * Merge with hardy-security. Remaining changes:
+    - 90_fit_1024x600_AccountManager.dtd.patch: fit 1024x600 for account
+      settings
+    - 90_fit_1024x600_mailnews_abCardOverlay.xul.patch fit 1024x600 for
+      newCard dialog
+    - 90_fit_1024x600_am-server.xul.patch: Add scrollbar in server settings
+
+ -- Nicolas Valcárcel Scerpella (Canonical) <nvalcarcel@canonical.com>  Tue, 30 Jun 2009 15:16:27 -0500
+
+thunderbird (2.0.0.22+build1+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * security/stability update 2.0.0.22 (USN-782-1)
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 08 Jun 2009 16:47:24 +0200
+
+thunderbird (2.0.0.21+nobinonly-0ubuntu0.8.04.1netbook1) netbook-common; urgency=low
+
+  * Merge with hardy-security. Remaining changes:
+    - 90_fit_1024x600_AccountManager.dtd.patch: fit 1024x600 for account
+      settings
+    - 90_fit_1024x600_mailnews_abCardOverlay.xul.patch fit 1024x600 for
+      newCard dialog
+    - 90_fit_1024x600_am-server.xul.patch: Add scrollbar in server settings
+
+ -- Nicolas Valcárcel Scerpella <nvalcarcel@canonical.com>  Tue, 24 Mar 2009 15:56:57 -0500
+
+thunderbird (2.0.0.21+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * security/stability update 2.0.0.21 (USN-741-1)
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 18 Mar 2009 15:12:24 +0100
+
+thunderbird (2.0.0.19+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * security/stability update 2.0.0.19 (USN-701-1)
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 05 Jan 2009 14:22:43 +0100
+
+thunderbird (2.0.0.18+nobinonly-0ubuntu0.8.10.1netbook1natick1) natick; urgency=low
+
+  * 90_fit_1024x600_mailnews_abCardOverlay.xul.patch: redesign UI (LP: #379310)
+
+ -- Bruno Dilly <bruno.dilly@canonical.com>  Mon, 15 Jun 2009 17:56:19 -0300
+
+thunderbird (2.0.0.18+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * security/stability update 2.0.0.18 (USN-668-1)
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 25 Nov 2008 11:21:46 +0100
+
+thunderbird (2.0.0.17+nobinonly-0ubuntu0.8.04.1netbook1) hardy; urgency=low
+
+  * Merged from hardy-security
+
+ -- Nicolas Valcárcel Scerpella <nvalcarcel@canonical.com>  Mon, 29 Sep 2008 13:07:38 -0500
+
+thunderbird (2.0.0.17+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * RELEASE security/stability update 2.0.0.17 (USN-647-1)
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 25 Sep 2008 15:07:40 +0200
+
+thunderbird (2.0.0.16+nobinonly-0ubuntu0.8.04.1netbook2) hardy; urgency=low
+ 
+  * Non-maintainer upload.
+  * 90_fit_1024x600_am-server.xul.patch: Add scrollbar in server settings
+    (LP: #270725)
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul@gmail.com>  Fri, 19 Sep 2008 17:39:24 0000
+ 
+thunderbird (2.0.0.16+nobinonly-0ubuntu0.8.04.1netbook1) hardy; urgency=low
+
+  [Ying-Chun Liu]
+  * 90_fit_1024x600_AccountManager.dtd.patch: fit 1024x600 for account
+    settings
+  * 90_fit_1024x600_mailnews_abCardOverlay.xul.patch fit 1024x600 for
+    newCard dialog
+
+ -- Steve Magoun <steve.magoun@canonical.com>  Wed, 03 Sep 2008 14:16:53 -0400
+
+thunderbird (2.0.0.16+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * RELEASE security/stability update 2.0.0.16 (USN-629-1)
+
+  * fix LP: #195059 - Thunderbird package description ends with "XXX Todo";
+    thanks to Andrew Starr-Bochicchio for drafting this
+    - update debian/control
+
+  * adjust patches diverged upstream
+    - update debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 24 Jul 2008 15:32:09 +0200
+
+thunderbird (2.0.0.14+nobinonly-0ubuntu0.8.04.1) hardy-security; urgency=low
+
+  * 2.0.0.14 security/stability update (USN-605-1)
+  * drop patches applied upstream:
+    - delete debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 2 May 2008 12:23:00 +0200
+
+thunderbird (2.0.0.12+nobinonly-0ubuntu1) hardy; urgency=low
+
+  * USN-582-1 - 2.0.0.12 security/stability update
+  * update autoconf-regen patch
+    - update debian/patches/autoconf-regen
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 27 Feb 2008 13:19:09 +0100
+
+thunderbird (2.0.0.9+nobinonly-0ubuntu2) hardy; urgency=low
+
+  * fix missing nss symbol
+    - add debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch
+    - update debian/patches/series
+  * download attachments to /tmp as read-only to prevent data-loss
+    (LP: #87101)
+    - add debian/patches/bz280419_att_267284-readonly-download.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 14 Feb 2008 21:21:19 +0100
+
+thunderbird (2.0.0.9+nobinonly-0ubuntu1) hardy; urgency=low
+
+  * 2.0.0.9 stability update:
+  * drop keep_version_2006.patch patch as we don't ship a pre-release
+    build anymore
+    - delete debian/patches/keep_version_2006.patch
+    - update debian/patches/series
+  * Bump Standards-Version to 3.7.3
+    - update debian/control
+  * make Build-Depends more diff friendly
+    - update debian/control
+
+  [ Fabien Tassin ]
+  * Ship movemail.rdf (LP: #148942)
+    - add debian/patches/ship_movemail_rdf
+    - update debian/patches/series
+  * Fix typo in french description of the update-notifier file
+    - update debian/thunderbird-restart-required.update-notifier
+  * Add XRender detection code in configure
+    - add debian/patches/bz344818_att264996_detect_xrender
+    - update debian/patches/autoconf-regen
+    - update debian/patches/series
+  * Add a menu file for thunderbird
+    - add debian/thunderbird.menu
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 29 Dec 2007 22:20:38 +0100
+
+thunderbird (2.0.0.8~pre071022+nobinonly-0ubuntu0.7.10) gutsy-security; urgency=low
+
+  * 2.0.0.8 security/stability update (pre fetched from CVS):
+  * MFSA 2007-29 aka CVE-2007-5339 (browser), CVE-2007-5340 (javascript)
+  * MFSA 2007-30 aka CVE-2007-1095
+  * MFSA 2007-31 aka CVE-2007-2292
+  * MFSA 2007-32 aka CVE-2007-3511, CVE-2006-2894
+  * MFSA 2007-33 aka CVE-2007-5334
+  * MFSA 2007-34 aka CVE-2007-5337
+  * MFSA 2007-35 aka CVE-2007-5338
+  * MFSA 2007-36 aka CVE-2007-4841 (windows only)
+
+  Packaging:
+  * debian/patches/bz389801-theme-crash-with-GtkOptionMenu-indicator_size-and-indicator_spacing.patch:
+    drop patch - applied upstream
+  * debian/patches/fix-rss.rdf-install-dir: drop patch - applied upstream.
+  * debian/patches/keep_version_2006.patch: stick with version info 2.0.0.6
+  * debian/patches/autoconf-regen: rerun autoconf2.13
+  * debian/patches/series: adapt series file accordingly.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 22 Oct 2007 13:00:15 +0200
+
+thunderbird (2.0.0.6+nobinonly-0ubuntu1) gutsy; urgency=low
+
+  * repack orig.tar.gz to not contain binary only files found in LP: #121734
+  * debian/remove.binonly.sh: debian/remove.binonly.sh import script to
+    remove binary-only files
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 08 Oct 2007 18:36:36 +0200
+
+thunderbird (2.0.0.6-0ubuntu5) gutsy; urgency=low
+
+  * add Recommends: myspell-en-us | hunspell-dictionary | myspell-dictionary
+    (LP: #138751).
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 05 Oct 2007 11:37:57 +0200
+
+thunderbird (2.0.0.6-0ubuntu4) gutsy; urgency=low
+
+  * debian/thunderbird.links: install upstream-compatibility links to
+    system nss3 and nspr4 files (LP: #133171).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 24 Sep 2007 10:58:41 +0200
+
+thunderbird (2.0.0.6-0ubuntu3) gutsy; urgency=low
+
+  * debian/patches/bz389801-theme-crash-with-GtkOptionMenu-indicator_size-and-indicator_spacing.patch,
+    series: prefetch latest patch from bugzilla 389801 to theme dependent
+    top-crash. (LP: #129007)
+  * debian/thunderbird.desktop: add finish and swedish translations to
+    .desktop file (LP: #126112).
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 19 Sep 2007 18:21:22 +0200
+
+thunderbird (2.0.0.6-0ubuntu2) gutsy; urgency=low
+
+  * debian/rules, debian/control: use gcc-4.2/g++-4.2 on all architectures
+  * debian/patches/autoconf-regen: update configure patch to enable
+    force-no-pragma-visibility-for-gcc-4.2_4.3 patch during build
+  * debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3,
+    debian/patches/series: don't use visibility gcc pragmas; fix build-failure 
+    on gcc 4.2 and 4.3.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 30 Aug 2007 13:49:33 +0200
+
+thunderbird (2.0.0.6-0ubuntu1) gutsy; urgency=low
+
+  * 2.0.0.5 security/stability update:
+  * MFSA 2007-27 aka  CVE-2007-3845, SA26201, VU#783400,
+    VU##403150: "Unescaped URIs passed to external programs"
+  * MFSA 2007-26 aka CVE-2007-3844: "Privilege escalation through
+    chrome-loaded about:blank windows"
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu,  2 Aug 2007 14:54:14 +0200
+
+thunderbird (2.0.0.5-0ubuntu1) gutsy; urgency=low
+
+  * 2.0.0.5 security/stability update:
+  * MFSA 2007-23 aka CVE-2007-3670: Remote code execution by
+    launching Firefox from Internet Explorer.
+  * MFSA 2007-18 aka CVE-2007-3670: Crashes with evidence of memory
+    corruption. 
+
+  * debian/thunderbird.desktop: include more desktop file translations.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 23 Jul 2007 11:24:27 +0200
+
+thunderbird (2.0.0.4-0ubuntu1) gutsy; urgency=low
+
+  * final release upload; build with updated original tarball.
+  * debian/rules: --disable-freetype2 in an attempt to tackle bad fonts
+  * debian/patches/82_prefs.dpatch|series: import default font fixes
+    from xulrunner 1.8.1.4-1 patchset (thanks to Mike Hommey 
+    <glandium@debian.org>)
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 18 Jun 2007 14:51:58 +0200
+
+thunderbird (2.0.0.4~rc1-0ubuntu1) gutsy; urgency=low
+
+  * stability/security upstream release 2.0.0.4 (rc1)
+    - CVE-2007-2867 aka MFSA 2007-12 (l): Crashes with evidence of memory
+      corruption (rv:1.8.0.12/1.8.1.4) - layout engine
+    - CVE-2007-2868 aka MFSA 2007-12 (j): Crashes with evidence of memory
+      corruption (rv:1.8.0.12/1.8.1.4) - javascript engine
+    - CVE-2007-1558 aka MFSA 2007-15:  Security Vulnerability in APOP
+      Authentication
+  * debian/patches/gcc-workaround-visibility-hidden, debian/patches/series: 
+    applied upstream -> dropped visibility workaround patch
+  * debian/patches/gnome-mime-handling: updated patch for bz273524 in 
+    response to upstream landing of bz373955
+  * debian/patches/autoconf-regen: rerun autoconf accordingly
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 5 Jun 2007 10:54:00 +0200
+
+thunderbird (2.0.0.0-0ubuntu3~.mt1) gutsy; urgency=low
+
+  * mozilla team feisty backport build
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 25 May 2007 11:17:00 +0200
+
+thunderbird (2.0.0.0-0ubuntu3) gutsy; urgency=low
+
+  * debian/thunderbird.links: add link to not break security manager
+    breakage (usr/lib/nss/libnssckbi.so usr/lib/thunderbird/libnssckbi.so)
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 4 May 2007 00:19:00 +0200
+
+thunderbird (2.0.0.0-0ubuntu2) gutsy; urgency=low
+
+  * debian/control[.in]: fix ftbfs because of missing docbook-to-man
+    Build-Depends.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 3 May 2007 18:33:00 +0200
+
+thunderbird (2.0.0.0-0ubuntu1) gutsy; urgency=low
+
+  * bump version to 2.0.0.0 in preparation of official upload
+  * debian/patches/mailnews_mime_export: added patch to export mime headers:
+    mimecryp.h + mimemoz2.h - needed by enigmail
+  * debian/patches/series: add patch to quilt series accordingly
+  * debian/rules: use --with-user-appdir configure option to set MOZ_USER_DIR
+  * debian/patches/moz-user-dir-for-xre-profiles: fix xre dir provider to
+    honour MOZ_USER_DIR
+  * debian/patches/ubuntu-mail-app-xre-name: drop old nsXREAppData tweak to
+    use .mozilla-thunderbird as profile directory
+  * debian/patches/syspref-folder-support: add syspref folder support
+  * debian/patches/reply-to-list-support: port reply-to-list-support to 2.0
+    branch
+  * debian/patches/series: update quilt patch series accordingly
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 23 Apr 2007 13:15:00 +0200
+
+thunderbird (1.99.rc1+2.0-1) feisty; urgency=low
+
+  * branch firefox-trunk package for 2.0 thunderbird package
+  * debian/control.in, debian/control: add transition packages:
+    mozilla-thunderbird, mozilla-thunderbird-dev; disable dom-inspector
+    package as there is nearly no hope that it ever will get maintained 
+    upstream again.
+  * debian/rules: remove inspector extension from configure; add excludes
+    to dh_install of thunderbird and thunderbird-dev package:
+    -
+     DEB_DH_INSTALL_ARGS_thunderbird := -Xgnome -Ximgicon -Xmozlibthai
+     DEB_DH_INSTALL_ARGS_thunderbird-dev := -Xnspr -Xnss
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 18 Apr 2007 13:35:34 +0200
+
+firefox-trunk (2.99+2cvs20070328-0ubuntu0) feisty; urgency=low
+
+  * update upstream cvs
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 28 Mar 2007 11:00:00 +0200
+
+firefox-trunk (2.99+1-3.0a.20070201-0ubuntu0) feisty; urgency=low
+
+  * package firefox 3 preview
+  * rewrite packaging, make use of cdbs with quilt patch
+    system.
+  + imported initial patches
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 22 Feb 2007 09:00:00 +0200
+
+firefox (2.0.0.1+1-0ubuntu2) feisty; urgency=low
+
+  * browser/app/Makefile.in: link firefox-bin with
+    --no-as-needed again. (regression from
+    2.0.0.1+1-0ubuntu1)
+  * browser/components/feeds/src/FeedWriter.js: fix
+    RSS preview/subscription for flat chrome
+    (Closes lp#61182)
+  * debian/rules: set BUILD_OFFICIAL and MOZILLA_OFFICIAL environment
+    so build gets a proper BUILD_ID (Closes LP#).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 19 Feb 2007 12:45:00 +0100
+
+firefox (2.0.0.1+1-0ubuntu1) feisty; urgency=low
+
+  * repackage with new upstream mozilla.org and split up patches
+    into distinct feature patches available at 
+    http://people.ubuntu.com/~asac/firefox-patches/
+  * make use of original source tarball as distributed from
+    ftp.mozilla.org
+  * debian/rules: use --enable-official-branding to produce
+    official firefox branding; remove icons in debian/ dir;
+    add more garbage cleanup
+  * debian/firefox.links: /usr/share/pixmaps/firefox.png and
+    usr/share/pixmaps/mozilla-firefox.png now link to
+    usr/share/firefox/icons/mozicon128.png
+  * drop FeedWriter.js patch, no rational available.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/Makefile.in,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s,
+    configure.in, config/rules.mk, security/coreconf/Linux.mk:
+    drop debian architecture patches for 
+    not ubuntu platforms
+  * debian/control: taking over maintainership
+  * configure.in: update hidden visibility patch from bugzilla
+  * configure.in: drop
+  * Makefile.in: drop explicit export of nss as build system is not
+    broken anymore
+  * browser/app/Makefile.in: drop linker tweaks for now.
+  * browser/app/profile/firefox.js: drop override for homepage
+  * browser/locales/en-US/chrome/branding/brand.properties: drop further
+    branding hacks not needed anymore
+  * browser/components/search/nsSearchService.js: drop not needed
+    official browser hacks
+  * prefs-size.diff: removed garbage file from source 
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 15 Feb 2007 23:15:00 +0100
+
+firefox (2.0.0.1+0dfsg-0ubuntu2) feisty; urgency=low
+
+  * Build using hunspell instead of myspell.
+    - debian/control: Build-depend on libhunspell-dev instead of libmyspell-dev.
+    - config/autoconf.mk.in: Add MOZ_MYSPELL_CFLAGS.
+    - extensions/spellcheck/myspell/src/Makefile.in: Use MOZ_MYSPELL_CFLAGS.
+    - extensions/spellcheck/myspell/src/mozMySpell.h: Include hunspell.cxx
+      instead of myspell.cxx.
+    - configure.in, configure: Overwrite myspell detection with hunspell.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 18 Jan 2007 11:57:14 +0000
+
+firefox (2.0.0.1+0dfsg-0ubuntu1) feisty; urgency=low
+
+  * New upstream security update:
+    - CVE-2006-6507, MFSA 2006-76: XSS using outer window's Function object.
+    - CVE-2006-6506, MFSA 2006-75: RSS Feed-preview referrer leak.
+    - CVE-2006-6504, MFSA 2006-73: SVG Processing Remote Code Execution.
+    - CVE-2006-6503, MFSA 2006-72: XSS by setting img.src to javascript: URI.
+    - CVE-2006-6502, MFSA 2006-71: LiveConnect crash finalizing JS objects.
+    - CVE-2006-6501, MFSA 2006-70: Privilege escallation using watch point.
+    - CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, MFSA 2006-68: Crashes
+      with evidence of memory corruption.
+  * debian/rules: use original upstream icons (Closes LP#68180).
+  * debian/debsearch.src: make feisty the default debsearch target.
+  * browser/base/content/utilityOverlay.js: change Launchpad translation/help
+    pages for Feisty.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 21 Dec 2006 09:51:22 -0800
+
+firefox (2.0+0dfsg-0ubuntu3) edgy; urgency=low
+
+  * Patch from upstream CVS to fix RSS preview/subscription, thanks to Mike
+    Connor and Martin Jürgens (Closes: LP#61182)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 23 Oct 2006 10:20:25 +0100
+
+firefox (2.0+0dfsg-0ubuntu2) edgy; urgency=low
+
+  * uudecode debsearch.gif too.  Fixes FTBFS
+  * Make edgy the default debsearch target.  Closes: Malone: #61687
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon, 23 Oct 2006 08:52:11 +0200
+
+firefox (2.0+0dfsg-0ubuntu1) edgy; urgency=low
+
+  * Bump version to 2.0 (no upstream changes from rc3)
+  * browser/components/search/nsSearchService.js
+    - Set MOZ_OFFICIAL to "official", distributionID to "com.ubuntu"
+  * debian/branding: new subdirectory with images
+  * debian/rules:
+    - build: uudecode and substitute images in source tree, use debian/branding/icon64.png
+      instead of debian/firefox.png
+    - clean: restore images in source tree, remove uudecoded versions
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Fri, 20 Oct 2006 15:56:42 -0700
+
+firefox (1.99+2.0rc3+dfsg-0ubuntu1) edgy; urgency=low
+
+  * New upstream version 2.0rc3, UVF exception approved by Matt Zimmerman.
+  * configure: Fix bashism to let the gcc visibility=hidden bug detection
+    work.
+  * configure{,.in}: Change MOZ_APP_DISPLAYNAME from 'BonEcho' to 'Firefox' to
+    make UserAgent string work with web sites which evaluate it.
+  * browser/base/content/utilityOverlay.js: Open the Launchpad
+    translation/help pages for Edgy, not Dapper.
+  * For the sake of automatic vulnerability tracking: All 1.5.0.x and earlier
+    vulnerabilities were fixed in the 2.0 branch as well:
+    CVE-2005-0752 CVE-2005-1531 CVE-2005-1532 CVE-2005-2114 CVE-2006-0749
+    CVE-2006-1731 CVE-2006-1732 CVE-2006-1733 CVE-2006-1734 CVE-2006-1735
+    CVE-2006-1736 CVE-2006-1737 CVE-2006-1738 CVE-2006-1739 CVE-2006-1740
+    CVE-2006-1741 CVE-2006-1742 CVE-2006-1790 CVE-2006-2775 CVE-2006-2776
+    CVE-2006-2777 CVE-2006-2778 CVE-2006-2779 CVE-2006-2780 CVE-2006-2782
+    CVE-2006-2783 CVE-2006-2784 CVE-2006-2785 CVE-2006-2786 CVE-2006-2787
+    CVE-2006-2788 CVE-2006-3113 CVE-2006-3677 CVE-2006-3801 CVE-2006-3802
+    CVE-2006-3803 CVE-2006-3805 CVE-2006-3806 CVE-2006-3807 CVE-2006-3808
+    CVE-2006-3809 CVE-2006-3810 CVE-2006-3811 CVE-2006-3812 CVE-2006-4253
+    CVE-2006-4340 CVE-2006-4565 CVE-2006-4566 CVE-2006-4567 CVE-2006-4568
+    CVE-2006-4569 CVE-2006-4571
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 19 Oct 2006 09:28:15 +0200
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu3) edgy; urgency=low
+
+  * debian/firefox-runner: Disable Pango if a Sinhala locale is present. LP
+    66270.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 15 Oct 2006 20:29:26 +0100
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu2) edgy; urgency=low
+
+  * Delete /usr/lib/firefox/components/compreg.dat in the postinst.
+    This is a partial workaround for LP 30791.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 12 Oct 2006 12:19:11 +0100
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu1) edgy; urgency=low
+
+  * New upstream version 2.0rc2.
+  * Fix/workaround for epiphany GtkSocket lifetype crash:
+    apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
+  * Change application name to `Firefox', as requested by mdz.
+    Files changed:
+      - browser/locales/en-US/chrome/branding/brand.dtd
+      - browser/locales/en-US/chrome/branding/brand.properties;
+    New values:
+      - brandShortName and brandFullName: `Bon Echo' => `Firefox'
+      - vendorShortName: `Mozilla' => `Ubuntu'
+  * Make preferences dialogue fit again (bah!).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 10 Oct 2006 18:49:32 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu3) edgy; urgency=low
+
+  * Remove /usr/lib/mozilla-thunderbird from the LD_LIBRARY_PATH
+    if we find it there.  Workaround for LP 57923.
+  * Remove pocket name (eg `-security') from distribution identifier in
+    the browser user agent string.  LP 55289.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  3 Oct 2006 19:01:34 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu2) edgy; urgency=low
+
+  * Ship xpidl et al, in firefox-dev.  Relates to Debian #362190.
+    Fixes Malone #61160.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 21 Sep 2006 16:33:50 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu1) edgy; urgency=low
+
+  * Merged from Debian unstable; new upstream version.
+  * Remaining differences between
+    Debian and Ubuntu in no particular order:
+    - Build libnspr and libnss and corresponding -dev packages from this
+      source package.  Plus changes to make these libs build nicely.
+    - Various changes to preferences, default bookmarks and search engines.
+    - Support for `Get Help Online' and `Translate This Application'.
+    - Size changes for various dialogue boxes to make the contents fit.
+    - Downloads go to separate `Desktop' folder by default.
+    - Fix some underquoted m4 arguments.
+    - Minor changes in directories, symlinks and debian/control
+      to cope with Ubuntu and Debian's different histories.
+    - disable File / Import (wizard is nonfunctional).
+      Malone #28563, Debian #350599, Mozilla Bugzilla 117844.
+    - Change `Latest Headlines' to `Latest BBC Headlines' to properly
+      disclose the source up front, and use a corresponding RSS URL.
+    - Default for FIREFOX_DSP is none.
+    - Pango support is enabled only if an installed locale seems to need
+      it.
+    - Note in README.Debian about how to run xpcshell.
+    - Disable xprint.
+    - No build dependency on libxp-dev; build-depend on zip instead.
+    - Various icon changes.
+    - Some currently-unused directory merging code in firefox.preinst.
+    - Less detail in the user agent string.
+    - Belt-and-braces removal for some cruft left over by some versions of
+      the Mozilla build system.
+    - Better firefox.menu entry (says `Firefox Web Browser').
+    - Build dynamically linked, since in Ubuntu embedders use firefox.
+    - EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998.
+    - Pass FC_ANY_METRICS to Fontconfig where appropriate.
+    - Extensive Thai language patch.
+    - Print in serif by default even though default display is sans.
+    - Some fixes to the (upstream-unused) nss makefiles.
+    - Strip PostScript/ from printer names.
+    - Better message about updates of read-only extension.
+    - Include pointer to the Gecko Runtime (GRE registration).
+    - Prevent websites from disabling context menus.
+   All of these changes are fully documented in the changelog below.
+   Please see those changelog entries for full details.  Much historical
+   information about changes either taken up by Debian or upstream, or
+   dropped by us, is retained in this changelog.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 13 Sep 2006 16:40:06 +0100
+
+firefox (1.99+2.0b2+dfsg-1) experimental; urgency=low
+
+  * New upstream beta release.
+
+  * extensions/inspector/build/src/Makefile.in,
+    extensions/inspector/build/src/inspector.pkg,
+    extensions/inspector/build/src/nsInspectorModule.cpp: Removed, the problem
+    was lying in debian/rules. /me goes hiding under a rock.
+  * layout/inspector/public/Makefile.in: Reverted previous changes.
+  * debian/rules: Don't exclude inspector files when dh_installing the firefox
+    package. We need the inspector.xpt file from the components directory. The
+    files for the dom-inspector package are already excluded from the
+    firefox.install file anyway.
+  * debian/firefox-dom-inspector.install,
+    debian/firefox-dom-inspector.links: Simplified.
+  * debian/control:
+    + Turn firefox-dom-inspector into an arch: all package, since the binary
+      component has been merged into the firefox binary.
+    + Adjust dependencies for binNMU safety.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure:
+    Use ${host_cpu} instead of uname -m so that firefox can safely build on
+    s390x with a s390 target, and on amd64 with an x86 target.
+  * uriloader/exthandler/unix/nsGNOMERegistry.cpp,
+    uriloader/exthandler/unix/nsGNOMERegistry.h,
+    uriloader/exthandler/unix/nsOSHelperAppService.cpp,
+    uriloader/exthandler/unix/nsMIMEInfoUnix.cpp,
+    uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to
+    make helper applications with parameters work. (Closes: #355511)
+  * debian/copyright: Adjusted with updated information for firefox 2.0, which
+    is now properly tri-licensed \o/. (Closes: #330295)
+  * debian/rules: Install the MPL file taken from the upstream LICENSE file.
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  1 Sep 2006 08:36:26 +0200
+
+firefox (1.5.dfsg+1.5.0.6-3) unstable; urgency=low
+
+  * browser/app/Makefile.in: Workaround to force link the xpcom library to
+    the firefox binary despite -Wl,--as-needed in the LDFLAGS.
+    (Closes: #378667)
+  * debian/firefox.install: Don't install xpt_link, xpt_dump, xpidl,
+    xpicleanup, xpcshell nor regxpcom. They are of no use to firefox users and
+    are provided with xulrunner anyway. (Closes: #362190)
+
+ -- Mike Hommey <glandium@debian.org>  Sun, 20 Aug 2006 19:49:25 +0200
+
+firefox (1.5.dfsg+1.5.0.6-2) unstable; urgency=low
+
+  * debian/firefox.desktop: 
+    - Polish translation from Ian Jackson by way of an Ubuntu user. 
+      (Closes: #382079)
+    - Patch from Ian Jackson to stop claiming dav:// URLs when firefox
+      doesn't understand them. (Closes: #382080)
+  * editor/libeditor/text/nsPlaintextEditor.cpp: Apply patch from
+    bz#271815 to fix OverTheSpot mode used by many Asian language input
+    modules. (Closes: #379935)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 15 Aug 2006 00:09:55 -0400
+
+firefox (1.5.dfsg+1.5.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Eric Dorland <eric@debian.org>  Thu,  3 Aug 2006 13:17:45 -0400
+
+firefox (1.5.dfsg+1.5.0.5-1) unstable; urgency=high
+ 
+  [ Eric Dorland ]
+  * New upstream release. Urgency high because it fixes MFSA 2006-44 to
+    MFSA 2006-56 excluiding MFSA-2006-49. (Closes: #380463)
+  
+  [ Mike Hommey ]
+  * debian/firefox.prerm: Remove /usr/lib/firefox/.autoreg instead of
+    /var/lib/firefox/.autoreg.
+  * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+    Removed very old and now useless changes.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp: Removed
+    useless new line that showed up in the diff.gz.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 30 Jul 2006 17:08:38 -0400
+
+firefox (1.99+2.0b1+dfsg-1) experimental; urgency=low
+
+  * New upstream beta targetted at experimental:
+    - Much better search plugins handling. They can be added and removed at
+      will, and even better, system-wise search plugins can be ignored at the
+      profile level. (Closes: #352195, #320957, #296425, #308005)
+  * browser/components/shell/src/Makefile.in: Correctly install the
+    setDefaultBrowser component.
+  * config/rules.mk: Don't install extensions in the chrome.
+  * debian/firefox.links: Link /usr/lib/firefox/dictionaries to
+    /usr/share/myspell/dicts.
+  * config/autoconf.mk.in, configure, configure.in: Add the
+    --enable-system-myspell argument to configure to use the system myspell
+    library.
+  * extensions/spellcheck/myspell/src/Makefile.in: Use the system myspell
+    library when asked to.
+  * debian/rules:
+    - Add --enable-system-myspell to configure call.
+    - Do shlibsign libfreebl's (there can be several depending on the arch).
+  * debian/control: Add libmyspell-dev to build dependencies.
+  * browser/components/microsummaries/src/Makefile.in, config/Makefile.in:
+    Add rules so that make clean cleans everything.
+  * allmakefiles.sh: Removed references to nonexisting Makefiles in
+    extensions/xmlextras/base.
+  * configure, configure.in: Apply patches from bz#334866, bz#319012 and
+    bz#335949 + fixups to workaround gcc visibility hidden bugs, especially
+    #331460 (an instance of which is actually still present in C++,
+    see gcc#26905).
+  * extensions/inspector/build/src/Makefile.in,
+    extensions/inspector/build/src/inspector.pkg,
+    extensions/inspector/build/src/nsInspectorModule.cpp: Added missing files
+    for the DOM Inspector component.
+  * extensions/inspector/build/src/Makefile.in,
+    layout/inspector/public/Makefile.in: Adapted so that the DOM Inspector
+    component would build correctly and the xpt would be installed in
+    the extensions directory.
+  * extensions/reporter/Makefile.in: Install missing reporter's preference.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 21 Jul 2006 07:05:25 +0200
+
+firefox (1.5.dfsg+1.5.0.4-3) unstable; urgency=low
+  
+  [ Eric Dorland ]
+  * debian/control: 
+    - Fix silly typo of binutils. (Closes: #378582)
+    - Standards-Version to 3.7.2.1.
+  
+  [ Mike Hommey ]
+  * debian/rules:
+    - Use a specific LD_LIBRARY_PATH at link time so that we don't need to
+      link against indirect dependencies. (Closes: #378378)
+    - Run shlibsign after the files are stripped so that it is accurate and
+      FIPS mode can correctly work.
+    - Removed old commented out OPTFLAGS that were kept in case gcc 4.0 did
+      no better than gcc 3.x.
+    - Removed old exported variables that are useless nowadays.
+    - Removed dh_strip call in binary-indep. Who wants to strip
+      arch-independant files ;)
+  * debian/presubj: Added notes about plugins and crash reports.
+  * security/manager/Makefile.in, security/nss/cmd/shlibsign/Makefile:
+    Don't build nor install the .chk files but still build shlibsign.
+  * debian/firefox.install: Don't install .chk files since we generate them
+    after dh_strip.
+  * security/nss/cmd/shlibsign/manifest.mn: Don't build in shlibsign/mangle.
+    It doesn't build anyway.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 19 Jul 2006 23:56:22 -0400
+  
+firefox (1.5.dfsg+1.5.0.4-2) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * netwerk/base/public/security-prefs.js: Disable SSLv2 by default. I
+    thought the weak cipher warning took care of this. (Closes: #371153)
+  * debian/firefox-runner: Simplify the dsp autodetection and add aoss to
+    the roster. (Closes: #372848)
+  * firefox-restart-required.update-notifier, firefox.postinst,
+    firefox.install: Add update-notifier to indicate that firefox needs to
+    be restarted on upgrade. Based on Ian Jackson's patch, but reworked a
+    little. Also with a bad French translation. Translators, assemble!
+    (Closes: #365865)
+  * config/rules.mk, debian/control: Apply patch from Thiemo Seufer to
+    remove mips -xgot hack and build depend on the appropriate binutils on
+    mips and mipsel. (Closes: #374372)
+  * debian/presubj, debian/README.Debian: Add a bit more information about
+    disabling Pango, which often seems to be the source of problems.
+  * debian/firefox-runner: 
+    - Print out MOZ_NO_REMOTE in verbose mode.
+    - Fix some unreachable logic, Thanks Daniel Jacobowitz.
+
+  [ Mike Hommey ]
+  * debian/rules:
+    - Fix for Gecko date extraction from client.mk.
+    - Disabled strict aliasing from optimized builds.
+    - Added -Wl,--as-needed to the LDFLAGS, so that we don't get indirect
+      libraries linked.
+  * config/static-config.mk: Add MOZ_XFT_LIBS to STATIC_EXTRA_LIBS. It used to
+    get linked as a side effect of linking to indirect libraries, but should
+    be linked directly since Xft symbols are used.
+  * debian/firefox-restart-required.update-notifier: Fixed the french
+    translation. ;)
+  * content/html/content/src/nsGenericHTMLElement.cpp,
+    content/html/content/src/nsHTMLInputElement.cpp,
+    dom/src/base/nsGlobalWindow.cpp: Fixed crasher and potential crashers.
+    Reported bz#343953.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  9 Jul 2006 02:37:28 -0400
+
+firefox (1.5.dfsg+1.5.0.4-1) unstable; urgency=low
+
+  * The "Post-DebConf Hangover" release.
+  
+  [ Eric Dorland ]
+  * New upstream release. Fixes various security issues. MFSA 2006-31 to
+    MFSA 2006-43, excluding MFSA 2006-40.
+  * debian/control:
+    - Standards-Version to 3.7.2.0.
+    - Set priority of -dbg to extra and Section to devel.
+  * gfx/src/gtk/nsFontMetricsPango.cpp,
+    intl/lwbrk/src/nsJISx4501LineBreaker.cpp,
+    intl/unicharutil/util/nsUnicharUtils.h,
+    intl/unicharutil/util/nsUnicharUtils.cpp,
+    layout/generic/nsTextFrame.cpp: Patch from Jurij Smakov (from
+    bz#161826) to fix alignment issues on sparc64. (Closes: #354725)
+
+  [ Mike Hommey ]
+  * Applied distclean patch from xulrunner (in
+    debian/patches/01_distclean.dpatch), except for the javaxpcom stuff we
+    don't build anyway.
+  * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd},
+    config/static-rules.mk: More cleaning for firefox.
+  * nsprpub/configure: Apply change to nsprpub/configure.in.
+    (Closes: #350616)
+  * gfx/src/gtk/nsFontMetricsPango.cpp: Some more changes so that it
+    actually builds without errors, and use PR_Malloc and PR_Free instead
+    of malloc and free.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  2 Jun 2006 12:13:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-2) unstable; urgency=low
+
+  * debian/firefox.desktop: Add spanish translation, just in time for
+    DebConf 6! Thanks Ian Jackson. (Closes: #365870)
+  * debian/firefox-runner: Actually apply the patch from Morita Sho in
+    #364566. I'm a moron. (Closes: #365956, #365960)
+  * debian/control: Standards-Version to 3.7.1.0. Go policy team!
+
+ -- Eric Dorland <eric@debian.org>  Thu,  4 May 2006 01:38:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-1) unstable; urgency=critical
+
+  * The "secure enough for ya!" release.
+  * New upstream release. Contains security fixes, hence severity
+    critical. 
+    - Fixes CVE-2006-1993 aka MFSA 2006-30. (Closes: #364810)
+  
+  [ Mike Hommey ]
+  * security/manager/Makefile.in, debian/firefox.install: Build and
+    install the .chk file again. That will make the FIPS mode work again.
+  * debian/control: Bumped Standards-Version to 3.7.0.0. No changes.
+  * debian/rules: Fix the navigator.ProductSub value for dumb scripts.
+    Closes: #364640, #365099. We now use the date of the client.mk file,
+    which is likely to be the closest value to the release date, instead of
+    useless build date.
+    Add the debian version after the firefox version string.
+  * debian/rules: Use dpkg-architecture to find out the host and build that
+    we want to pass to the configure script. (Closes: #365738)
+
+  [ Eric Dorland ]
+  * debian/firefox-runner: 
+    - Quote the APPLICATION_ID variable to handle profiles with a space 
+      in the name. Inspired by Morita Sho's patch. (Closes: #364566)
+    - echo MOZ_DISABLE_PANGO on verbose.
+  * debian/rules: It's baaaackkk. Reenable xprint.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  3 May 2006 00:32:49 -0400
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu3) dapper; urgency=low
+
+  * Thai-related crash fix (Malone 45395):
+    - nsCopySupport.cpp, nsCopySupport::HTMLCopy:
+       do not crash if htmlConverter->Convert fails.
+    - nsHTMLFormatConverter.cpp, nsHTMLFormatConverter::Convert:
+       properly report failure if dataStr.IsEmpty.
+    - nsJISx4501LineBreaker.cpp: fix printf(stderr -> fprintf.
+  * Add Polish translation for firefox.desktop (Malone 45447).
+    Thanks to contribution from Tomasz Dominikowski.
+  * Do not attempt to merge /usr/lib/mozilla-firefox and /usr/lib/firefox
+    and make the former a link to the latter; this is unfortunately
+    error-prone and makes more problems than it solves.
+    Fixes Malone 44487; regresses the plugins directory confusion bug.
+  * Include MFSA and CVE numbers in changelog entry for 1.5.dfsg-1.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 23 May 2006 17:45:30 +0100
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu2) dapper; urgency=low
+
+  * Fix memory leak in large clipboard handling.  Malone 41093.
+    Mozilla Bugzilla 289897; applied attachments 218749, 218753.
+  * Provide symlink /usr/lib/mozilla-firefox -> /usr/lib/firefox
+    (and shuffle stuff across if both directories exist).
+  * Remove update-notifier `restart required' on removal so that if you
+    remove firefox you're no longer asked to restart it.  Malone 36739.    
+  * Increase size of prefs window explicitly.  Malone 43528.
+  * Suppress the error if /var/lib/locales/supported.d/* can't be read
+    (probably because it doesn't exist).  If you get EIO or EACCES or some
+    such then having pango mysteriously disabled will be the least of your
+    worries.  Malone 44016.
+  * Really use firefox_1.5.dfsg+1.5.0.3.orig.tar.gz from Debian.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 12 May 2006 19:20:30 +0100
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream version, 1.5.0.3, security/stability fix from upstream:
+    MFSA 2006-30, CVE-2006-1993: Deleted
+     object reference when designMode="on" 
+    This package is based on Debian's firefox_1.5.dfsg+1.5.0.3.orig.tar.gz
+    but has none of the corresponding Debian changes.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 10 May 2006 12:13:30 +0100
+
+firefox (1.5.dfsg+1.5.0.2-3) unstable; urgency=low
+
+  * debian/rules, debian/control: Build the -dbg package again.
+  * debian/firefox.1: Fix some incorrect references to mozilla. Thanks
+    Loïc Minier. (Closes: #364101)
+  * debian/firefox-runner: Patch from Mikhail Gusarov to be able to use
+    Network Audio Server's dsp wrapper. (Closes: #363124)
+  * debian/firefox.install: Fix screwed up path to firefox.xpm. (Closes:
+    #364359)
+  * debian/README.Debian: Document that firefox doesn't allow connections
+    on certain ports. Thanks W. Borgert. (Closes: #362785)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 23 Apr 2006 22:41:15 -0400
+
+firefox (1.5.dfsg+1.5.0.2-2) unstable; urgency=critical
+
+  * The "ftp-master's aren't my friends today" release.
+  * debian/rules, debian/control: Don't build the -dbg package for now, to
+    get around NEW queue processing.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 20 Apr 2006 22:33:18 -0400
+
+firefox (1.5.dfsg+1.5.0.2-1) unstable; urgency=critical
+
+  [ Eric Dorland ]
+  * New upstream release. Contains security fixes, hence severity
+    critical.
+    - Fixes the following vulnerabilites (Thanks Alexander Sack for 
+      compiling the list): CVE-2006-1724, CVE-2006-0884, 
+      CVE-2006-1730, CVE-2006-1729, CVE-2006-1728, CVE-2006-1727, 
+      CVE-2006-1045, CVE-2006-0748, CVE-2006-1726, CVE-2006-1725, 
+      CVE-2005-2353. (Closes: #362656)
+  * debian/firefox-runner: Patch from Paul Collins to fix some lingering
+    ProfileManager launch issues. (Closes: #356250)
+  * browser/components/preferences/privacy.xul,
+    browser/locales/en-US/chrome/browser/preferences/preferences.dtd:
+    Patch from Ian Jackson to make the preferences window bigger for
+    people with high rez displays. His changelog entry reads:
+    * Make Preferences window not chop off various elements:
+      - specify a width of 50em instead of 42em
+      - do not specify a height
+      - add another <separator/> to the bottom of privacy.xul's prefpane.
+        I have no idea why this is necessary :-(.
+      Malone 36985.
+  * configure.in, configure: Small typo in configure.in that wasn't
+    setting TARGET_XPCOM_ABI properly and breaking binary extensions on
+    some arches. (Closes: #359228)
+
+  [ Mike Hommey ]
+  * debian/rules: Disable elf-dynstr-gc, which is pretty useless nowadays.
+  * security/coreconf/rules.mk: Fix perl code that got broken by newer make.
+    Taken from bz#325148.
+  * browser/app/Makefile.in: Apply patch from bz#314927 to install default.xpm
+    in the correct place.
+  * debian/rules, debian/firefox.dirs, debian/firefox.install: Updated to fit
+    this change.
+  * security/coreconf/rules.mk: Force use of the -g flag in the CFLAGS.
+ 
+ -- Eric Dorland <eric@debian.org>  Sun, 16 Apr 2006 18:40:02 -0400
+
+firefox (1.5.dfsg+1.5.0.2-0ubuntu2) dapper; urgency=low
+
+  * Increase sizes of various dialogue boxes so that all of the contents
+    fit.  Malone 26225, 36985, and probably others.
+  * Set MOZ_DISABLE_PANGO=1 to disable pango, unless some locale is
+    selected as supported which would need pango for rendering; the
+    default can be overridden by setting MOZ_DISABLE_PANGO to 0 or 1.
+    Malone 32561 (workaround).
+  * Use update-notifier to request a firefox restart.  Malone 36739.
+  * Added Spanish translation to firefox.desktop.
+    Malone 39972.  Thanks to Rocco Stanzione for the patch.
+  * Add a couple of missing trailing newlines.
+    Malone 39972 again.  Thanks Rocco Stanzione for the report.
+  * EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998,
+    thanks to chpe for the patch and discussion.
+  * Add FC_ANY_METRICS set to FcTrue to all patterns that are going to be
+    used for finding (rather than enumerating) fonts.  Malone 42559.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  2 May 2006 18:59:32 +0100
+
+firefox (1.5.dfsg+1.5.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream version, 1.5.0.2.
+    Described as `stability and security fixes' by upstream but many
+    changes are included and producing a complete list is infeasible :-(.
+    Fixes are known to be included for:
+    - MFSA 2006-29, CVE-2006-1725: Spoofing with translucent windows
+    - MFSA 2006-28, CVE-2006-1726: Security check of
+         js_ValueToFunctionObject() can be circumvented
+    - MFSA 2006-27, CVE-2006-0748: Table Rebuilding Code Execution
+         Vulnerability
+    - MFSA 2006-25, CVE-2006-1727: Privilege escalation through Print Preview
+    - MFSA 2006-24, CVE-2006-1728: Privilege escalation using
+         crypto.generateCRMFRequest
+    - MFSA 2006-23, CVE-2006-1729: File stealing by changing input type
+    - MFSA 2006-22, CVE-2006-1730: CSS Letter-Spacing Heap Overflow
+         Vulnerability
+    - MFSA 2006-20, CVE-2006-1529, CVE-2006-1530, CVE-2006-1531,
+      CVE-2006-1723, CVE-2006-1724: Crashes with evidence of memory
+         corruption.
+    This package is based on Debian's firefox_1.5.dfsg+1.5.0.2.orig.tar.gz
+    but has none of the corresponding Debian changes.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 26 Apr 2006 16:53:22 +0100
+
+firefox (1.5.dfsg+1.5.0.1-5) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/rules:
+    - Add -g to the build flags when building with DEB_BUILD_OPTIONS=nostrip.
+      If we ask for nostrip, we want the debugging
+      symbols, right? ;)
+    - Changed the way we identificate ourselves in vendor.js.
+  * layout/build/Makefile.in, layout/build/nsLayoutModule.cpp: Remove useless
+    useragent setter at startup so that general.useragent.product and
+    general.useragent.productSub set in our vendor.js preference file work at
+    startup time.
+  * security/coreconf/Linux.mk:
+    - Patch from Martin Michlmayr for mips64 builds.
+    - Don't use x86 as CPU_ARCH when building on an unsupported architecture.
+  * security/manager/Makefile.in, security/nss/lib/ckfw/builtins/Makefile,
+    security/nss/lib/manifest.mn: Don't build the stuff we don't need, and
+    dynamically link libnssckbi to both libplc4 and libplds4 instead of
+    linking statically.
+  * debian/firefox.postinst, debian/firefox.prerm,
+    debian/firefox-gnome-support.postinst, debian/firefox-gnome-support.prerm:
+    Touch a .autoreg file at configure time, or removal of gnome-support and
+    remove it with the package. This will trigger autoregistration of the
+    components if the compreg.dat and xpti.dat files are older than the
+    .autoreg file. We used to remove compatibility.ini for that reason, but
+    stopped doing that because firefox was supposed to do that correctly,
+    which actually only correctly works on new upstream versions, not new
+    debian revisions, or installation of gnome-support.
+  * xpfe/components/killAll/Makefile.in: Correctly install the killAll
+    component.
+
+  [ Eric Dorland ]
+  * debian/control:
+    - Set Section of firefox-gnome-support and
+      mozilla-firefox-gnome-support to gnome.
+    - Standards-Version to 3.6.2.2.
+    - debhelper build-dep to >= 5.0.
+    - Add firefox-dbg package.
+  * debian/compat: Set to 5.
+  * debian/rules:
+    - Remove silly CVS tarball cleanup target.
+    - Add arch-independant debhelper calls, and make other debhelper
+      calls arch-dependent.
+    - Add --dbg-package=firefox-dbg to dh_strip call.
+    - Always build with the -g flag. (Based on a change Mike made)
+    - Patch from Andreas Jochens to use -mminimal-toc when building on 
+      ppc64. (Closes: #361035)
+    - Use --disable-strip, --disable-strip-libs in configure parameters.
+      Thanks Ian Jackson.
+    - Use .upstream instead of .orig to make it more clear and not  
+      confuse the clean target. Thanks Ian Jackson. (Closes: #362186)
+    - Disable xprint support for now, while the Xorg 7 transition sorts 
+      itself out. Should be reenabled next release.
+  * debian/firefox.xpm: Add more Debian compliant menu icon.
+  * debian/firefox.install, debian/rules: Install new Debian compliant
+    icon.
+  * debian/firefox.desktop: Add StartupNotify=true for pretty waiting
+    cursor. Thanks Sven Arvidsson. (Closes: #361527)
+  * debian/firefox-dom-inspector.preinst,
+    debian/firefox-dom-inspector.links,
+    debian/firefox-dom-inspector.install: Install non-architecture
+    specific bits of the inspector into /usr/share/firefox.
+  * debian/firefoxrc: Disable the dsp wrapper by default. esddsp is just
+    too buggy to allow this to continue. May reenable later if they clean
+    up their act. Leaving the bugs open for now.
+  * debian/firefox.NEWS: 
+    - Document the dsp wrapper changes.
+    - Remove old mozilla-firefox entries.
+  * debian/firefox.1: Fix typo of firefox, thanks Andrew Rendle. (Closes:
+    #362413)
+  * debian/firefox.install: We don't get .chk files anymore for some
+    reason.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 14 Apr 2006 15:52:41 -0400
+
+firefox (1.5.dfsg+1.5.0.1-4) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/firefox-runner, debian/firefox.1: Patch from Ian Jackson to
+    make -P, -CreateProfile and -ProfileManager options correctly work
+    again, and improve the manual page. (Closes: #356250)
+  * debian/firefox.desktop:
+    - Fix trivial syntax problems. (Closes: #356263)
+    - Added Japanese and Korean translations.
+  * debian/firefox.dirs: Removed remainings of the time when we had a file
+    in /usr/sbin. (Closes: #356268)
+  * debian/firefox-gnome-support.prerm,
+    debian/firefox-gnome-support.postinst: Removed bashisms. (Closes:
+    #349946)
+  * debian/README.Debian:
+    - Replaced the bug reporting information by an invitation to read
+      /usr/share/bug/firefox/presubj. (Closes: #356269)
+    - Changed the heading to "Firefox for Debian".
+
+  [ Eric Dorland ]
+  * debian/firefox-gnome-support.postinst,
+    debian/firefox-gnome-support.prerm: Add forgotten #DEBHELPER# token.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 12 Mar 2006 21:34:14 -0500
+
+firefox (1.5.dfsg+1.5.0.1-3) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * debian/control: Use strict dependencies for the transition packages,
+    no reason a transition package should be upgraded before the real
+    package.
+  * debian/README.Debian: Fix all references to
+    /etc/mozilla-firefox/mozilla-firefoxrc. (Closes: #351956)
+  * debian/firefox.desktop: Patch from Ian Jackson to add more
+    translations and more inline with the GNOME HIG. (Closes: #351807)
+  * widget/src/gtk2/nsWindow.cpp: Apply new ignore extended mouse buttons
+    patch from Peter Colberg (Closes: #351972)
+  * debian/firefox.1: Lower case first letter of -ContentLocale.
+  * debian/firefox.1, debian/firefox-runner: Add -no-remote switch to turn
+    on MOZ_NO_REMOTE. Use it for profile related commands as
+    well. (Closes: #351717, #344849)
+  * wikipedia.gif.uu, wikipedia.src, rules, firefox.install: Patch from
+    Ian Jackson to add wikipedia search engine. (Closes: #354107)
+
+  [ Mike Hommey ]
+  * modules/libpref/src/init/all.js: Set default fonts for all languages to
+    serif, sans-serif and monospace. It might solve a lot of fonts problems.
+  * config/config.mk, config/make-jars.pl, configure.in,
+    security/nss/lib/fortcrypt/swfort/pkcs11/config.mk,
+    extensions/inspector/Makefile.in: Allow building without zip when
+    building flat chrome.
+  * configure: Ran autoconf accordingly to changes in configure.in.
+  * debian/control: Removed build dependency on zip.
+  * debian/rules: Build flat chrome.
+  * debian/firefox.install: Changed wildcards accordingly.
+  * config/rules.mk:
+    + Don't build chromelist.txt files.
+    + Fixed "jar" build so that inspector files don't get duplicated in the
+      extension directory.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 26 Feb 2006 11:45:15 -0500
+
+firefox (1.5.dfsg+1.5.0.1-2) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/firefox-runner: export MOZ_DISABLE_PANGO. (Closes: #351959)
+  * debian/README.Debian: changed reference to the rc file in /etc.
+    (Closes: #351956)
+  
+  [ Eric Dorland ]
+  * debian/firefox.preinst: Fix {}'s bashism. Thanks Jeff King. (Closes:
+    #351811)
+  * modules/libpref/src/init/all.js: Make print.postscript.print_command
+    space-safe. Thanks Ian Jackson. (Closes: #351809)
+  * debian/firefox-runner: Don't completely override
+    $MOZ_PLUGIN_PATH. Thanks Ian Jackson. (Closes: #351806)
+
+ -- Eric Dorland <eric@debian.org>  Thu,  9 Feb 2006 01:23:35 -0500
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu12) dapper; urgency=low
+
+  * Sponsored upload for Theppitak Karoonboonyanan
+  * Updated Thai word breaking patch:
+    - load `libthai.so.0' instead of `libthai.so'.
+    - print debug message only when DEBUG is defined.
+    - debian/control: Suggests libthai0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Apr 2006 13:25:14 +0200
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu11) dapper; urgency=low
+
+  * Fix silly lack of [ ] quoting in AC_DEFUN use.
+    Malone 36659, Mozilla bugzilla 298457.
+  * Make Preferences window not chop off various elements:
+    - specify a width of 50em instead of 42em
+    - do not specify a height
+    - add another <separator/> to the bottom of privacy.xul's prefpane.
+      I have no idea why this is necessary :-(.
+    Malone 36985.
+  * Fix broken UTF-8 in .desktop file (again).  Malone 37779.
+  * Document how to use xpcshell in README.Debian.  Malone 35333.
+  * Clarify updateReadOnlyMessage to refer to `system package manager'
+    which will help the misunderstanding in Malone 31284.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 12 Apr 2006 17:18:52 +0100
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu10) dapper; urgency=low
+
+  * Generate `firefox-dbg' package with debugging symbols.
+    This involves changing debian/compat to 5, which should be safe.
+  * Fix Norwegian translation in firefox.desktop. (Malone 30603.)
+  * Fix trivial syntax problems in firefox.desktop. (Malone 33567.)
+  * Remove x-directory/webdav x-directory/webdav-prefer-directory
+    from MimeType list in desktop file.  (Malone 35928.)
+  * Use `about.png.upstream' instead of `about.png.orig' is the saved
+    original version for the branding; *.orig tends to get clobbered.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 24 Mar 2006 18:49:46 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu9) dapper; urgency=low
+
+  * added thai linebreaking support (thanks to Theppitak Karoonboonyanan)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Mar 2006 15:16:52 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu8) dapper; urgency=low
+
+  * debian/rules:
+    - renamed the idl directory to match the .pc name, 
+      replace mozilla-firefox by firefox for firefox-config too
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 13 Mar 2006 15:12:43 +0100
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu7) dapper; urgency=low
+
+  * Pointing the .pc files to /usr/include/firefox is not enough,
+    better install the headers there too.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Mar 2006 17:41:24 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu6) dapper; urgency=low
+
+  * Replace Ubuntu Bugzilla bookmark with Launchpad's `Request
+    support with Ubuntu' ticket creation page.  (Malone 28896.)
+  * Reinstate `Translate This Application' in Help menu, despite the fact
+    that Launchpad doesn't do this yet - you just get a page saying there
+    are no translations for Firefox.  mdz assures us that this will be
+    done some time during dapper's service life.
+  * Make -P, -CreateProfile and -ProfileManager imply sensible
+    values for -a, and document -a in firefox(1).  (Malone 31746.)
+  * Fix md5sum mismatch which causes spurious conffile prompt on
+    bookmarks.html.
+  * Set browser.startup.homepage_override.mstone to ignore,
+    to avoid the silly thing where the first time after the upgrade,
+    firefox looks like it has lost your home page because it is so keen to
+    tell you about the release notes.  (Malone 33895.)
+  * Change `Latest Headlines' to `Latest BBC Headlines' to properly
+    disclose the source up front, and use a corresponding RSS URL.
+  * Revert the `you have chosen to open' dialogue, as discussed on
+    ubuntu-devel.
+  * Fix firefox-*.pc files to contain correct references to libs and
+    includes, just like the mozilla-*.pc files.  (Malone 34200.)
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu,  9 Mar 2006 19:56:58 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu5) dapper; urgency=low
+
+  * Disable `Translate This Application' and don't try to have `Get Help
+    Online' translated because we don't know how to translate firefox:
+    https://launchpad.net/products/rosetta/+spec/rosetta-firefox-support
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 24 Feb 2006 14:49:23 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu4) dapper; urgency=low
+
+  * Disable (by default) the `you have chosen to open' dialogue box;
+    instead, we just take the default (which is to open with the
+    application from the Gnome MIME database).  This behaviour is
+    controlled by browser.helperApps.defaultNoAsk.openFile.
+  
+  Bookmark, search and translation reference regression fixes:
+  * Restore `Translate This Application' and `Get Help Online'
+  * Add Ubuntu and Free Software links back to bookmarks
+  
+  Bookmark, search and translation references improvements:
+  * Add Wikipedia to search box.
+  * Remove `Quick searches' from bookmarks (these just replicate
+    entries from the search box, and are broken anyway).
+  
+  * Get rid of README.Ubuntu - the contents are now no longer relevant.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 23 Feb 2006 14:44:42 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu3) dapper; urgency=low
+
+  * Move /usr/lib/libxpcom*.so etc. back to /usr/lib/firefox; avoids
+    clashes with other packages (eg mozilla).
+  * Add rpath setting for /usr/lib/firefox to all .pc files in
+    firefox-dev.  This is suboptimal, but at least it allows programs
+    which use firefox-dev at compile-time to find firefox's .so's.
+  * Take some redundant and perhaps privacy-leaking information out
+    of the default User-Agent (Malone 30677).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 10 Feb 2006 17:42:12 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu2) dapper; urgency=low
+
+  * Fix stupid FTBFS on default.xpm introduced in last upload.
+  * Retrospectively insert CVE numbers into 1ubuntu1 changelog entry.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu,  9 Feb 2006 12:45:15 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu1) dapper; urgency=low
+
+  Changes since 1.5.dfsg-4ubuntu6:
+  * New upstream version (1.5.0.1) - security and stability fixes,
+    allegedly. (About 7000 lines of diff, so not reviewed for Ubuntu.)
+    Security fixes included:
+    - CVE-2006-0292, CVE-2006-0293, MFSA 2006-01: JavaScript garbage-collection
+      hazards
+    - CVE-2006-0294, MFSA 2006-02: Changing position:relative to static
+      corrupts memory
+    - CVE-2005-4134, MFSA 2006-03: Long document title causes startup denial of
+      Service
+    - CVE-2006-0295, MFSA 2006-04: Memory corruption via QueryInterface on
+      Location, Navigator objects
+    - CVE-2006-0296, MFSA 2006-05: Localstore.rdf XML injection through
+      XULDocument.persist()
+    - CVE-2006-0297, MFSA 2006-06: Integer overflows in E4X, SVG and Canvas
+    - CVE-2006-0298, MFSA 2006-07: Read beyond buffer while parsing XML
+    - CVE-2006-0299, MFSA 2006-08: "AnyName" entrainment and access control
+      hazard
+  * Fix Norwegian translation in .desktop file.  (Malone #30603.)
+  * mkdir /usr/include/mozilla in firefox-dev.preinst to avoid
+    maintainer script sometimes preventing installation.
+  * Move the shlibs needed for gtkmozembed to /usr/lib (avoids
+    need for rpath and nonsense in firefox-gtkmozembed.pc).
+  * Work around new GNU make braindamage by adding seddery to
+    security/coreconf/rules.mk.
+
+  Expected-permanent differences between Ubuntu and Debian:
+  * Build nspr and nss for use by all other programs in the distribution
+    (Packages: libnspr-dev, libnss-dev, libnspr4, libnss3.  Fairly main
+    changes to parts of the build system.)  This is so that mozilla
+    can be in Ubuntu universe.
+  * Disable xprint.  (xprint is not used in Ubuntu.)
+  * Slightly different arrangements do with with transitional arrangements
+    related to package renaming from mozilla-firefox-*.
+  * Removed transitional packages mozilla-firefox-dom-inspector and
+    mozilla-firefox-gnome-support (not needed in Ubuntu).
+  * Build firefox-dev; applications which embed a browser in Ubuntu
+    generally embed Firefox rather than mozilla.  This also means that we
+    build firefox with dynamic linking so that embedders and load ff.
+  * Debian package search replaced by Ubuntu package search (and defaults
+    to searching only in dapper, not all releases).
+  * Changes to various icons (and their installation paths).
+  * Strip CUPS/ from the front of displayed printer names, since
+    all printing in Ubuntu is done via CUPS.
+
+  Other differences remaining between Ubuntu and Debian:
+  * debian/rules clean removes various junk left over by the mozilla build
+    system.  (Debian #350616.)
+  * Exclude libssl3.so from dpkg_shlibdeps as this triggers a bug in
+    fakeroot on amd64 in Ubuntu.
+  * Set FIREFOX_DSP=none by default.  Will sometimes break sound from eg
+    Flash.  See https://launchpad.net/malone/bugs/29760 for rationale.
+    (Debian maintainers notified but no bug filed.)
+  * Append our plugin path to any previous value of MOZ_PLUGIN_PATH.
+    (Malone 29412.  Debian #351806)
+  * firefox.desktop file has more translations and consistently calls the
+    application `Firefox Web Browser' (for better UI in the menus - this
+    change is also in firefox.menu).  Debian #351807.
+  * Default printing command doesn't break if printer name contains
+    spaces (actually a preference, in all.js).  (Debian #351809,
+    Mozilla Bugzilla #326245). 
+  * security/coreconf/rules.mk adjusted with awful seddery to cope with
+    GNU make change to POSIXly interpretation of backslash line-joining.
+    See http://lists.debian.org/debian-devel/2005/12/msg00988.html.
+    Mozilla Bugzilla #325148.
+  * security/coreconf/ruleset.mk has a set -e added.
+  * Use GNOME mime database instead of mailcap.  Patch imported from Red
+    Hat; see debian/gnome-mime-handling.diff.
+  * Change various preferences:
+    - Ubuntu-specific default homepage
+    - Ubuntu-specific release notes
+    - default homepage can be locale-specific
+    - middlebutton paste disabled
+    - do not load a special home page on first start after an upgrade
+    - disable File / Import (wizard is nonfunctional).
+      Malone #28563, Debian #350599, Mozilla Bugzilla 117844.
+    - save files to Desktop by default
+    - README.Ubuntu file (still rather full of junk)
+    - Prevent websites disabling the right-button context menu.
+    - Default font for display is sans, but:
+    - Default CSS for printing uses a serif font.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  7 Feb 2006 17:14:17 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1) unstable; urgency=low
+
+  * The "those Ubuntu guys are great after all" release.
+  * New upstream release. (Closes: #351442)
+  
+  [ Mike Hommey ]
+  * debian/presubj: Added indications to try to reproduce without extensions
+    before actually filing a bug, and a hint to the safe mode.
+  * debian/firefox.install: added the reporter chrome files. (Closes: #344888)
+  * widget/src/gtk2/nsWindow.cpp: Revert additional stale patch for
+    extended mouse buttons support.
+  * debian/firefox.postinst, debian/firefox.prerm: unbashified.
+    (Closes: #349946)
+  * debian/control, debian/firefox-gnome-support.postinst,
+    debian/firefox-gnome-support.prerm: Let the firefox-gnome-support
+    package provide gnome-www-browser and handle a gnome-www-browser
+    alternative. Thanks Loïc Minier. (Closes: #350788)
+  * debian/firefox-runner: Enable Pango support by default. The
+    MOZ_ENABLE_PANGO environment variable is now useless. (Closes: #338716)
+  * debian/README.Debian: Change the paragraph about Pango to hint about
+    the MOZ_DISABLE_PANGO variable. 
+
+  [ Eric Dorland ]
+  * content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h: Apply
+    patch from Ian Jackson to revert a stale patch for multiple mouse
+    button support that was fixed in a different way in 1.5
+    (Closes: #348375)
+  * debian/firefox.preinst: Check md5sum's of old conffiles before cp'ing
+    them on upgrade. This won't stop all unnecessary conffile prompting in
+    all situations (especially from really old versions), but should
+    definitely should work for upgrading from testing or stable. (Closes:
+    #345112)
+  * debian/firefox.install:
+    - Remove run-mozilla.sh. (Closes: #348902)
+    - Reorganize things a bit.
+    - Move profile into /etc/firefox here, instead of in the rules file.
+  * debian/firefox.install, debian/firefox.preinst, debian/firefox.links,
+    debian/firefox.dirs, debian/rules: Move chrome, defaults, greprefs
+    into /usr/share/firefox for more FHS goodnesss.
+  * debian/firefox.1: Document -new-tab and -new-window options, and
+    remove deprecated -remote option. (Closes: #348699)
+  * debian/firefox-runner: Apply patch to properly URL escape local
+    files. Thanks Morita Sho. (Closes: #348451)
+  * browser/app/profile/firefox.js:
+    - Reallow 40-bit ciphers, since now firefox warns people who 
+      use them. (Closes: #349624)
+    - Enable bidi UI elements for our bi-directional friends. 
+      (Closes: #348069)
+  * debian/rules: Remove glob pattern from dh_install invocation. Thanks
+    Ian Jackson. (Closes: #350571)
+  * browser/base/content/aboutDialog.xul: Fix spurious scrollbar in the
+    about dialog box. Thanks Ian Jackson. (Closes: #350608)
+  * js/src/fdlibm/fdlibm.h: Patch to fix little endianess of
+    mipsel. Thanks Ian Jackson and Thiemo Seufer. (Closes: #350621)
+  * browser/base/content/search.xml: Patch from Ian Jackson to remove
+    misleading Clear option from search box context menu. (Closes: #350611)
+  * debian/watch: Fix regex to actually find the upstream tarballs.
+  * modules/libpref/src/init/all.js: Cope better with printers with spaces
+    in the name. Thanks Ian Jackson.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Take patch
+    from bz#235336 as suggested by Ian Jackson to allow password manager
+    to work with sites that only have a password field, no username.
+
+ -- Eric Dorland <eric@debian.org>  Mon,  6 Feb 2006 23:10:29 -0500
+
+firefox (1.5.dfsg-4) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * debian/control, debian/rules: 
+    - Remove Kerberos options, it is now loaded dynamically.
+    - Use /usr/share/firefox now for finding default.xpm.
+  * debian/firefox.install, debian/firefox.links, debian/firefox.preinst:
+    Start moving some clearly non-arch specific things
+    (/usr/lib/firefox/searchplugins, /usr/lib/firefox/icons,
+    /usr/lib/firefox/res) out of /usr/lib/firefox and into
+    /usr/share/firefox to make things more FHS friendly. Can't believe no
+    one ever called me on this before.
+  * toolkit/components/remote/nsGTKRemoteService.cpp,
+    widget/src/xremoteclient/XRemoteClient.cpp: Apply patch from bz#312154
+    to fix remote interface on PPC (and probably other arches). (Closes:
+    #343913)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp: Patch from
+    Zack Weinberg to fix FTBFS on m68k. (Closes: #343687)
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp: Patch from Antti
+    P Miettinen to fix small optimization problem with newer gcc's
+    (Closes: #344846)
+
+  [ Mike Hommey ]
+  * debian/firefox-runner: Cleaned up now useless variables.
+
+ -- Eric Dorland <eric@debian.org>  Tue, 10 Jan 2006 10:11:34 -0500
+
+firefox (1.5.dfsg-3) unstable; urgency=low
+
+  * debian/control: 
+    - Need explicit build dependency on gtk >= 2.8.
+    - Upgrade Standards-Version to 3.6.2.1. No changes.
+    - Add compatibility packages for mozilla-firefox-dom-inspector
+      and mozilla-firefox-gnome-support and make all the upgrade packages 
+      Architecture: all. (Closes: #343879, #344379)
+  * debian/watch: Add watch file.
+  * debian/about.png.uu: Add uuencoded version of previous about box
+    graphic.
+  * debian/rules: uudecode and install the about.png into the right
+    location.
+  * debian/firefox-runner: Add MOZ_PLUGIN_PATH to include plugins at the
+    old location for now. (Closes: #344085, #341682)
+  * widget/src/gtk2/nsWindow.cpp: Patch from bz#305970 to fix broken
+    contextual menu on Save File As. (Closes: #344430)
+
+  * config/mkdepend/imakemdep.h, security/nss/lib/pki1/pki1.h: Remove some
+    patches that are now useless (suggested by Mike Hommey).
+  * mailnews/extensions/palmsync/palm.html,
+    browser/themes/pinstripe/browser/browser.css,
+    gfx/src/mac/nsNativeThemeMac.h,
+    directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt,
+    layout/html/tests/table/bugs/bug123862.html,
+    layout/html/tests/table/bugs/bug119786.html,
+    layout/html/tests/table/bugs/bug101759.html,
+    layout/html/tests/table/bugs/bug14489.html,
+    layout/html/tests/table/bugs/bug222846.html,
+    layout/html/tests/block/bugs/155333-1.html,
+    layout/html/tests/block/bugs/185411-2.html,
+    layout/html/tests/block/bugs/13599.html,
+    layout/html/tests/block/bugs/53960.html,
+    layout/html/tests/block/bugs/155333-2.html,
+    layout/html/tests/block/bugs/38157-a.html,
+    layout/html/tests/block/bugs/38157-b.html,
+    layout/html/tests/block/bugs/46918.html,
+    layout/html/tests/block/printing/145305-11.html,
+    layout/html/tests/block/printing/145305-21.html,
+    layout/html/tests/block/printing/145305-13.html,
+    layout/html/tests/block/printing/145305-17.html,
+    layout/html/tests/block/printing/145305-19.html,
+    layout/html/tests/block/printing/145305-4.html,
+    layout/html/tests/block/printing/127145-1.html,
+    layout/html/tests/block/printing/145305-3.html,
+    layout/html/tests/block/printing/145305-7.html,
+    layout/html/tests/block/printing/145305-9.html,
+    layout/html/tests/frameset/core/r3.html,
+    layout/html/tests/frameset/core/r4.html,
+    layout/html/tests/frameset/core/blank2.html,
+    xpinstall/packager/stage_mfcembed.pl, xpinstall/packager/stage_gre.pl,
+    embedding/qa/testembed/Tests.cpp,
+    embedding/qa/testembed/nsihttpchanneltests.cpp,
+    embedding/qa/testembed/BrowserImpl.cpp,
+    embedding/qa/testembed/Tests.h, embedding/qa/testembed/QaUtils.cpp,
+    embedding/qa/testembed/resource.h,
+    embedding/qa/testembed/DomWindow.cpp,
+    embedding/qa/testembed/QaUtils.h, build/unix/abs2rel.pl,
+    xpfe/bootstrap/icons/windows/readme.txt,
+    security/nss/cmd/ssltap/ssltap-manual.html: Fix mess my subversion
+    repository made of line endings. This should reduce the size of the
+    diff.gz dramatically.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 24 Dec 2005 03:23:02 -0500
+
+firefox (1.5.dfsg-2) unstable; urgency=low
+
+  * browser/locales/en-US/chrome/branding/brand.dtd,
+    browser/locales/en-US/chrome/branding/brand.properties: Change brand
+    name from Deer Park to Firefox. About box graphic still needs to be
+    fixed. *grumble* *grumble* (Closes: #343704)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 17 Dec 2005 13:45:14 -0500
+
+firefox (1.5.dfsg-1) unstable; urgency=low
+
+  * New upstream release. No actual code changes from RC3. Took the
+    opportunity to completely empty the /other-licenses directory of the
+    upstream tarball.
+  * configure, configure.in: Change MOZ_APP_DISPLAYNAME to Firefox, so we
+    can be called Firefox without using
+    --enable-official-branding. *grumble*
+  * config/autoconf.mk.in, gfx/src/gtk/mozilla-decoder.cpp, configure.in:
+    Apply patch from bz#305185 to fix problems building against gtk+ 2.8.
+  * debian/control: 
+    - Build-Depend on libfreetype6-dev since we do link
+      against it directly.
+    - Add mozilla-firefox package for easy transition. 
+    - Conflict against older mozilla-firefox packages.
+  * debian/firefox-runner: 
+    - Fix typo. (Closes: #341113)
+    - Check /usr/lib/mozilla-firefox/plugins for plugins too for the 
+      time being. (Closes: #341682)
+  * debian/firefox-dom-inspector.preinst: Remove, not needed since the
+    name change.
+  * debian/firefox.preinst: 
+    - Remove old upgrade code.
+    - Move old mozilla-firefox configs into place on install.
+  * debian/mozilla-firefox.preinst: Move upgrade code in here. Remove
+    mozilla-firefox alternative.
+  * debian/mozilla-firefox.postrm: Remove /etc/mozilla-firefox on purge.
+  
+  * Some patches missed when merging from Mike Hommey:
+  * browser/locales/en-US/searchplugins/answers.src: Change updateDays to
+    0.
+  * config/mkdepend/imakemdep.h: Define for amd64.
+  * configure, configure.in: Visibility patch for recent gcc's. (Closes:
+    #341766)
+  * modules/libpref/src/nsPrefService.cpp: Patch to load preferences from
+    defaults/syspref.
+  * content/events/src/nsEventStateManager.cpp: Extended mouse events
+    patch.
+  * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+    gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.h,
+    gfx/src/x11shared/nsFontFreeType.cpp,
+    gfx/src/x11shared/nsFontFreeType.h,
+    layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch to
+    use new freetype API.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 16 Dec 2005 11:37:23 -0500
+
+firefox (1.4.99+1.5rc3.dfsg-2) unstable; urgency=low
+
+  * The "Grand Renaming" release. Thanks to Mike Hommey for sherperding
+    the 1.5 series through experimental. Now it's my turn to muck it up. A
+    transition packages will be in the next release.
+  * debian/mozilla-firefox*: Rename to firefox*.
+  * debian/firefox.install, debian/firefox-dom-inspector.install,
+    debian/firefox-gnome-support.install, debian/firefox-runner,
+    firefox-xremote-client, firefox.1, firefox.desktop, firefox.dirs,
+    debian/firefox.js, debian/firefox.links, debian/firefox.manpages,
+    debian/firefox.menu, debian/firefox.mime, debian/firefox.postinst,
+    debian/firefox.prerm, debian/firefox.png.uu, debian/README.Debian,
+    debian/control, debian/rules: Search/Replace mozilla-firefox ->
+    firefox where appropriate.
+  * debian/firefox.links: Link old icon name to new.
+  * debian/README.Debian: Fix path to .mozilla/firefox/rc. (Closes:
+    #335433)
+  * config/autoconf.mk.in: Set mozappdir to /usr/lib/firefox.
+  
+ -- Eric Dorland <eric@debian.org>  Sun, 27 Nov 2005 20:03:02 -0500
+
+mozilla-firefox (1.4.99+1.5rc3.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 3.
+  * debian/mozilla-firefox-runner: Removed the ping stuff, it's now done by
+    firefox itself.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 18 Nov 2005 07:24:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc2.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 2.
+  * xpcom/typelib/xpidl/xpidl.c: Fix crash when no file is given on the
+    command line (Closes: #323639). Also fix the error message about extra
+    arguments given showing before the crash.
+  * configure.in, configure: Work around dash's bug #337294 so that we can
+    build fine when sh is dash (Closes: #211010, #256384).
+  * debian/mozilla-firefox-runner:
+    - Removed the code to detect the JVM and set LD_ASSUME_KERNEL=2.2.5 for
+      b0rked 1.3 JVMs: it's been a long time they've not been ABI compatible.
+    - Removed setting of MOZILLA_FIVE_HOME. We already have a default one
+      built-in.
+    - Removed /usr/lib/mozilla/plugins from EXTENT_LD_LIB_PATH, since we never
+      get the plugins from there.
+    - Removed cleanup of the profile. It is correctly done by firefox, now.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 11 Nov 2005 08:07:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc1.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 1.
+  * debian/mozilla-firefox.install: Don't install
+    /usr/lib/mozilla-firefox/extensions/reporter@mozilla.org, it got moved in
+    the chrome.
+
+ -- Mike Hommey <glandium@debian.org>  Tue,  1 Nov 2005 22:01:15 +0100
+
+mozilla-firefox (1.4.99+1.5beta2.dfsg-1) experimental; urgency=low
+
+  * build/unix/run-mozilla.sh, netwerk/base/src/nsStandardURL.cpp:
+    Reverted debian changes: they got applied upstream.
+  * configure: Applied configure.in changes by hand.
+  * debian/rules: Disabled both the installer and the updater, we don't need
+    them.
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  7 Oct 2005 15:06:05 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-5) experimental; urgency=low
+
+  * debian/control: Bumped Standards-Version to 3.6.2.
+  * nsprpub/configure.in: Reverted changed.
+  * configure.in: Use -fvisibility=hidden in all cases. There is another bug
+    in gcc that makes it generate position dependent code when using the
+    system wrappers.
+  * configure, nsprpub/configure: Applied configure.in changes with
+    autoconf2.13.
+  * debian/rules: Put back the /usr/share/pixmaps/mozilla-firefox.xpm file.
+
+ -- Mike Hommey <glandium@debian.org>  Mon,  3 Oct 2005 18:46:50 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-4) experimental; urgency=low
+
+  * xpcom/typelib/xpt/src/Makefile.in: Reverted changes.
+  * configure.in, nsprpub/configure.in: Added a detection of the gcc bug about
+    visibility for builtins, and use -fvisibility=hidden instead of the system
+    wrappers in case the bug is found.
+  * configure, nsprpub/configure: Applied configure.in changes with
+    autoconf2.13. (Really closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 27 Sep 2005 20:16:34 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-3) experimental; urgency=low
+
+  * Sync with unstable branch.
+  * xpcom/typelib/xpt/src/Makefile.in: disable visibility stuff for ppc, as a
+    workaround for FTBFS. (Closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org>  Mon, 26 Sep 2005 18:35:11 +0200
+
+mozilla-firefox (1.0.7-1) unstable; urgency=high
+
+  * New upstream release. Contains fixes for various security issues.
+  * debian/mozilla-firefox-runner: Remove /usr/lib from
+    LD_LIBRARY_PATH. (Closes: #321789)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 22 Sep 2005 01:23:10 -0400
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-2) experimental; urgency=low
+
+  * debian/rules: enabled support for canvas.
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 20 Sep 2005 07:56:01 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-1) experimental; urgency=low
+
+  * Cleaned-up source tarball from trademarked content and CVS directories.
+  * debian/mozilla-firefox-small.xpm, debian/mozilla-firefox.xpm: Removed.
+  * debian/mozilla-firefox.dirs, debian/rules:
+    + Create /usr/lib/mozilla-firefox/chrome/icons/default and move
+      default.xpm in it. (Closes: #327828)
+    + Stop using our own xpm icons, upstream provide them, now.
+  * debian/rules: changed the build system a bit.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Somewhat these
+    files disappeared. Put them back. (Closes: #328074)
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 13 Sep 2005 18:25:48 +0200
+
+mozilla-firefox (1.4.99+1.5beta1-2) experimental; urgency=critical
+
+  * Sync with unstable branch.
+  * netwerk/base/src/nsStandardURL.cpp: Apply the patch for the 1.8 branch
+    from bz#307259 to fix CAN-2005-2871. (Closes: #327452)
+  * debian/mozilla-firefox-gnome-support.install, debian/rules: Move out
+    imgicon module in mozilla-firefox-gnome-support. (Closes: #327451)
+
+ -- Mike Hommey <glandium@debian.org>  Sun, 11 Sep 2005 10:45:34 +0200
+
+mozilla-firefox (1.0.6-5) unstable; urgency=critical
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: Fix for previous
+    arm fix. Thanks Steve. (Closes: #325535)
+  * netwerk/base/src/nsStandardURL.cpp: Patch from bz#307259 to fix
+    CAN-2005-2871, a buffer overflow vulnerability in IDN
+    processing. (Closes: #327452)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 10 Sep 2005 23:03:26 -0400
+
+mozilla-firefox (1.4.99+1.5beta1-1) experimental; urgency=low
+
+  * New upstream beta release.
+    + Find toolbar doesn't show up when in text fields. Closes: #280852.
+    + Better use of GTK2 themes. The most common case was highlighted menu
+      item text appearing in white on a white background. Closes: #223696,
+      #257430, #258181, #266334, #278559, #289326, #297320, #310098.
+    + Download manager correctly closes. Closes: #259015, #269975.
+    + Doesn't crash with the http://ln.hixie.ch/resources/style/orange
+      stylesheet. Closes: #277987.
+    + Locale extensions can properly be disabled. Closes: #279749 (to check).
+    + Doesn't crash on
+      http://einsteinmg.dyndns.org/cgi-bin/remangle.cgi?=0x27b9b660 anymore.
+      Closes: #294372.
+    + Downloads don't freeze when a modal window opens. Closes: #211332.
+    + Use GTK stock images. Closes: #281660.
+  * Sync with unstable branch changes.
+  * browser/app/profile/firefox.js, debian/firefox.js:
+    + Removed outdated extensions.update.autoUpdateEnabled and
+      extensions.update.autoUpdate;
+    + Removed general.useragent.locale.
+    + Allow extensions updates. It works correctly with system-wide installed
+      ones, now.
+  * netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+    nsprpub/pr/include/md/_linux.cfg, widget/src/gtk2/mozdrawingarea.c,
+    widget/src/gtk2/nsDragService.cpp: Reversed changes, since they got
+    applied upstream.
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: correctly set
+    __attribute__. Closes: #325535.
+  * debian/rules:
+    + set --enable-extensions=default instead of a full list.
+      We will get the default set of extensions provided by upstream, and
+      won't need to check if they changed.
+    + set --enable-pango.
+    + set --enable-system-cairo.
+  * debian/control: added build dependency on libgnomeui-dev and libcairo2-dev.
+  * debian/mozilla-firefox.install, debian/rules: don't install files in
+    /usr/lib/mozilla-firefox/chrome/icons/ anymore.
+  * debian/mozilla-firefox-runner: Force MOZ_DISABLE_PANGO to 1 if
+    MOZ_ENABLE_PANGO is not set.
+  * debian/README.Debian:
+    + Removed the note about IDN, it is now enabled by default, with correct
+      whitelist set.
+    + Added a note about MOZ_ENABLE_PANGO.
+    + Changed notes about application update, extensions, and packaged
+      extensions.
+  * modules/libpref/src/init/all.js:
+    + Set general.config.obscure_value to 0, we don't care about the config
+      file not to be "obscured".
+    + Set general.config.filename to firefox.cfg.
+  * debian/firefox.cfg: Create configuration to lock some properties.
+  * debian/mozilla-firefox.install: Install this firefox.cfg in
+    /usr/lib/mozilla-firefox
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  9 Sep 2005 17:40:40 +0200
+
+mozilla-firefox (1.0.6-4) unstable; urgency=low
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp: Patch
+    from Steve Langasek to fix unused vs. used gcc attribute on alpha and
+    arm. (Closes: #325535)
+  * browser/app/profile/firefox.js: Revert patch to remove the "I'm
+    feeling lucky" search. Some like it, some hate it, so upstream
+    behaviour wins. If you still feel strongly about it, make your case
+    upstream.
+  * gfx/src/gtk/nsFontMetricsXft.cpp: Apply patch from bz#252033 to work
+    around a bug in XRender that might be causing #319349. 
+
+ -- Eric Dorland <eric@debian.org>  Tue,  6 Sep 2005 02:10:07 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-2) experimental; urgency=low
+
+  * Sync with unstable branch changes, except the controversial "I'm feeling
+    lucky" change. I prefer waiting for the controversy to get to a
+    conclusion.
+  * debian/rules, debian/control: Remove build dependency on libmng-dev and
+    the --with-system-mng option to configure, the MNG support has been
+    removed upstream.
+  * debian/rules: Explicitely set the svg-renderer as cairo. It will use an
+    old cairo version bundled with firefox, but there's no other solution for
+    the moment. We have to wait for upstream 0.9.x and greater support
+    (hoped for 1.5).
+
+ -- Mike Hommey <glandium@debian.org>  Sun,  4 Sep 2005 09:01:54 +0200
+
+mozilla-firefox (1.0.6-3) unstable; urgency=low
+
+  * debian/rules, nsprpub/pr/include/md/_linux.cfg,
+    security/coreconf/Linux.mk: Apply patch from Andreas Jochens to allow
+    ppc64 builds. (Closes: #322617)
+  * debian/mozilla-firefox.prerm: Move -depth option to find to suppress
+    warnings. Thanks Mike Hommey.
+  * debian/presubj: Have bugzilla bug URL point to a page where you can
+    enter a bug.
+  * browser/app/profile/firefox.js: removed the "I'm feeling lucky" from
+    the keyword.URL, so now if you enter search terms in the address bar
+    you will be presented with search results and not taken to the first
+    result. Thanks Torok Edwin. (Closes: #321823)
+
+ -- Eric Dorland <eric@debian.org>  Mon, 22 Aug 2005 01:20:28 -0400
+
+mozilla-firefox (1.0.6-2) unstable; urgency=medium
+
+  * modules/libpr0n/src/imgLoader.cpp, modules/libpr0n/src/imgLoader.h:
+    Apply ported patch from Serge Belyshev from bz#293307 to fix problem
+    with gcc-4.0 on amd64. (Closes: #319336)
+  * debian/rules: Remove silly --enable-freetype configure line. Thanks
+    Antony Gelberg. (Closes: #319886)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 30 Jul 2005 02:11:03 -0400
+
+mozilla-firefox (1.0.6-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #318672)
+  * debian/rules: Remove hack to use gcc 3.4 on amd64, since now we're all
+    on gcc 4.0. (Closes: #318684)
+  * debian/control:
+    - Remove gcc 3.4 build depends on amd64
+    - Explicitly build depend on libxinerama-dev. 
+  * gfx/src/gtk/nsScreenGtk.cpp: Patch from Loic Minier to fix
+    gdk_property_get warnings.
+  * widget/src/gtk2/mozdrawingarea.c: Patch from Loic Minier to fix
+    crashes under GTK 2.7. (Closes: #318903)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 20 Jul 2005 02:57:44 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-1) experimental; urgency=low
+
+  * New upstream alpha release. Be aware that you WILL have troubles with
+    debian packages for firefox extensions.
+  * Reverted patches that got incorporated upstream.
+  * content/events/src/nsEventStateManager.cpp: Some changes to the previous
+    patch to fit changes in API.
+  * debian/update-mozilla-firefox-chrome,
+    debian/update-mozilla-firefox-chrome.8,
+    debian/mozilla-firefox-dom-inspector.post(inst|rm),
+    debian/mozilla-firefox-gnome-support.post(inst|rm),
+    debian/theme/*, debian/inspector/*: Removed.
+  * debian/mozilla-firefox.postinst: Removed call to
+    update-mozilla-firefox-chrome.
+  * debian/mozilla-firefox-dom-inspector.install: Only install files from
+    /usr/lib/mozilla-firefox/extensions/inspector@mozilla.org
+  * debian/mozilla-firefox.dirs: Don't create /var/lib/mozilla-firefox/*,
+    /usr/lib/mozilla-firefox/extensions nor /usr/lib/mozilla-firefox/plugins.
+  * debian/mozilla-firefox.install:
+    - Don't install regxpchrome, chrome/pipnss.jar and chrome/help.jar which
+      don't exist anymore.
+    - Install manifest files in addition to jar files in chrome.
+    - Install classic.jar in the normal chrome directory (awaiting EM
+      modifications so that it can actually go back in the extensions
+      directory).
+    - Don't install debian/theme/00classic and debian/theme/Uninstall,
+      which got removed.
+    - Get the theme in the correct directory (it's not in
+      defaults/profile/extensions anymore).
+    - Install the reporter extension.
+    - Selectively install subdirectories of /usr/lib/mozilla-firefox/defaults,
+      since some of them are useless.
+    - Install the unixprint plugin.
+  * debian/mozilla-firefox.manpages: Removed manual page for
+    update-mozilla-firefox-chrome.
+  * debian/mozilla-firefox.links: Removed all links in
+    /var/lib/mozilla-firefox/.
+  * debian/rules:
+    - Enable freetype in the build, we'll see if deerpark is any better than
+      1.0.x.
+    - Commented out OPTFLAGS set for some architectures. We will see if gcc
+      4.0 is doing any better.
+    - Enabled SVG support. (Closes: #215990)
+    - Enabled some more extensions to fit extensions provided by upstream.
+    - Added needed --enable-application=browser to the ./configure call.
+    - Don't install update-mozilla-firefox-chrome.
+    - Don't create installed-chrome.txt.
+    - Don't remove installed-extensions.txt, it doesn't exist anyway.
+    - Don't move classic theme's install.rdf, it's already at the correct
+      place.
+    - Remove unneeded removals of preferences files which are not there
+      anymore.
+  * debian/mozilla-firefox.preinst: Clean-up old generated files (those in
+    /var/lib/mozilla-firefox and
+    /usr/lib/mozilla-firefox/extensions/*/uninstall/Uninstall. (Note that for
+    the latter, some packages do provide them, but they were overwritten by
+    update-mozilla-firefox-chrome. They have actually no use, and it is safe
+    to remove them. Extensions packages will eventually remove them anyway)
+  * debian/mozilla-firefox.prerm: Put -depth option of find before -type d.
+
+ -- Mike Hommey <glandium@debian.org>  Sat, 16 Jul 2005 10:18:40 +0200
+
+mozilla-firefox (1.0.5-1) unstable; urgency=high
+
+  * New upstream release, fixes security issues. (Closes: #318061)
+  * debian/rules: Disable freetype in the build for the time being. This
+    *might* break printing in some cases.
+  * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+    gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.cpp,
+    gfx/src/ps/nsFontMetricsPS.h, gfx/src/x11shared/nsFontFreeType.cpp,
+    gfx/src/x11shared/nsFontFreeType.h,
+    layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch
+    from bz#234035 to try to get building with the new freetype. (Closes:
+    #314243)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 16 Jul 2005 00:43:54 -0400
+
+mozilla-firefox (1.0.4-3) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add Czech translation from Jan
+    Outrata. (Closes: #311376)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+    xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Revert patch from
+    David Mosberger for 7+ args on ia64 that was added 1.0.3-2.
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+    xpcom/reflect/xptcall/public/genstubs.pl: Better patch from bz#291378
+    which has been accepted upstream for ia64 7+ args fix.
+  * xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Call genstubs.pl to
+    regenerate this file.
+  * dom/src/base/nsGlobalWindow.cpp,
+    embedding/components/windowwatcher/src/nsWindowWatcher.cpp: Fix
+    injection spoofing, patch from bz#296850. Fixes CAN-2004-0718. 
+
+ -- Eric Dorland <eric@debian.org>  Thu,  9 Jun 2005 23:54:41 -0400
+
+mozilla-firefox (1.0.4-2) unstable; urgency=critical
+
+  * debian/control: Build-depend on libxft-dev not libxft2-dev to appease
+    finicky sparc buildd.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 16 May 2005 21:17:57 -0400
+
+mozilla-firefox (1.0.4-1) unstable; urgency=critical
+
+  * New upstream release. Fixes CAN-2005-1477 and CAN-2005-1476. (Closes: #308620)
+  * debian/update-mozilla-firefox-chrome.8: Patch from A Costa to fix the
+    spelling of maintenace. (Closes: #305968)
+  * debian/mozilla-firefox.desktop: Patch from Steinar H. Gunderson to add
+    a Norwegian translation. (Closes: #305983)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 12 May 2005 22:59:47 -0400
+
+mozilla-firefox (1.0.3-2) unstable; urgency=high
+
+  * browser/app/profile/firefox.js: Disable SSLv2 and 40-bit ciphers by
+    default. 
+  * debian/mozilla-firefox.NEWS: Explain the SSL change.
+  * extensions/transformiix/source/base/Double.cpp: Patch from David
+    Mosberger-Tang (fixed up by me) to fix unaligned access on ia64 (and
+    perhaps other platforms). (Closes: #303518)
+  * xpcom/reflect/xptcall/public/xptcstubsdecl.inc,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp: Another patch
+    from David Mosberger-Tang to fix extension loading on ia64. (Closes:
+    #303515)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 21 Apr 2005 01:25:02 -0400
+
+mozilla-firefox (1.0.3-1) unstable; urgency=low
+
+  * New upstream release, fixes various security issues, so urgency high.
+  * js/src/fdlibm/fdlibm.h: Fix from David Mosberger to define ia64 as
+    little-endian arch (also added for mipsel). (Closes: #303438)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 17 Apr 2005 23:13:01 -0400
+
+mozilla-firefox (1.0.2-3) unstable; urgency=high
+
+  * gfx/src/freetype/nsFreeType.cpp,
+    netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+    security/nss/lib/pki1/oiddata.h, security/nss/lib/pki1/pki1.h,
+    widget/src/gtk2/nsDragService.cpp: Fixes for gcc-4.0,
+    bz#289238. (Closes: #301485)
+  * js/src/jsstr.c: Fix for JS memory access security bug, patch from
+    bz#288688. (Closes: #302775)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  6 Apr 2005 01:36:11 -0400
+
+mozilla-firefox (1.0.2-2) unstable; urgency=high
+
+  * Last upload should of been marked urgency=high because of the security
+    fixes.
+  * debian/mozilla-firefox.postinst: Fix ridiculous typos. (Closes:
+    #300685)
+  * debian/mozilla-firefox-runner: Use pgrep to detect esd and arts
+    instead. Thanks Craig Small for the advice. (Closes: #302086)
+
+ -- Eric Dorland <eric@debian.org>  Fri,  1 Apr 2005 01:18:18 -0500
+
+mozilla-firefox (1.0.2-1) unstable; urgency=low
+
+  * New upstream release. Fixes CAN-2005-0399, CAN-2005-0401,
+    CAN-2005-0402. (Closes: #301243)
+  * debian/control: Update suggest for xprint rename. (Closes: #300976)
+  * xpcom/reflect/xptcall/src/md/unix/{Makefile.in,
+    xptcinvoke_asm_parisc_linux.s, xptcstubs_asm_parisc_linux.s}: Apply
+    patch from Ivar (Contributed by Randolph Chung) to fix Firefox on
+    hppa. (Closes: #286038)
+
+ -- Eric Dorland <eric@debian.org>  Fri, 25 Mar 2005 02:30:10 -0500
+
+mozilla-firefox (1.0.1-3) unstable; urgency=low
+
+  * widget/src/gtk2/nsGtkKeyUtils.cpp: Patch from bz#108170 to fix broken
+    keymap for Germans. (Closes: #299781)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: avoid
+    crashing when extension's install.rdf is broken. (Closes: #298796)
+    (MH)
+  * debian/mozilla-firefox.prerm: Remove
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/Extensions.rdf on
+    uninstall. (Closes: #298636)
+  * debian/mozilla-firefox.postinst: Add little echo to tell people to
+    restart firefox after upgrades.
+  * debian/presubj: Add a note there about restarting firefox before
+    submitting bugs.
+  * debian/mozilla-firefox-runner: Properly quote $@ expansion. (Closes:
+    #300195)
+  * browser/locales/en-US/searchplugins/
+    {yahoo.src,google.src,eBay.src,dictionary.src,creativecommons.src,
+    amazondotcom.src}: Set updateCheckDays to 0, which avoids duplicated
+    search entries in the menu. (Closes: #299006, #299813)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 20 Mar 2005 17:08:12 -0500
+
+mozilla-firefox (1.0.1-2) unstable; urgency=high
+
+  * Changes by Mike Hommey:
+  * Urgency: high due to RC bug fix.
+  * debian/update-mozilla-firefox-chrome: Re-initialize Extensions.rdf
+    inside the script instead of relying on mozilla-firefox's default
+    behaviour, which just fails when defaults/profile/extensions/ \
+    Extensions.rdf doesn't exist (and it seems some people like to remove
+    files in /etc). (Closes: #294175)
+  
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.menu: Capitalize "browsers". Thanks Gerfried
+    Fuchs.
+  * debian/mozilla-firefox-runner: Fix from Marc Horowitz to fix sound
+    device detection. (Closes: #297088)
+  * toolkit/content/widgets/tabbrowser.xml: Apply patch from bz#283063, to
+    fix a memory leak when closing tabs. (Closes: #296749)
+  * xpfe/global/resources/content/bindings/browser.xml,
+    xpfe/global/resources/content/bindings/tabbrowser.xml,
+    toolkit/content/widgets/browser.xml,
+    toolkit/content/widgets/tabbrowser.xml: Apply patches from bz#131456
+    to fix various tab related memory leaks. (Closes: #280586)
+  * netwerk/protocol/http/src/nsHttpHandler.cpp: Patch from bz#265536 to
+    differentiate between AMD64 and i386. (Closes: #282592)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  5 Mar 2005 18:46:09 -0500
+
+mozilla-firefox (1.0.1-1) unstable; urgency=high
+
+  * New upstream release. (Closes: #296851)
+    - This release fixes the Secunia window injection bug, 
+      CAN-2004-1156. (Closes: #293664)
+  
+  * Changes by Mike Hommey: 
+  * debian/rules: Some clean-up.
+  * debian/control: Changed my maintainer address.
+  * debian/README.Debian: Add a note about automatic updates for
+    extensions. (Closes: #296761)
+
+  * Changes by Eric Dorland:
+  * browser/app/profile/firefox.js: Remove disable IDN pref, it's the
+    default now anyway.
+
+ -- Eric Dorland <eric@debian.org>  Tue,  1 Mar 2005 02:03:48 -0500
+
+mozilla-firefox (1.0+dfsg.1-6) unstable; urgency=high
+
+  * The "And I thought IE had security bugs!" release.
+  * toolkit/content/widgets/tabbrowser.xml,
+    xpfe/global/resources/content/bindings/tabbrowser.xml: Fix
+    "Firetabbing" vulnerability from bugzilla#280056, fixes
+    CAN-2005-0231. (Closes: #294415)
+  * modules/plugin/base/src/nsPluginHostImpl.cpp: Fix "Fireflashing"
+    vulnerability from bugzilla#280664, fixes CAN-2005-0232. (Also Closes:
+    #294415)
+  * build/unix/run-mozilla.sh: Patch from Javier Fernández-Sanguino Peña
+    to fix insecure temp file usage in run-mozilla.sh. (Closes: #294127)
+  * netwerk/base/src/nsStandardURL.cpp, netwerk/base/src/nsStandardURL.h:
+    Patch from bugzilla#261934 to make the network.enableIDN preference
+    work and again.
+  * browser/app/profile/firefox.js: Disable IDN by default. This doesn't
+    close #293975, but drops its severity. 
+  * debian/README.Debian: Add warning and describe how to enable IDN.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  9 Feb 2005 22:56:17 -0500
+
+mozilla-firefox (1.0+dfsg.1-5) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Don't translate "Mozilla Firefox" into
+    French.
+  * browser/app/profile/firefox.js: Set mozilla.widget.raise-on-setfocus
+    to false to prevent unecessary window raising. (Closes: #292049)
+  * debian/rules: Don't compile statically on mips and mipsel, since it's
+    broken for now.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  6 Feb 2005 15:02:36 -0500
+
+mozilla-firefox (1.0+dfsg.1-4) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add French translations from Jerome
+    Warnier. I will accept more, but closing this bug. (Closes: #292506)
+  * debian/README.Debian: Update the Emacs keybindings instructions.
+    (Closes: #291691)
+  * debian/mozilla-firefox.1: 
+    - Remove -splash from the manpage, it has never worked. (Closes: 
+      #287088)
+    - Add units to -height and -width description. (Closes: #285142)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  2 Feb 2005 01:42:53 -0500
+
+mozilla-firefox (1.0+dfsg.1-3) experimental; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add %u to the exec line so that apps
+    know it can handle URLs. (Closes: #290132)
+  * debian/README.Debian: 
+    - Improve button reversal instructions. Thanks Christian Mayrhuber
+    - Fix reference to ~/.firefox. 
+  * debian/rules: Enable static building. This will build firefox as one
+    large binary (mostly) and should speed a few things up, especially
+    program load time. I'd like to hear about any speedup (or slow down)
+    you exprience. Porters, please build this for your arch to make sure
+    this doesn't break anything.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 20 Jan 2005 01:40:34 -0500
+
+mozilla-firefox (1.0+dfsg.1-2) unstable; urgency=medium
+
+  * debian/mozilla-firefox-gnome-support.postrm,
+    debian/mozilla-firefox-dom-inspector.postrm: Don't die if
+    update-mozilla-firefox-chrome dies. (Closes: #287355)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  9 Jan 2005 23:51:10 -0500
+
+mozilla-firefox (1.0+dfsg.1-1) unstable; urgency=low
+
+  * Not a new upstream release.
+  * other-licenses/branding/firefox, other-licenses/7zstub/firefox: Remove
+    these from the .orig.tar.gz, since they are not DFSG-free. We're not
+    using the files anyway, so out they go. (Not sure the 7zstub stuff is
+    non-free, but it's Windows only so no harm)
+  * debian/rules: 
+    - Remove explicit low-optimization on alpha, since Falk
+      Hueffner claims it works.
+    - Move entire defaults/profile directory into /etc/mozilla-firefox, 
+      rather than just the bookmarks.html. (Closes: #285538)
+  * debian/mozilla-firefox.links: Link entire defaults/profile now.
+  * debian/mozilla-firefox.preinst: Add upgrade code to remove old
+    defaults/profile to make way for new symlink.
+  * debian/mozilla-firefox.dirs: Just create etc/mozilla-firefox.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 19 Dec 2004 01:31:44 -0500
+
+mozilla-firefox (1.0-5) unstable; urgency=medium
+
+  * Changes by Mike Hommey:
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Make the
+    extensions upgrade work again. (Closes: #282143)
+  * debian/rules: Better DEB_BUILD_OPTIONS handling, better debugging
+    build (DEB_BUILD_OPTIONS="nostrip debug")
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/content/extensions.js: Allow users to
+    disable globally installed extensions.
+
+  * Changes by Eric Dorland:
+  * debian/rules: Remove explicit low-optimization on sparc. Apparently
+    there was an issue for a number of arches that required lower
+    optimization settings, but it is now resolved. So porters, please
+    check -O2 on arm, alpha, powerpc and ia64 and let me know if it's
+    safe. Thanks David S. Miller. (Closes: #284533)
+
+ -- Eric Dorland <eric@debian.org>  Tue,  7 Dec 2004 01:06:48 -0500
+
+mozilla-firefox (1.0-4) unstable; urgency=medium
+
+  * debian/control: Make mozilla-firefox-gnome-support and xprt-xprintorg
+    Suggests, no Recommends after a look at policy. (Closes: #282432)
+  * debian/README.Debian: 
+    - Refer to .mozilla/firefox, not .firefox.
+    - Explain how to reenable emacs style keybindings. (Closes: #282321)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 27 Nov 2004 20:40:10 -0500
+
+mozilla-firefox (1.0-3) unstable; urgency=low
+
+  * Changes by Mike Hommey
+  * The "becoming more and more an iceweasel" release.
+  * debian/firefox.js:
+    + Enable firefox's internal locale autodetection.
+    + Disable default browser question at startup. (Closes: #280752)
+  * debian/mozilla-firefox-runner: Removed our locale autodetection.
+    That means now locales installed in user profiles are automatically
+    used, and that there is no need for /var/lib/mozilla-firefox/locales.d
+    anymore.
+  * debian/mozilla-firefox.dirs: Removed creation of
+    /var/lib/mozilla-firefox/locales.d.
+  * debian/rules: Removed creation of the locale file in
+    /var/lib/mozilla-firefox/locales.d.
+  * debian/presubj: Put some more recent information.
+  * htmlparser/src/nsParser.cpp: Applied patch from bz#57717 so that empty
+    html files don't get <html><body></body></html> when viewing source.
+  * browser/base/content/aboutDialog.css: increase the User Agent element
+    height as in bz#238137 (but up to MacOSX's height) to show the full User
+    Agent string.
+  * xpcom/io/nsAppDirectoryServiceDefs.h,
+    xpcom/io/nsAppFileLocationProvider.cpp,
+    xpfe/components/search/src/nsInternetSearchService.cpp: Applied patch from
+    bz#123315 so that Internet search services in user profiles are supported.
+    (Closes: #219053)
+  * debian/mozilla-firefox-runner:
+    + Remove compatibility.ini only if it is older than
+      /usr/lib/mozilla-firefox/components.ini. That way, we only rebuild it
+      after an update-mozilla-firefox-chrome.
+    + Detect if we're being run through sudo without the -H option, in which
+      case we force setting of $HOME. (Closes: #218156)
+  * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in:
+    + Removed some error messages that get there because firefox is trying to
+      write in the /usr/lib/mozilla-firefox directory as a user. They are
+      useless and lead users to think something is going wrong while it's the
+      (stupid but) normal way firefox works.
+    + Avoid creation of directories when attempting to read files, that
+      throwed uncaught exceptions breaking some stuff in several different
+      ways when extensions don't follow the new scheme for extensions.
+    + Avoid copying stuff from
+      /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+      /usr/lib/mozilla-firefox/extensions/, that's the *very* old way of
+      installing extensions, which, since the old scheme has been thrown away,
+      won't work anyway, if any extension provides files out there.
+    + CheckForMismatches: Avoid to disable already disabled global extensions,
+      and don't propose to upgrade the locked extensions. That fixes a
+      never-ending loop occuring when running firefox for the first time in a
+      user account, while some global extensions are expired.
+      (Closes: #278722, #281537)
+  * debian/mozilla-firefox.prerm, debian/mozilla-firefox.preinst: Moved
+    removal of links to /usr/lib/mozilla-firefox/defaults/profile/extensions/
+    sitting in /usr/lib/mozilla-firefox/extensions/, if any remaining, from
+    prerm to preinst. We remove them once and for all, they won't be created
+    by us anymore.
+  * debian/update-mozilla-firefox-chrome:
+    + Removed support for extensions in
+      /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+    + Removed some clean-up that had been introduced to help the Extensions
+      Manager not to die, and which, actually, did not work out quite so well.
+      Anyways, with the changes this time, the EM is supposed to support much
+      more problems than ever before (as usual ;) ) so we don't need that
+      anymore.
+    + Avoid stupid mv error messages when firefox-bin -register fails (which
+      is not supposed to happen, but you're never too careful)
+  * debian/update-mozilla-firefox-chrome, debian/mozilla-firefox.preinst:
+    Move removal of some very old stuff to preinst, to do it once and for all
+    instead of doing it every time we run update-mozilla-firefox-chrome.
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Applied patch from
+    bz#124561 to get a prompt for username/password in case anonymous login
+    fails.
+  * debian/mozilla-firefox-runner:
+    + Added check for more arguments so that the url in the command line get
+      detected more accurately.
+    + When a file name is given on the command line, prepend "file://" and
+      change spaces into %20. (Closes: #281800)
+
+  * Changes by Eric Dorland
+  * debian/mozilla-firefox.prerm: Patch from Philipp Weis to fix order of
+    find arguments. (Closes: #280852)
+  * debian/mozilla-firefox.desktop: Support new mime type handler in Gnome
+    2.8. (Closes: #281274) (MH: I added some more myme-types)
+  * debian/mozilla-firefox.postinst: Run update-desktop-database if it
+    exists.
+  * widget/src/gtk/nsWidget.cpp: We don't use gtk anymore, might as well
+    revert these patches. Thanks Stephane Despret. 
+
+ -- Eric Dorland <eric@debian.org>  Thu, 18 Nov 2004 22:16:28 -0500
+
+mozilla-firefox (1.0-2) unstable; urgency=low
+
+  * Changes by Mike Hommey
+  * The "don't do too much on the same day, it's bad for health" release.
+  * debian/firefox.js: Re-activated the extensions update service, and
+    removed the update url.
+  * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+  * debian/mozilla-firefox-dom-inspector.preinst: Removed old inspector.js
+    file.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/content/extensions.js: Disabled possibility
+    to update locked extensions and themes. Locked extensions being the
+    ones installed by the packaging system, they should be updated through
+    that.
+  * toolkit/mozapps/update/src/nsUpdateService.js.in: Disabled application
+    update functionnality. Firefox should be updated through the packaging
+    system.
+  * browser/components/prefwindow/content/pref-advanced.xul: Removed the
+    preferences panel item to activate application update, since it is
+    totally disabled.
+  * debian/mozilla-firefox-runner: Remove compatibility.ini instead of
+    compreg.dat. (Eric: This will cause a rebuild of the compreg.dat)
+  
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.NEWS: Fix typos.
+  * README.Debian: 
+    - Add note about application update being completely disabled.
+    - Fix path to XUL.mfsal
+
+ -- Eric Dorland <eric@debian.org>  Wed, 10 Nov 2004 22:56:22 -0500
+
+mozilla-firefox (1.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #280449)
+  
+  * Changes by Mike Hommey:
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch
+    #164795 from bz#266835 + some tweaks as previously. This might lead to
+    encoding problems with the password, but it is supposed to be ASCII
+    anyway.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Reworked the
+    previous patches so that the Extensions Manager shows extensions that
+    have been disabled due to version mismatch, and added a workaround so
+    that components registration works correctly.
+  * debian/update-mozilla-firefox-chrome: Removed part that is useless due
+    to last changes in the Extensions Manager.
+  * Make the inspector a real extension again:
+    - debian/inspector/00dom-inspector: File for
+      /var/lib/mozilla-firefox/extensions.d.
+    - debian/inspector/Uninstall: Uninstall file needed in extension 
+      directory.
+    - debian/inspector/install.rdf: install.rdf taken from older versions, 
+      and adapted to newer versions, adding registered chrome.
+    - debian/mozilla-firefox-dom-inspector.dirs: Removed. Everything will 
+      be created by dh_install.
+    - debian/mozilla-firefox-dom-inspector.install: install
+      debian/inspector.rdf and most inspector files in the right place in
+      /usr/lib/mozilla-firefox/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}
+      and /var/lib/mozilla-firefox
+  * Make the classic theme a real extension, even though it's still in 
+    the main package:
+    - debian/theme/00classic: File for 
+      /var/lib/mozilla-firefox/extensions.d.
+    - debian/theme/Uninstall: Uninstall file needed in extension 
+      directory.
+    - debian/mozilla-firefox.install: Install all files in the right 
+      place in
+      /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+    - debian/mozilla-firefox.dirs: Removed creation of
+      /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome, 
+      it will be done by dh_install.
+    - browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+      Added chrome to be registered.
+  * Removed support for /var/lib/mozilla-firefox/chrome.d:
+    - debian/mozilla-firefox.dirs: Removed creation of the directory.
+    - debian/rules: Removed creation of files there, and put the
+      installed-chrome.txt, excluding inspector and classic theme stuff,
+      directly in /usr/lib/mozilla-firefox/chrome.
+    - debian/update-mozilla-firefox-chrome: Removed all
+      /var/lib/mozilla-firefox/chrome.d related stuff.
+    - debian/mozilla-firefox.links: Removed installed-chrome.txt link.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: disable
+      extensions that fail to install chrome.
+  * debian/mozilla-firefox-runner: Remove user profile compreg.dat at
+    launch time.
+  * Moved some files in /var/lib/mozilla-firefox:
+    - debian/mozilla-firefox.links: Add a symlink for Extensions.rdf 
+      and components.ini, from /usr to /var.
+    - debian/mozilla-firefox.prerm: Don't remove files we don't 
+      provide and remove files at their new locations.
+    - debian/mozilla-firefox.preinst: Remove
+      /var/lib/mozilla-firefox/installed-chrome.txt.
+    - debian/update-mozilla-firefox-chrome: Create links for 
+      Extensions.rdf and components.ini after register call, and remove 
+      components.ini before.
+  * Clean-up in files generated by update-mozilla-firefox-chrome:
+    - debian/mozilla-firefox.links: Put all the links generated by
+      update-mozilla-firefox-chrome into the package.
+    - debian/mozilla-firefox.prerm: Remove all /var files generated 
+      in the remove target, and changed the way we clean-up 
+      /var/lib/mozilla-firefox.
+  * debian/mozilla-firefox.install: Removed chromelist.txt.
+  * Add support for extensions preferences:
+    - debian/update-mozilla-firefox-chrome: Handle
+      /usr/lib/mozilla-firefox/defaults.ini file.
+    - debian/mozilla-firefox.links: Add a symlink to /var for 
+      defaults.ini.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added 
+      defaults registration in -register command.
+    - mozilla-firefox-dom-inspector.install: Move inspector.js into 
+      the appropriate extension specific directory.
+  * Move preferences back into /usr:
+    - debian/rules: Don't move the prefs into 
+      /etc/mozilla-firefox/pref, and put the vendor thing into /usr 
+      as well, and remove firefox-l10.js file.
+    - debian/mozilla-firefox.preinst: remove old prefs in /etc and 
+      old symlink /usr/lib/mozilla-firefox/defaults/pref.
+    - debian/firefox.js: new Debian default preferences file.
+    - debian/mozilla-firefox.install: install firefox.js in
+      /etc/mozilla-firefox/pref.
+    - debian/mozilla-firefox.links: rename
+      /usr/lib/mozilla-firefox/defaults/pref symlink to
+      /usr/lib/mozilla-firefox/defaults/syspref.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added 
+      a hook so that defaults/syspref gets registered in defaults.ini 
+      after all other extensions preferences.
+  * debian/mozilla-firefox.preinst: only clean-up stuff if we are
+    upgrading from a version known to still have the files. Added some
+    more clean-up.
+  * debian/mozilla-firefox.install: Removed useless init.d.
+  * modules/libpref/src/init/all.js: Fixed all chrome URLs which refered to
+    mozilla stuff.
+  * debian/update-mozilla-firefox-chrome: Remove some more files before running
+    firefox-bin -register.
+
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.NEWS: Add warning about broken extension and
+    locale packages with this release. 
+  * debian/mozilla-firefox-runner: Comment out warning about xprint,
+    xprint isn't necessarily needed for printing since postscript was
+    reenabled. (Closes: #279858)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 10 Nov 2004 00:33:44 -0500
+
+mozilla-firefox (0.99+1.0RC1-4) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner:
+    - Fixed to run properly with dash. (Closes: #279549).
+    - Fixed indentation.
+    - Added a basic debugger support.
+  * debian/mozilla-firefox.1: Added information about debugger options.
+  * debian/rules: Added a debug option to DEB_BUILD_OPTIONS. If you want to
+    build a fully gdb'able package, use DEB_BUILD_OPTIONS="noopt nostrip
+    debug"
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch from
+    bz#266835.
+    - Further change this patch to use Append rather than AppendLiteral,
+      which doesn't seem to exist. (ED)
+
+ -- Mike Hommey <mh@glandium.org>  Thu,  4 Nov 2004 22:01:51 +0900
+
+mozilla-firefox (0.99+1.0RC1-3) unstable; urgency=low
+
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply patch from
+    bz#266835 to fix anonymous user password issue. (Closes: #226784)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: (MH)
+    - Fully apply previous patches, which for some reason left a spurious code
+      line which made the extensions manager not like expired extensions
+      anymore. (Closes: #279140)
+    - Enhanced extensions manager so that the behaviour described in
+      https://bugzilla.mozilla.org/show_bug.cgi?id=247846#c14 *actually*
+      works. Extensions packagers are invited to move their chrome files
+      accordingly, and remove /var/lib/mozilla-firefox/chrome.d files so that
+      extensions chrome don't get registered when they are forced-disable due
+      to version mismatch or some other reason.
+  * debian/mozilla-firefox-runner: 
+    - Fix some thinkos. (MH)
+    - Fix for loading files from the command line. (Closes: #279018) (MH)
+    - Removed setting --display from $DISPLAY, let it get it from the 
+      environment, but pass --display if it is set. (Mike, 
+      I'm worried this will screw up some session 
+      managers, let me know what you think, we can revert it)
+    - Removed FIREFOX_OPEN_IN stuff, so that firefox now obeys to "open 
+      links from other applications in" setting. (Closes: #279073) (MH)
+    - Enhanced command line parsing, and drop empty arguments. 
+      (Closes: #279138) (MH)
+    - No need for a find to look for XUL.mfasl, we already have its 
+      location from the path list taken from profiles.ini. (MH)
+    - Better detection of dsp wrapper, when FIREFOX_DSP=auto. 
+      (Closes: #254611) (MH)
+    - Correctly open local files even when firefox was not previously 
+      running. (Closes: #279018) (MH)
+  * debian/mozilla-firefox.1: (MH)
+    - Removed references to FIREFOX_OPEN_IN.
+    - Added the -safe-mode option.
+  * debian/mozilla-firefoxrc: Removed FIREFOX_OPEN_IN. (MH)
+  
+ -- Eric Dorland <eric@debian.org>  Tue,  2 Nov 2004 00:46:28 -0500
+
+mozilla-firefox (0.99+1.0RC1-2) unstable; urgency=medium
+
+  * browser/app/profile/firefox.js: Disable browser update checking by
+    default.
+  * debian/mozilla-firefox-runner: Apply patch from Aurelien Jarno to fix
+    variable name typo. (Closes: #278844)
+
+ -- Eric Dorland <eric@debian.org>  Fri, 29 Oct 2004 23:50:59 -0400
+
+mozilla-firefox (0.99+1.0RC1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * layout/xul/base/src/nsImageBoxFrame.{cpp,h}: Remove some conflicts
+    from a previous patch.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 28 Oct 2004 23:33:46 -0400
+
+mozilla-firefox (0.10.1+1.0PR-5) unstable; urgency=low
+
+  * debian/rules: (MH)
+    - Use upstream extensions set. This will eventually get a
+      correct help menu and fix some yet undiscovered UI issues. 
+      (Closes: #257946)
+    - Added support for DEB_BUILD_OPTIONS=noopt.
+    - Changed OPTFLAGS assignment.
+    - Remove whitespace characters in version number for UserAgent
+      branding.
+    - Install mozilla-firefox-runner into /usr/lib/mozilla-firefox/firefox
+      (Closes: #278477)
+  * debian/mozilla-firefox.links: (MH)
+    - Link /usr/bin/firefox and /usr/bin/mozilla-firefox to 
+      /usr/lib/mozilla-firefox/firefox.
+    - Removed obsolete profile/US links.
+  * debian/mozilla-firefox.dirs: Create /etc/mozilla/profile instead of
+    /etc/mozilla/profile/US. (MH)
+  * toolkit/xre/nsAppRunner.cpp: Fix crash in nsCmdLineService::Initialize
+    when argc is changed by gtk (when treating gtk specific arguments)
+    (MH)
+  * debian/mozilla-firefox-runner (Changes by MH):
+    - Removed workaround for bug #122990. First, xmlterm is not an activated
+      extension, and secondly, if it still requires the TERM environment
+      variable, it is the user's duty to set it to whatever he wants, not
+      firefox's start script's.
+    - Removed the ulimit -c setting. First, it is set by default to 0 on a
+      newly installed debian, and secondly, it is user's choice to set it or
+      not if he needs to get core files.
+    - Removed unused shell variables.
+    - Removed unsetting AUDIODEV variable. If it still crashes, it does belong
+      to some other code than firefox. The AUDIODEV environment variable is
+      used nowhere in firefox code:
+      http://lxr.mozilla.org/aviarybranch/search?string=AUDIODEV
+      Note that there is a "A crash which occurred when AUDIODEV doesn't
+      contain "/" was fixed." log message in esound version 0.2.33 changes and
+      that the bug may have belonged there.
+    - Replaced ${HOME}/.mozilla-firefoxrc file by a ${HOME}/.mozilla/firefox/rc
+      file. The former is still supported, though, but will bring a warning
+      message. If both are present, only the latter is taken into account.
+    - Changed the way system and user FIREFOX_DSP and FIREFOX_OPEN_IN
+      variables are handled. First, use system values defined in
+      /etc/mozilla-firefox/mozilla-firefoxrc, then override with
+      ${HOME}/.mozilla/firefox/rc and then with runtime environment variables.
+    - Don't die when DISPLAY is not set. Display can be passed by --display
+      option, and if not set and needed (some options don't require it),
+      firefox will complain.
+    - Some shell code simplifications by using some coreutils.
+    - Added better command line parsing.
+    - Added verbosity mode.
+    - Removed setting of FONTCONFIG_PATH, /usr/lib/mozilla-firefox/res/Xft
+      doesn't exist
+    - Factorized localization detection.
+  * debian/mozilla-firefox.1 (MH):
+    - Made some clean-up between dashes and hyphens.
+    - Removed obsolete options and added new ones.
+    - Added informations about some debian specific stuff.
+  * debian/update-mozilla-firefox-chrome: Changed the way we move files to
+    /var/lib/mozilla-firefox. It will avoid creating files with a * in their
+    name whenever registration failed. (MH)
+  * debian/README.Debian: Update java instructions, tell them to just use
+    java-package.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 28 Oct 2004 21:30:40 -0400
+
+mozilla-firefox (0.10.1+1.0PR-4) unstable; urgency=medium
+
+  * This release mostly courtesy Mike Hommey. 
+  * layout/src/xul/base/src/nsImageBoxFrame.*: Backported patch from
+    bz#255372. (Closes: #278046)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Force locking
+    globally installed extensions, that will prevent extensions packages
+    files to be unexpectedly removed by firefox.
+  * debian/control: Add Mike Hommey as an Uploader.
+  * debian/mozilla-firefox.install: Removed content-packs.jar which is
+    mozilla-browser specific.
+  * debian/mozilla-firefox.dirs: 
+    - Remove leading /'s.  
+    - Create
+    /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+    /chrome directory so that preview is shown in the Themes Manager. Yes,
+    this is stupid, but it is the way firefox wants it (and it's not even
+    created by make install, nor in the official binary tarball. It is
+    only created at run time, but you know what ? under *nix, a normal
+    user can't create that directory) (Closes: #276404)
+  * debian/rules: Add a /etc/mozilla-firefox/pref/vendor.js file adding
+    the debian package version to the UserAgent. (Closes: #268654)
+  * debian/README.Debian: Update java instructions. I'd love some more
+    definitive pointers. (Closes: #277983)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 26 Oct 2004 00:11:48 -0400
+
+mozilla-firefox (0.10.1+1.0PR-3) experimental; urgency=low
+
+  * debian/control: 
+    - Rename the mozilla-firefox-gnome-vfs package
+      mozilla-firefox-gnome-support since it does more than vfs. No 
+      need for Replaces or anything, since it never actually made it to 
+      the archive.
+    - Remove strict build dependencies on g++ and binutils, since the 
+      fixed versions have hit sarge.
+    - Remove hppa build depends, since gcc has also been fixed there.
+    - Build-depend on libgnome2-dev and libgconf2-dev to build in more 
+      gnome support.
+    - Have mozilla-firefox recommend it's gnome support. 
+  * debian/rules: 
+    - Remove hppa CC redefinitions.
+    - Exclude *gnome* not just *gnomevfs*.
+    - dh_install for gnome-support.
+  * debian/mozilla-firefox-gnome-vfs.*: Rename to
+    mozilla-firefox-gnome-support.*.
+  * debian/mozilla-firefox-gnome-support.install: Grab *gnome*, not just
+    *gnomevfs*.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 21 Oct 2004 23:04:53 -0400
+
+mozilla-firefox (0.10.1+1.0PR-2) experimental; urgency=low
+
+  * debian/mozilla-firefox-runner: 
+    - Patch from Sam Morris to handle cleanup of directories with 
+      unusual names.
+    - Fix return value check, patch from rgselk. (Closes: #269690)
+  * debian/mozilla-firefox.1: List full path to firefox-bin. (Closes:
+    #275563)
+  * debian/rules: 
+    - --with-gssapi=/usr, enable Negotiate extension. (Closes:
+      #274258)
+    - Enable gnomevfs support, 
+  * debian/control: 
+    - Build-depend on libkrb5-dev.
+    - Build-depend on libgnomevfs2-dev.
+    - New gnomevfs package, based on work by Mike Hommey. (Closes: 
+      #262062)
+  * debian/mozilla-firefox-gnome-vfs.post{inst,rm}: Added, same as
+    corresponding files from mozilla-firefox-dom-inspector.
+  * debian/mozilla-firefox-gnome-vfs.install: Install gnomevfs components.
+  * browser/app/profile/firefox.js: Set
+    network.negotiate-auth.trusted-uris to https:// to enable the
+    negotiate extension over secure links.
+  * config/rules.mk: Tweak patch from Thiemo Seufer to include svg_doc in
+    non-optimization. (Closes: #273353)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 17 Oct 2004 21:25:08 -0400
+
+mozilla-firefox (0.10.1+1.0PR-1) experimental; urgency=critical
+
+  * New upstream release, fixes security issue bz#259708. (Closes:
+    #274493)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  3 Oct 2004 03:32:43 -0400
+
+mozilla-firefox (0.10+1.0PR-1) experimental; urgency=low
+
+  * New upstream release. (Closes: #273700, #267003)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    netwerk/dns/src/nsIDNService.cpp,
+    modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,
+    gfx/src/windows/nsImageWin.cpp, gfx/src/shared/gfxImageFrame.cpp,
+    browser/app/profile/firefox.js: Resolve conflicts between my tree and
+    upstream.
+  * browser/app/Makefile.in: Fix $(DESTDIR) variable.
+  * accessible/src/atk/nsAccessibleWrap.cpp,
+    accessible/src/atk/nsAccessibleWrap.h: Apply patch from bugzilla for
+    alpha fix that's more likely to make it into CVS.
+  * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to make
+    update-mozilla-firefox-chrome more verbose on -v.
+  * debian/rules:
+    - Remove typeaheadfind for new find toolbar to work. (Mike Hommey) 
+      (Closes: #267170)
+    - Changes to reflect new upstream files. 
+  * debian/control: 
+    - Remove build-depend on libcairo-dev.
+    - Build depend on libxt-dev, seems to be necessary now. (Closes: 
+      #274311)
+  * debian/docs: Removed, as browser/README.html disappeared. (Mike Hommey)
+  * debian/mozilla-firefox.dirs: 
+    - Changes to reflect new upstream files.
+    - Removed obsolete libnullplugin.so.
+  * debian/mozilla-firefox.install: 
+     - Remove .jar's that aren't there anymore.
+     - Removed obsolete libnullplugin.so.
+  * debian/mozilla-firefox-dom-inspector.dirs,
+    debian/mozilla-firefox-dom-inspector.install, debian/rules: Upstream
+    doesn't consider DOM Inspector as a real extension, and do not provide
+    the appropriate files to make it appear in the extensions
+    manager. Removed all the extension related stuff in the package. (Mike
+    Hommey)
+  * other-licenses/libart_lgpl: Removed, was for SVG, no longer needed.
+  * modules/plugin/samples/default/unix/*: Reverted debian specific
+    changes, we don't want them in the diff since libnullplugin won't get
+    installed.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  1 Oct 2004 18:50:46 -0400
+
+mozilla-firefox (0.9.3-6) unstable; urgency=high
+
+  * gfx/src/gtk/fontEncoding.properties: Uncomment symbol fonts. (Closes:
+    #272927)
+  * debian/control: Build-depend on binutils (>= 2.15-4) but only on mips
+    and mipsel. (Closes: #273353)
+  * configure.in, configure, rules.mk: Patch from Thiemo Seufer to
+    increase stability and performance on mips. (Closes: #272159)
+  * debian/mozilla-firefox-runner: Detect failure of ping()
+    better. (Closes: #267393)
+  * layout/html/document/src/html.css: Testing fix for xprint problems.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 27 Sep 2004 17:07:37 -0400
+
+mozilla-firefox (0.9.3-5) unstable; urgency=high
+
+  * debian/update-mozilla-firefox-chrome: Apply another patch form Mike
+    Hommey to fix a few more issues in the script. (Closes: #271480)
+  * Fixes to Secunia security bugs, ported from bugzilla: 
+    (Closes: #271888)
+    - browser/base/content/browser.js, 
+      xpfe/communicator/resources/content/contentAreaDD.js: Fix for
+      drag and drop exploit, bz#250862.
+    - caps/include/nsScriptSecurityManager.h, caps/src/caps.properties,
+      caps/src/nsScriptSecurityManager.cpp: Fix for enablePrivilege
+      exploit, bz#253942.
+    - gfx/src/shared/gfxImageFrame.cpp, gfx/src/windows/nsImageWin.cpp,
+      modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp: Fix for various
+      overflows in the BMP code, bz#255067.
+    - netwerk/dns/src/nsIDNService.cpp: Fix for bug in non-ASCII 
+      characters in domain names, bz#256316
+    - content/xbl/src/nsXBLPrototypeHandler.cpp: Clipboard injection 
+      fix, bz#257523.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 16 Sep 2004 20:06:47 -0400
+
+mozilla-firefox (0.9.3-4) unstable; urgency=high
+
+  * Urgency high, go into testing dammit!
+  * Apply patch from Mike Hommey as -3.1, which wasn't actually
+    released. See below. (Closes: #271480)
+  * debian/rules: Patch from Matthew Mueller to fix underquoted
+    argument. (Closes: #271432)
+  * debian/control: Build depend on binutils (>= 2.15-3) with fixed mips
+    support. We still need a fixed gcc.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 13 Sep 2004 20:41:27 -0400
+
+mozilla-firefox (0.9.3-3.1) unstable; urgency=low
+
+  * debian/rules: removed
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/installed-extensions.txt
+  * debian/update-mozilla-firefox-chrome:
+    + Added a "verbose" mode.
+    + Added warning messages (only shown in verbose mode) about some
+      extensions specific issues. This is intended to be useful for extensions
+      maintainers.
+    + Check if the installed-extensions.txt file disappears, which tells if the
+      mozilla-firefox -register went ok.
+  * debian/update-mozilla-firefox-chrome.8:
+    + Fixed typos.
+    + Added reference to the -v option for the verbose mode.
+  * debian/mozilla-firefox-runner: enhanced the profile directory check. It
+    didn't work if the path indicated in the profiles.ini was not absolute.
+
+ -- Mike Hommey <mh@glandium.org>  Mon, 13 Sep 2004 20:31:21 +0900
+
+mozilla-firefox (0.9.3-3) unstable; urgency=high
+
+  * Acknowlege NMU from Mike Hommey. He did a fantastic job in porting a
+    large amount of fixes from upstream CVS. I owe him several large
+    beverages of his choice. (Closes: #259046, #259836)
+  * Port all of Mike's changes to my local CVS.
+  * debian/mozilla-firefox-runner: 
+    - Pass command-line arguments to get_locale so they can actually 
+      be used. (Closes: #240058)
+    - Apply patch from Mike Hommey to use the profiles.ini to find the 
+      path to the profile to clean XUL.mfasl. (Closes: #267326)
+  * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to fix
+    some bashisms introduced by his NMU.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Patch from
+    Thiemo Seufer to fix mips. This requires patches to gcc and binutils
+    to work and fully close #270621.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  8 Sep 2004 21:13:35 -0400
+
+mozilla-firefox (0.9.3-2.2) unstable; urgency=high
+
+  * The "never edit the diff file unless you're sure nothing will be
+    missing" release.
+  * debian/mozilla-firefox.prerm: restore the uncut version.
+  * debian/control, debian/rules: Use gcc-3.2 to build on hppa, because of
+    toolchain bug #254549.
+
+ -- Mike Hommey <mh@glandium.org>  Mon, 23 Aug 2004 19:45:54 +0900
+
+mozilla-firefox (0.9.3-2.1) unstable; urgency=high
+
+  * Non Maintainer Upload for RC Fixes.
+  * Applied changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+    and toolkit/mozapps/extensions/locale/extensions.properties to solve some
+    issues with extensions management. (taken from CVS)
+  * Applied other changes to
+    toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/public/nsIExtensionManager.idl and
+    mozilla/toolkit/xre/nsAppRunner.cpp to be able to use -register
+    instead of -list-global-items for extensions/components/chrome
+    registration through update-mozilla-firefox-chrome, thus not needing
+    Xvfb anymore (-register option doesn't require a X server).
+    (taken from CVS)
+  * Applied some more changes to
+    toolkit/mozapps/extensions/src/nsExtensionManager.js.in in order to
+    avoir overlayinfo deletion during extensions registration process.
+    (taken from CVS)
+  * Final changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+    to avoid registering out of date extensions so that firefox doesn't enter
+    a loop at startup when no profile was found, and to only write in the
+    installed-extensions-processed.txt file the list of actually installed
+    extensions. Note that for packaged extensions installing their files
+    directly into the chrome or components directories, that only means they
+    won't appear in the Extensions Manager. They will still be available in
+    the GUI.
+  * All these fixes improve the Extensions Manager. Closes: #259046.
+  * accessible/src/atk/nsAccessibleWrap.cpp,
+    accessible/src/atk/nsAccessibleWrap.h: fixed 32-bit abuse of gobject
+    (Steve Langasek). Closes: #259836.
+  * debian/control: Removed dependency upon xvfb.
+  * debian/update-mozilla-firefox-chrome:
+    + Removed use of Xvfb.
+    + Removed creation of a root default profile, but kept the fake home
+      hack to avoid creation of a .mozilla directory in root's home.
+    + Changed extensions handling so that the overall process is cleaner.
+      Extensions packages will have to move extensions {uid} directories
+      to /usr/lib/mozilla-firefox/extensions/, while the current location
+      is still supported for compatibility purpose (but is strongly not
+      recommended).
+    + Removed use of regxpcom and regchrome, since what they both do is
+      done by firefox-bin -register.
+  * debian/rules: force GnomeVFS support to be disabled. (Josselin Mouette)
+  * debian/README.Debian:
+    + Added a note about potential problems with packaged "old" extensions.
+    + Added a note about how to manually disable packaged extensions in user
+      profile.
+    + Removed some old notes that don't apply anymore.
+  * debian/mozilla-firefox-dom-inspector.install, debian/rules: Move
+    extensions files to /usr/lib/mozilla-firefox/extensions/ instead of
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+  * debian/mozilla-firefox.links: Move installed-extensions.txt symlink
+    from /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+    /usr/lib/mozilla-firefox/extensions/.
+  * debian/mozilla-firefox.prerm: More cleanup on removal of package.
+
+ -- Mike Hommey <mh@glandium.org>  Sun, 22 Aug 2004 21:43:47 +0900
+
+mozilla-firefox (0.9.3-2) unstable; urgency=low
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Comment out
+    NARGSAVE, like I did in 0.9.1-7, should fully fix #262571.
+  * debian/mozilla-firefox.preinst: Remove brace expansion
+    bashism. (Closes: #264200)
+  * debian/control: Depend on debianutils (>= 1.16) since we use mktemp
+    -d. (Closes: #263958)
+  * debian/mozilla-firefox-runner: Make -contentLocale COUNTRY, not
+    lang-COUNTRY. (Closes: #263940)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  8 Aug 2004 23:41:02 -0400
+
+mozilla-firefox (0.9.3-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #263193)
+  * debian/update-mozilla-firefox-chrome.8: Add manpage from Mark Suter
+    for update-mozilla-firefox-chrome.8. (Closes: #263149)
+  * debian/mozilla-firefox.manpages: Add update-mozilla-firefox-chrome.8.
+  * debian/control: Add build-deps on gcc-3.4 for amd64. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  4 Aug 2004 20:21:22 -0400
+
+mozilla-firefox (0.9.1-7) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner:
+    - Reintroduce check for command-line arguments (I broke this last 
+      release). (Closes: #262692, #262462, #262537, #262588, #262727)
+    - Allow overriding of -contentLocale and -UILocale. (Closes: 
+      #240058)
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s: Comment out
+    NARGSAVE reassignment, it is defined elsewhere. (Closes: #262571)
+  * debian/rules: Force amd64 to build with gcc 3.4. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org>  Mon,  2 Aug 2004 10:16:46 -0400
+
+mozilla-firefox (0.9.1-6) unstable; urgency=low
+
+  * widget/src/gtk2/keysym2ucs.c: Patch from Eugeniy Meshcheryakov to
+    allow mozilla firefox to enter a ghe with upturn. (Closes: #261543)
+  * debian/mozilla-firefox-runner: 
+    - Remove some mail and composer cruft. 
+    - Add warning if DISPLAY is not set. (Closes: #261465)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 29 Jul 2004 22:49:59 -0400
+
+mozilla-firefox (0.9.1-5) unstable; urgency=low
+
+  * debian/control: Goodbye mozilla-firebird transition package.
+  * debian/mozilla-firefox-runner: Add -a firefox flag when running
+    firefox-bin. (Closes: #259237)
+  * debian/mozilla-firefox.desktop: Add GenericName field.
+  * debian/update-mozilla-firefox-chrome: Fix quoting problem with
+    {*}. (Closes: #257243)
+  * debian/rules: 
+    - Re-enable postscript printing support, since the security 
+      issues turned out to be bogus. (Closes: #257628)
+    - Disable SVG support, it's still too broken to be usable. 
+      (Closes: #259544)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 18 Jul 2004 20:09:14 -0400
+
+mozilla-firefox (0.9.1-4) unstable; urgency=low
+
+  * The "Let's try unstable" release. There are still issues, but there
+    are issues with 0.8 as well, so no more point in waiting.
+  * debian/update-mozilla-firefox-chrome:
+    - Copy over empty Extensions.rdf file on update. (Closes: #257243)
+    - Increase sleep to 15 seconds, hopefully this will work on most 
+      people's machines. 
+  * My apologies to Mike Hommey for mispelling his name in last release.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 11 Jul 2004 23:51:24 -0400
+
+mozilla-firefox (0.9.1-3) experimental; urgency=low
+
+  * Ok, I was wrong, we're still in experimental. I think we need to fix a
+    few more issues before getting this in unstable, like #257258, and
+    make sure the hacky extensions mechanism is more bullet-proof.
+  * debian/rules: --disable-installer, since we don't use it.
+  * debian/update-mozilla-firefox-chrome: 
+    - Wait 8 seconds instead of 5 for the hack, might help some 
+      people reporting problems.
+    - Remove ${LIBDIR}/extensions/{*}. I may move that to 
+      /var/lib/mozilla-firefox eventually, but let's leave it for now.
+  * debian/mozilla-firefox.png.uu: Make a nicer png icon, based on the
+    about box graphic.
+  * debian/mozilla-firefox.preinst: Remove old config files in
+    /etc/mozilla-firefox/pref. (Closes: #257711, 257557)
+  * browser/app/profile: firefox.js: Revert change to app.version,
+    apparently it breaks extensions. (Closes: #257941)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  7 Jul 2004 21:26:55 -0400
+
+mozilla-firefox (0.9.1-2) experimental; urgency=low
+
+  * The "Mike Homey, lord of the bugs" release. Thanks to Mike for being a
+    huge help with bug triage. That's right, help with bugs and your name
+    could have a prestigious place in the changelog.
+  * I'd like my next release to be to unstable, so let me know about
+    profile transition bugs, etc.
+  * debian/control: Build-depend on libcairo1-dev. 
+  * debian/rules: Enable svg support using cairo renderer. (Closes:
+    #215990)
+  * debian/mozilla-firefox-xremote-client: Add -a firefox switch to make
+    the remote client find firefox only. Thanks Jonathan Black. (Closes:
+    #256967)
+  * debian/mozilla-firefox.desktop: Make comment Gnome HIG
+    compliant. (Closes: #257592)
+  * browser/app/profile/firefox.js: 
+    - app.version = 0.9.1.
+    - Disable app updates by default. We're debian, we handle updates.
+  * debian/update-mozilla-firefox-chrome: 
+    - Remove installed-extensions-processed.txt before regenerating. 
+      (Closes: #257243)
+    - Take some, but not all advice from Alexandru Fomin. Improve Xvfb 
+      and extension registration hacks. 
+
+ -- Eric Dorland <eric@debian.org>  Sun,  4 Jul 2004 16:58:17 -0400
+
+mozilla-firefox (0.9.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * config/autoconf.mk.in: Alright, /usr/lib/firefox-0.9 was a bad idea,
+    use /usr/lib/mozilla-firefox. Change all the instances
+    /usr/lib/firefox-0.9 back to /usr/lib/mozilla-firefox. I feel
+    silly. (Closes: #256991)
+  * debian/mozilla-firefox-runner: Actually check for the existence of the
+    .mozilla/firefox directory before trying to clean it. 
+  * debian/update-mozilla-firefox-runner: 
+    - Call firefox-bin, not firefox you silly goose.  
+    - Use mozilla-firefox tempfile, not mozilla-browser.
+    - The horrible hackiness continues: For my previous hack to work, 
+      I need to preseed a profile directory in the home directory I
+      create. Now things should work. (Closes: #256812)
+
+ -- Eric Dorland <eric@debian.org>  Thu,  1 Jul 2004 17:16:29 -0400
+
+mozilla-firefox (0.9-1) experimental; urgency=low
+
+  * New upstream release. There may be regressions from 0.8. (Closes:
+    #254522)
+  * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+    widget/src/gtk2/nsGtkMozRemoteHelper.cpp,
+    widget/src/xremoteclient/XRemoteClient.cpp: Fix previously applied to
+    fix -remote behaviour undone. Mozilla now includes the program name in
+    the properties to distinguish between various Mozilla apps.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in: remove extra endif.
+  * dom/public/idl/core/nsIDOMNSDocument.idl: Reintroduce referrer
+    attribute that got lost somehow.
+  * content/events/src/nsEventStateManager.cpp: Fix a strange broken
+    function call to GetContainer.
+  
+  * debian/rules: 
+    - Follow upstream and --enable-single-profile and 
+      --disable-profilesharing.
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - --user-app-dir=.mozilla to jive with new location.
+    - Remove dom-inspector extension dir from the regular package. 
+  * debian/control: Depend on xvfb for insane hack below.
+  * debian/mozilla-firefox.install:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Remove ipc dir, mozipcd.
+    - Add init.d, greprefs dirs.
+  * debian/mozilla-firefox.dirs:
+    - Add /var/lib/mozilla-firefox/extensions{,.d}
+  * debian/mozilla-firefox-dom-inspector.dirs: Add
+    /var/lib/mozilla-firefox/extensions.d.
+  * debian/mozilla-firefox-dom-inspector.install:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Install dom-inspector extension dir.
+  * debian/mozilla-firefox.links:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Link /usr/lib/mozilla-firefox to /usr/lib/firefox-0.9.
+    - Link installed-extensions.txt to our place in 
+      /var/lib/mozilla-firefox.
+  * debian/mozilla-firefox-runner: 
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Fix xprintorg typo. (Closes: #255706)
+    - Search .mozilla/firefox for XUL.mfasl files.
+  * debian/mozilla-firefox-xremote-client: Replace
+    /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+  * debian/update-mozilla-firefox-chrome: 
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Capture return values from reg* commands on error, stolen 
+      from mozilla source.
+    - Remove returns from check_running.
+    - Pull in snippets from /var/lib/mozilla-firefox/extensions.d 
+      to generate installed-extensions.txt for new extensions mechanism.  
+    - An insane hack, but necessary because of upstream: Launch a Xvfb 
+      to run firefox to generate the necessary extension metadata. I've
+      been told this will not be necessary in the next version. 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 28 Jun 2004 23:40:59 -0400
+
+mozilla-firefox (0.8-12) unstable; urgency=low
+
+  * The "Last Chance Before 0.9" release.
+  * debian/mozilla-firefox-runner: Fix unescaped \n, thanks Olly
+    Betts. (Closes: #252436)
+  * debian/update-mozilla-firefox-chrome: Watch out for empty
+    LD_LIBRARY_PATH. Thanks George Cristian Birzan. (Closes: #254142)
+  * debian/README.Debian: Restructure and update a bit.
+  * debian/presubj: Add bug information from README.Debian for reportbug.
+  * debian/mozilla-firefox.install: Install the presubj. 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 14 Jun 2004 19:39:27 -0400
+
+mozilla-firefox (0.8-11) unstable; urgency=low
+
+  * Apply amd64 fix from #249211. 
+  * debian/README.Debian: Shamelessly stole the java plugin installation
+    instructions from the mozilla package. (Closes: #243513)
+  * nsCommonWidget.cpp, nsCommonWidget.h, nsWindow.cpp: Apply patch (with
+    some hand massaging) from upstream bugzilla bug #209342 to fix initial
+    window placement. (Closes: #235209, 241519)
+  * nsprpub/pr/src/misc/prnetdb.c: Apply patch from Miquel van Smoorenburg
+    to prevent unless reverse DNS lookups. (Closes: #251978)
+  * debian/mozilla-firefox-runner: Apply patch from Jasper Spaans to fix
+    remote xprint printing. (Closes: #252072)
+
+ -- Eric Dorland <eric@debian.org>  Tue,  1 Jun 2004 23:12:36 -0400
+
+mozilla-firefox (0.8-10) unstable; urgency=low
+
+  * debian/mozilla-firefox.install: Don't install uuencoded file. (Closes:
+    #251441)
+  * debian/mozilla-firefox-runner: unset AUDIODEV which can cause
+    crashes. Thanks Christopher Armstrong. (Closes: #236231)
+  * update-mozilla-firefox-chrome: Port security fix from #249613 to
+    handle insecure tempfile creation.
+  * debian/rules: Following the advice of #247585 I'm disabling postscript
+    printing. Perhaps this will alleviate some of the other printing
+    problems.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 30 May 2004 01:47:52 -0400
+
+mozilla-firefox (0.8-9) unstable; urgency=low
+
+  * debian/control: 
+    - Suggest latex-xft-fonts for MathML fonts. Thanks Michael 
+      JasonSmith. (Closes: #216925)
+    - Build depend on libx11-dev & libxp-dev instead of xlibs-dev to 
+      reflect new X packages.
+  * widget/src/gtk2/nsWindow.cpp: Apply patch from Peter Colberg to ignore
+    unused mouse buttons. (Closes: #244305)
+  * debian/README.Debian: Document the fact that the loopback interface
+    has to be up and unfiltered for things to work right.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  5 May 2004 23:30:42 -0400
+
+mozilla-firefox (0.8-8) unstable; urgency=low
+
+  * security/nss/lib/freebl/unix_rand.c: Remove code that called netstat
+    to gain so entropy. It's pretty useless on a Linux system. Thanks
+    Wichert. (Closes: #241200)
+  * debian/README.Debian: Add note about changing the button order in the
+    dialog boxes. (Closes: #240261)
+  * debian/control: Add dummy package for mozilla-firebird to smooth
+    upgrades. (Closes: #235577)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  3 Apr 2004 16:19:34 -0500
+
+mozilla-firefox (0.8-7) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner: 
+    - Cleanup XUL.mfasl whenever firefox is run with no 
+      command-line. (Closes: #238717)
+    - Add patch from Laurent Buffler to add config to allow 
+      new tabs to be opened instead of new windows. (Closes: #239323)
+  * debian/mozilla-firefoxrc: Put the new FIREFOX_OPEN_IN variable in
+    there and document it's use.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 27 Mar 2004 17:21:51 -0500
+
+mozilla-firefox (0.8-6) unstable; urgency=low
+
+  * debian/control: Build-depend on g++-3.3 (>= 3.3.3-4) to work around
+    broken 3.3.3-3 release. (Closes: #238318, #238241, #238441, #238523,
+    #238534)
+  * debian/rules: Install new small-firefox icon. 
+  * debian/mozilla-firefox{.png, .xpm, -small.xpm}: Use the new DFSG-free
+    icons, the old pretty ones are trademarked and not DSFG-free. I know,
+    it's stupid. Complain to the Mozilla Foundation, not me. (Closes:
+    #234869)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 21 Mar 2004 22:09:16 -0500
+
+mozilla-firefox (0.8-5) unstable; urgency=low
+
+  * Rebuild with g++-3.3 3.3.3-2 to work around broken g++. (Closes:
+    #238318)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 17 Mar 2004 21:38:58 -0500
+
+mozilla-firefox (0.8-4) unstable; urgency=low
+
+  * debian/README.Debian: 
+    - Tell people not to remove their ~/.firefox directory. Just move it
+      out of the way. (Closes: #235594)
+    - Add notes about the sound dsp. (Closes: #236678)
+  * debian/mozilla-firefox-runner: 
+    - Don't redirect stderr. (Closes: #236160)
+    - Add get_locale code from Aurelien Jarno (Closes: #235521)
+    - Fix dsp auto-detection code. (Closes: #236678)
+  * debian/rules: Add default locale file.
+  * debian/mozilla-firefox.dirs: Add locales dir. 
+
+  * browser/app/profile/all.js,
+    content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h,
+    widget/src/gtk/nsWidget.cpp: Reapply extended mouse events patch from
+    Derek Upham. (Closes: #235385, #230876)
+  * browser/base/content/browser-sets.inc: Make ESC stop animations
+    again. (Closes: #235474)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 16 Mar 2004 00:31:19 -0500
+
+mozilla-firefox (0.8-3) unstable; urgency=low
+
+  * debian/mozilla.firefox.menu: Change the case of
+    mozilla-Firefox. (Closes: #234982, #234755)
+  * debian/NEWS.Debian: Move to debian/mozilla-firefox.NEWS so that it
+    actually gets installed. (Closes: #234700)
+  * debian/update-mozilla-firefox-chrome: Setup dummy home directory to
+    capture silly .firefox directory. (Closes: #234855)
+  * debian/mozilla-firefox.png.uu, debian/mozilla-firefox.xpm: Use the
+    new, pretty mozilla-firefox icons. (Closes: #234869)
+  * debian/rules: Install the pretty icon in the right places. 
+
+ -- Eric Dorland <eric@debian.org>  Thu, 26 Feb 2004 21:10:27 -0500
+
+mozilla-firefox (0.8-2) unstable; urgency=low
+
+  * The "what he taketh, he giveth back" release.
+  * debian/rules:
+    - Disable the wallet extension, this really closes #222447.
+    - Remove some more cruft left over from the patch system.
+    - Reinstall the dom-inspector.
+  * debian/control: Add the dom-inspector back, now that it is supported
+    upstream.
+  * debian/mozilla-firefox-dom-inspector.{install,dirs,postinst,postrm}:
+    Bring these files back.
+  * docshell/base/nsWebShell.cpp: Only do keyword lookup on when DNS
+    entries don't exist. (Closes: #233916, #218033, #211524)
+
+ -- Eric Dorland <eric@debian.org>  Mon, 23 Feb 2004 21:48:03 -0500
+
+mozilla-firefox (0.8-1) unstable; urgency=low
+  
+  * The "Let's Change Our Name Every Other Day" release.
+  * New upstream release, mozilla-firebird has been renamed to
+    mozilla-firefox. Let's hope it lasts. (Closes: #231903, #222447)
+  * debian/mozilla-firebird.*: Renamed to debian/mozilla-firefox.*.
+
+  * debian/README.Debian: Update for firefox, remove blurb about the
+    inspector.
+  * debian/NEWS.Debian: Explain how to move your configs over. I may make
+    this automatic if enough people complain, but I'm loathe to muck
+    around in pople's home directories.
+
+  * debian/control:
+    - Rename the package.
+    - Tweak description to list Firefox's previous aliases.
+    - Remove conflicts on mozilla-firebird-dom-inspector.
+
+  * debian/rules: 
+    - s/firebird/firefox/g, s/MozillaFirebird/firebird/g.
+    - Comment out some old inspector code. 
+    - Remove unused patch subsystem.
+    - Disable gtktest. We don't need no stinking tests.
+    - Remove disable plaintext editor line, not sure why it's there.
+    - Disable LDAP support. We don't use it.
+    - Remove executable bit on *.so files.
+    - Remove useless preference files.
+    - Exclude the inspector files.
+    - Don't remove installed-chrome, we don't install it anymore.
+    - user-app-dir = .firefox. (Closes: #212301)
+    - export MOZILLA_OFFICIAL for the build ID. (Closes: #231133)
+
+  * debian/mozilla-firefox-runner: 
+    - s/firebird/firefox/g.
+    - Remove composer and editor functions.
+    - Use .firefox directory.
+
+  * debian/mozilla-firefox.install: 
+    - s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+    - Don't install timebombgen.
+    - Install icons directory.
+    - Don't install installed-chrome.txt, we just remove it anyway. 
+
+  * debian/mozilla-firefox.desktop, debian/mozilla-firefox.dirs,
+    debian/mozilla-firefox.manpages, debian/mozilla-firefox.links,
+    debian/mozilla-firefox.menu, debian/mozilla-firefox.mime,
+    debian/mozilla-firefoxrc, debian/mozilla-firefox.postinst,
+    debian/mozilla-firefox.prerm, debian/update-mozilla-firefox-chrome,
+    debian/mozilla-firefox.1, debian/mozilla-firefox-xremote-client:
+    s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+
+  * debian/mozilla-firefox.links: Link mozilla-firefox.1 to firefox.1.
+  
+  * debian/mozilla-firefox.preinst: Remove, at least with the rename I can
+    erase some of my previous blunders.
+
+  * debian/mozilla-firefox.{png.uu,xpm}: Use the package icon.
+
+  * browser/app/nsBrowserApp.cpp: Change package name to Firefox, so now
+    the ~/.firefox is used. (Closes: #196550)
+
+  * browser/app/profile/all.js: Merge in autoscroll fixes.
+  * browser/base/content/browser-sets.inc: Merge in upstream stop button
+    fix.
+  * modules/plugin/samples/default/unix/nullplugin.c: Merge in removal of
+    commented code.
+  * nsprpub/pr/include/md/_linux.cfg, nsprpub/pr/include/md/_linux.h,
+    security/coreconf/Linux.mk: Merge in hppa build fixes from upstream.
+  * config/autoconf.mk.in: Install into /usr/lib/mozilla-firefox now.
+  * content/base/src/nsDocumentViewer.cpp: Remove redundant stop patch
+    since it has been merged upstream.
+  * content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/src/gtk/nsWidget.cpp: Revert
+    back to upstream version. There was a patch here to add support for
+    extended mouse buttons, but I'm removing it since I don't trust that
+    it works in the new version correctly. Send me another patch if you
+    want this functionality back.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Revert this
+    back to upstream, I'm not sure which patches I applied to this file,
+    likely something to try and fix the double password prompt.
+  * widget/src/xremoteclient/XRemoteClient.cpp,
+    widget/src/xremoteclient/XRemoteClient.h: Revert to upstream version,
+    I believe it does the right thing now, but the patch I used does not
+    apppear to have been used. Restore the properties to _FIREFOX_*
+    though.
+  * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+    widget/src/gtk2/nsGtkMozRemoteHelper.cpp: Change the _FIREBIRD_* to
+    _FIREFOX_* here as well.
+  * content/base/src/nsDocument.cpp: Comment out nsDocument::GetDomConfig,
+    needed to get things to compile.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 15 Feb 2004 21:28:45 -0500
+
+mozilla-firebird (0.7-7) unstable; urgency=low
+
+  * debian/mozilla-firebird-runner: Open a new window when loading a
+    regular file. (Closes: #228853)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 29 Jan 2004 22:12:30 -0500
+
+mozilla-firebird (0.7-6) unstable; urgency=medium
+
+  * The "Indian-giver-christmas" release.
+  * Urgency medium since we're closing some critical bugs that need to get
+    in before a freeze.
+  * Completely remove mozilla-firebird-dom-browser. No one stepped up to
+    help fix it's brokeness in 0.7 and I don't use it or particularly care
+    about it. So it is no more. If someone steps up to take responsibility
+    I might put it back, but otherwise it may RIP. (Closes: #222085)
+  * debian/mozilla-firebird-runner: Remove XUL.mfasl uncoditionally
+    now. There is a corner case where this file is corrupted on upgrade
+    when firebird was running. This is a total hack, and not an elegant
+    solution, but at least it fixes the problem. (Closes: #224779,
+    #224323)
+  * debian/control: Conflict against old mozilla-firebird-dom-inspector
+    since it doesn't work anymore.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 25 Dec 2003 15:54:21 -0500
+
+mozilla-firebird (0.7-5) unstable; urgency=low
+
+  * browser/base/content/browser-sets.inc: Patch to make ESC stop actually
+    work. (Closes: #223382)
+  * debian/rules: Turn down optimizations on sparc. (Closes: #223760)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 14 Dec 2003 23:01:59 -0500
+
+mozilla-firebird (0.7-4) unstable; urgency=low
+
+  * The "All of Takuo's hard work really pays off" release.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Patch from
+    upstream bugzilla (#220214) to fix double password prompt
+    problem. (Closes: #222696)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Stolen
+    patch from mozilla package to make mozilla-firebird build on
+    mips. (Closes: #222743)
+  * content/base/src/nsDocumentViewer.cpp: Port yet another patch to allow
+    the ESC key to stop animated gifs. (Closes: #223382)
+
+ -- Eric Dorland <eric@debian.org>  Mon,  8 Dec 2003 23:59:16 -0500
+
+mozilla-firebird (0.7-3) unstable; urgency=low
+
+  * debian/control: Add dependency on psmisc since we use fuser. Thanks
+    Daniel Schröter.
+  * widget/src/xremoteclient/XRemoteClient.{cpp,h}: Apply patch from
+    bugzilla to fix -remote behaviour on modern WMs. Thanks Nikolai
+    Prokoschenko. (Closes: #197632)
+  * nsprpub/pr/src/misc/prdtoa.c: Apply fix from mozilla package (#215067)
+    to fix building on arm. This is a partial fix to #222743.
+  * debian/patches: Remove these. Put everything in CVS.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  5 Dec 2003 20:03:46 -0500
+
+mozilla-firebird (0.7-2) unstable; urgency=low
+
+  * Apply excellent patch from Alexander Sack <asac@jwsdot.com> to fix the
+    issues with mozilla running and firebird not starting. (Closes:
+    #216264)
+  * browser/app/profile/all.js: Set the default of "general.autoScroll" to
+    false because it annoyes me. (Closes: #221661)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 19 Nov 2003 20:59:55 -0500
+
+mozilla-firebird (0.7-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #216019)
+  * debian/patches/dom-inspector.diff: Remove, and apply directly into my
+    CVS.
+  * debian/patches/pref.diff: Removed, doesn't seem applicable anymore.
+  * debian/rules: export MOZ_FIREBIRD=1.
+  * debian/control: 
+    - Change Chimera to Camino. (Closes: #220821)
+    - Fix typos in descriptions. (Closes: #218202)
+    - Add build-deps on m4. (Closes: #219681)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 12 Nov 2003 23:01:35 -0500
+
+mozilla-firebird (0.6.1-8) unstable; urgency=low
+
+  * Apply patch to make forward and back buttons work on mice. (Closes:
+    #211606)
+  * debian/rules: Use -O optimization on alpha, so it will build
+    again. (Closes: #213603)
+  
+ -- Eric Dorland <eric@debian.org>  Fri,  3 Oct 2003 00:07:44 -0400
+
+mozilla-firebird (0.6.1-7) unstable; urgency=low
+
+  * Rebuild with the latest and greatest from unstable. This seems to fix
+    the problems with bookmarks people were having, at least for me. No
+    idea why. Please reopen if this doesn't fix it for you. (Closes:
+    #209339, #211706, #211286, #211146, #212011) 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 22 Sep 2003 00:00:08 -0400
+
+mozilla-firebird (0.6.1-6) unstable; urgency=low
+
+  * Patch from Eric Wong <normalperson@yhbt.net> to make plugin requests
+    less annoying. (Closes: #196609)
+  * debian/rules: Stop building libart.
+  * debian/mozilla-firebird.links: Fix path to bookmarks file. (Partial
+    fix to #211286)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 17 Sep 2003 20:22:56 -0400
+
+mozilla-firebird (0.6.1-5) unstable; urgency=low
+
+  * The "sorry Chris Gray" release.
+  * debian/rules: disable SVG. This was causing drag and drop to lock up
+    X and possibly fixes #208630. (Closes: #209371)
+  * debian/mozilla-firebird-runner: Remove XUL.mfasl if we have upgraded,
+    since it can cause problems. (Closes: #200073, #202130, #207351)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 13 Sep 2003 20:15:37 -0400
+
+mozilla-firebird (0.6.1-4) unstable; urgency=low
+
+  * The "pleasing Chris Gray" release.
+  * other-licenses/libart_gpl: Add this library for svg.
+  * debian/rules: 
+    - Enable svg.
+    - Move bookmarks.html file into /etc. (Closes: #207398)
+  * debian/mozilla-firebird.links: Add links back to files moved to /etc.
+  * security/coreconf/Linux2.6.mk: Add this as a copy of Linux2.5.mk to
+    get mozilla-firebird to build on 2.6. (Closes: #207821)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 31 Aug 2003 04:40:30 -0400
+
+mozilla-firebird (0.6.1-3) unstable; urgency=low
+
+  * debian/mozilla-firebird.prerm: Remove mozilla alternative on
+    remove. (Closes: #205310)
+  * debian/debsearch.{gif.uu,src}: Debian search plugin graciously
+    contributed by Fergus McKenzie-Kay <Linux@NerdIT.com>.
+  * debian/rules: 
+    - uudecode and clean up debsearch.gif.uu.
+    - Steal platform specific optimization code from mozilla 
+      package. Thanks Brian Nelson. (Closes: #206309) 
+  * debian/mozilla-firebird.install: Install the above files. 
+  * debian/control: Update Standards-Version to 3.6.1.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 24 Aug 2003 19:09:11 -0400
+
+mozilla-firebird (0.6.1-2) unstable; urgency=low
+
+  * The "Stop Pestering Me Already!" release.
+  * debian/control: Only recommend xprt-xprintorg, don't require
+    it. (Closes: #204176)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 10 Aug 2003 20:00:11 -0400
+
+mozilla-firebird (0.6.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #203518, #201203)
+  * debian/control:
+    - Standards-Version to 3.6.0.
+    - Don't provide www-browser anymore. (Closes: #201035)
+    - Depend on xprt-xprintorg so printing will work. (Closes: #202418)
+  * debian/mozilla-firebird.preinst: Remove www-browser alternative.
+  * debian/mozilla-firebird.postinst: Don't install www-browser alternative.
+  * debian/mozilla-firebird.prerm: Don't remove www-browser alternative
+    anymore.
+  * debian/README.Debian: Added note about configuration breaking on
+    upgrade. (Closes: #202130)
+  * debian/patches/classic.diff: Removed. Not sure what it's point was.
+  * debian/rules: Add --disable-pedantic to the configure options.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  3 Aug 2003 14:58:12 -0400
+
+mozilla-firebird (0.6-8) unstable; urgency=low
+
+  * debian/patches/alpha-build-fix.diff: Steal patch from mozilla to allow
+    building on alpha. (Closes: #198638)
+  * debian/patches/hppa-build-fix.diff: Steal patch from mozilla to allow
+    building on hppa, clean it up so it applies cleanly. (Closes: #199068)
+  * debian/mozilla-firebird.png.uu: Added uuencoded nice png icon.
+  * debian/rules: Add code to decode and clean up the new icon file.
+  * debian/mozilla-firebird.install: Install new icon.
+  * debian/mozilla-firebird.desktop: Use the new icon.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 27 Jun 2003 23:21:56 -0400
+
+mozilla-firebird (0.6-7) unstable; urgency=low
+
+  * debian/mozilla-firebird.1: Stole the mozilla manpage for my own
+    nefarious purposes. (Closes: #196638)
+  * debian/mozilla-firebird.postrm: Add slave links to the
+    mozilla-firebird manpage. (Closes: #197145)
+  * debian/mozilla-firebird-xremote-client: Set up the environment
+    properly so it returns correct information. (Closes: #197632)
+  * debian/mozilla-firebird.xpm: Added icon from
+    http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png to have
+    a nice menu icon. (Closes: #197565)
+  * Updated the README.Debian with some helpful bug reporting tips.
+  * debian/rules: Replaced dh_installmanpages with dh_installman.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 22 Jun 2003 15:15:37 -0400
+
+mozilla-firebird (0.6-6) unstable; urgency=low
+
+  * debian/mozilla-firebird.postinst: Add priority 0 alternative on
+    mozilla. (Closes: #196444)
+  * debian/control: Add build-depends on libxrender-dev, libmng-dev,
+    libpng12-dev, libjpeg62-dev.
+  * debian/rules: 
+    - Build with system jpeg, mng and png libs.
+    - Exclude inspector files from mozilla-firebird. 
+      (Closes: #196432, #196509)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  7 Jun 2003 15:19:23 -0400
+
+mozilla-firebird (0.6-5) unstable; urgency=low
+
+  * The "Mike Hommey is my homey" release.
+  * Thanks to Mike Hommey <mh@glandium.org> for his excellent work on this
+    version (it's 99% his), which I've shamelessly stolen.
+  * Added a README.Debian file.
+  * Added a separate mozilla-firebird-dom-inspector package.
+  * debian/patches/dom-inspector.diff:
+    - add DOM Inspector to Tools menu. (note: DOM Inspector is still
+      not very well integrated with Firebird)
+    - remove modern skin references.
+  * debian/patches/xpinstall.diff: remove unneeded chrome registrations
+    from xpinstall/packager/unix/browser.jst.
+  * debian/patches/classic.diff: remove
+    themes/classic/global/win/preview.gif from jar file and modify
+    preview image reference in rdf file to Preview.png.
+  * debian/patches/pref.diff: remove preview image constraints in
+    browser/components/prefwindow/skin/pref.css file to avoid deformation
+    of preview image in classic theme.
+  * debian/mozilla-firebird.preinst: added #DEBHELPER#.
+  * debian/mozilla-firebird.install:
+    - Don't install the modern.jar and embed-sample.jar files.
+    - Remove files related to dom-inspector.
+  * debian/rules:
+    - enabling xinerama support.
+    - disabling build of chatzilla and venkman.
+    - moved /var/lib/mozilla-firebird/chrome.d/99default to
+      /var/lib/mozilla-firebird/chrome.d/00all
+    - remove references to embed-sample.jar in
+      /var/lib/mozilla-firebird/chrome.d/00all
+    - Add some comments.
+    - Change == to =, for more strict /bin/sh's.
+  * debian/control: Build-Depend on libidl-dev (>= 0.8.0) because the
+    configure script requires at least this version.
+  * debian/copyright: Make this a real debian copyright file. 
+  
+ -- Eric Dorland <eric@debian.org>  Thu,  5 Jun 2003 01:00:32 -0400
+
+mozilla-firebird (0.6-4) unstable; urgency=low
+
+  * debian/rules: Change -O2 to -O for building on powerpc.
+  * debian/mozilla-firebird.preinst: Delete
+    /usr/lib/mozilla-firebird/defaults/pref on upgrade to facilitate
+    transition to prefs in /etc. Thanks to all who reported this.
+
+ -- Eric Dorland <eric@debian.org>  Tue, 27 May 2003 21:45:06 -0400
+
+mozilla-firebird (0.6-3) unstable; urgency=low
+
+  * First attempt at a debian upload. (Closes: #163270)
+  * debian/rules:
+    + Small fix to Mike Hommey's chrome patch.
+    + Suggestion from Bernhard R. Link to install
+      /usr/lib/mozilla-firebird/defaults/pref to 
+      /etc/mozilla-firebird/pref
+    + Add dh_installmime call.
+  * debian/mozilla-firebird.mime: Install mime type handlers for firebird.
+  * debian/mozilla-firebird.links: Link
+    /usr/lib/mozilla-firebird/defaults/pref to /etc/mozilla-firebird/pref
+  * debian/mozilla-firebird.install: Don't install the inspector.jar.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 26 May 2003 00:28:40 -0400
+
+mozilla-firebird (0.6-2) unstable; urgency=low
+
+  * debian/rules:
+    + Add --with-user-appdir=.mozilla-firebird, since it still 
+      defaults to .phoenix.
+    + Don't use the ${prefix} variable, use /usr, since ${prefix} 
+      doesn't seem to work.
+    + Use --without-system-nspr.
+  * debian/mozilla-firebird.install:
+    + Be picky about what chrome files we install, since there's 
+      quite a few we don't need, and a bunch of empty dirs.
+  * Excellent patch from Mike Hommey <mh@glandium.org> to add a
+    update-mozilla-firebird-chrome script.
+  
+ -- Eric Dorland <eric@debian.org>  Sat, 24 May 2003 13:00:44 -0400
+
+mozilla-firebird (0.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Renamed to mozilla-firebird.
+  * Changed phoenix to mozilla-firebird where appropriate.
+  * debian/mozilla-firebird.links: Add link mozilla-firebird to
+    MozillaFirebird.
+  * debian/control:
+    + Standars-Version to 3.5.10.0.
+    + Build-depend on gtk2 libs now.
+    + Build-depend on libidl-dev.
+    + Add Provides x-www-browser.
+  * debian/rules:
+    + Enable building with the gtk2 libs.
+    + Make mozilla-firebird-xremote-client executable in install target.
+  * debian/mozilla-firebird.desktop: Added gnome menu entry.
+  * debian/mozilla-firebird.{prerm,postinst}: Add alternatives to
+    www-browser and x-www-browser.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 19 May 2003 20:43:39 -0400
+
+phoenix (0.5-4) unstable; urgency=low
+
+  * debian/control: Depend on fontconfig.
+  * debian/rules: Add source-tarball-from-cvs to build a orig tarball from
+    a checked out cvs tree. Now I can provide source package. And there
+    was much rejoicing.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 17 Jan 2003 21:06:47 -0500
+
+phoenix (0.5-3) unstable; urgency=low
+
+  * debian/phoenix-xremote-client: Added to send remote commands to
+    phoenix. Just a wrapper that calls phoenix-bin -remote.
+  * debian/phoenix-runner: 
+    + Use phoenix-xremote-client.
+    + Replace MOZILLA_DSP with PHOENIX_DSP.
+  * debian/phoenixrc: phoenix-runner uses this file to determine what dsp
+    to start.
+  * debian/phoenix.install: 
+    + Install phoenix-xremote-client, and don't install
+      mozilla-xremote-client.
+    + Install phoenixrc.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 23 Dec 2002 02:52:21 -0500
+
+phoenix (0.5-2) unstable; urgency=low
+
+  * debian/control: 
+    + Add Provides: www-browser.
+    + Build-depend on libxft2-dev, libnspr-dev.
+  * debian/rules:
+    + Use xft and the system nspr.
+    + Install phoenix-runner.
+  * debian/phoenix-runner: Stolen from the mozilla package to run phoenix.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 21 Dec 2002 02:03:11 -0500
+
+phoenix (0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/phoenix.install: Fix paths to phoenix libs.
+  * debian/control: 
+    + Standards-Version to 3.5.8
+    + Improve build-deps.
+  * debian/rules: 
+    + Have configure options here, no more .mozconfig.
+    + Steal some patch code from Colin.
+  * debian/patches/mozappdir.diff: Change the mozappdir.
+  
+ -- Eric Dorland <eric@debian.org>  Mon,  9 Dec 2002 02:43:13 -0500
+
+phoenix (0.4-3) unstable; urgency=low
+
+  * debian/phoenix.menu: Add menu entry.
+  * Rebuild to fix libstdc++ dependency.
+  * .mozonfig: Disable more tests.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 20 Nov 2002 19:13:18 -0500
+
+phoenix (0.4-2) unstable; urgency=low
+
+  * debian/control:
+    + Add build-depends.
+    + Fix section and description.
+  * .mozconfig:
+    + Use system zlib.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 13 Nov 2002 19:03:52 -0500
+
+phoenix (0.4-1) unstable; urgency=low
+
+  * Initial release.
+  
+ -- Eric Dorland <eric@debian.org>  Mon, 11 Nov 2002 23:09:41 -0500
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/control
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/control
@@ -0,0 +1,101 @@
+Source: thunderbird
+Section: web
+Priority: optional
+Maintainer: Alexander Sack <asac@ubuntu.com>
+Build-Depends: bzip2,
+	debhelper (>= 5),
+	quilt,
+	patchutils (>= 0.2.25),
+	cdbs (>= 0.4.27-1),
+	libx11-dev,
+	libxt-dev,
+	libgtk2.0-dev (>= 2.8),
+	zlib1g-dev,
+	liborbit2-dev,
+	libidl-dev (>= 0.8.0),
+	zip,
+	libxft-dev,
+	libfreetype6-dev,
+	libpng12-dev,
+	libjpeg62-dev,
+	libxrender-dev,
+	libxinerama-dev,
+	libcairo2-dev,
+	libgnome2-dev,
+	libgconf2-dev,
+	libgnomevfs2-dev,
+	libgnomeui-dev,
+	sharutils,
+	m4,
+	binutils (>= 2.17-1) [mips mipsel],
+	libhunspell-dev,
+	libnss3-dev,
+	libnspr4-dev,
+	docbook-to-man,
+	g++-4.2, gcc-4.2
+Standards-Version: 3.7.3
+
+Package: thunderbird
+Architecture: any
+Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}
+Recommends: myspell-en-us | hunspell-dictionary | myspell-dictionary
+Suggests: thunderbird-gnome-support (= ${Source-Version}), latex-xft-fonts, libthai0
+Conflicts: mozilla-thunderbird (<< 1.6~)
+Replaces: mozilla-thunderbird
+Provides: mail-reader
+Section: mail
+Description: mail/news client with RSS and integrated spam filter support
+ Thunderbird is a lightweight mail/news/RSS client, based on the Mozilla suite.
+ It supports different mail accounts (POP, IMAP, Gmail), has an integrated
+ learning Spam filter, and offers easy organization of mails with tagging and
+ virtual folders. Also, more features can be added by installing extensions.
+
+Package: mozilla-thunderbird
+Architecture: all
+Depends: thunderbird
+Description: Transition package for mozilla-thunderbird rename
+ Package to ease upgrading from older mozilla-thunderbird
+ package to the new thunderbird package.
+ .
+ This package can be purged at anytime once the thunderbird
+ package has been installed.
+
+
+#Package: thunderbird-dom-inspector
+#Architecture: all
+#Depends: thunderbird (>= ${source:Version}), thunderbird (<< ${source:Version}.1~)
+#Description: tool for inspecting the DOM of pages in Mozilla Thunderbird
+# This is a tool that allows you to inspect the DOM for web pages in
+# Thunderbird.  This is of great use to people who are doing Mozilla chrome
+# development for thunderbird plugins.
+
+Package: thunderbird-gnome-support
+Architecture: any
+Section: mail
+Depends: ${shlibs:Depends}, thunderbird (= ${Source-Version})
+Provides: gnome-www-browser
+Description: Support for Gnome in Mozilla Thunderbird
+ This is an extension to Thunderbird that allows it to use protocol
+ handlers from Gnome-VFS, such as smb or sftp, and other Gnome
+ integration features.
+
+Package: thunderbird-dev
+Architecture: any
+Section: mail
+Depends: thunderbird (= ${Source-Version}), thunderbird-gnome-support (= ${Source-Version})
+Conflicts: mozilla-thunderbird-dev (<< 1.6~)
+Replaces: mozilla-thunderbird-dev
+Description: Development files for Mozilla Thunderbird
+ This package contains the development headers, idl files and static libraries 
+ needed to develop applications using Mozilla Thunderbird.
+
+Package: mozilla-thunderbird-dev
+Architecture: all
+Depends: thunderbird-dev
+Description: Transition package for mozilla-thunderbird rename
+ Package to ease upgrading from older mozilla-thunderbird-dev
+ package to the new thunderbird-dev package.
+ .
+ This package can be purged at anytime once the thunderbird
+ package has been installed.
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird-gnome-support.install
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird-gnome-support.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/thunderbird/components/*imgicon*
+debian/tmp/usr/lib/thunderbird/components/*mozgnome*
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/copyright
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/copyright
@@ -0,0 +1,576 @@
+This package was debianized by Alexander Sack <asac@jwsdot.com> on
+25 Sep 2003
+
+It was downloaded from http://www.mozilla.org/projects/thunderbird
+
+Upstream Authors: Mozilla Project
+
+Copyright:
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``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 ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+     ----------------------------------------------------------------------
+
+     AMENDMENTS
+
+     The Netscape Public License Version 1.1 ("NPL") consists of the
+     Mozilla Public License Version 1.1 with the following Amendments,
+     including Exhibit A-Netscape Public License.  Files identified with
+     "Exhibit A-Netscape Public License" are governed by the Netscape
+     Public License Version 1.1.
+
+     Additional Terms applicable to the Netscape Public License.
+          I. Effect.
+          These additional terms described in this Netscape Public
+          License -- Amendments shall apply to the Mozilla Communicator
+          client code and to all Covered Code under this License.
+
+          II. "Netscape's Branded Code" means Covered Code that Netscape
+          distributes and/or permits others to distribute under one or more
+          trademark(s) which are controlled by Netscape but which are not
+          licensed for use under this License.
+
+          III. Netscape and logo.
+          This License does not grant any rights to use the trademarks
+          "Netscape", the "Netscape N and horizon" logo or the "Netscape
+          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
+          "Smart Browsing" even if such marks are included in the Original
+          Code or Modifications.
+
+          IV. Inability to Comply Due to Contractual Obligation.
+          Prior to licensing the Original Code under this License, Netscape
+          has licensed third party code for use in Netscape's Branded Code.
+          To the extent that Netscape is limited contractually from making
+          such third party code available under this License, Netscape may
+          choose to reintegrate such code into Covered Code without being
+          required to distribute such code in Source Code form, even if
+          such code would otherwise be considered "Modifications" under
+          this License.
+
+          V. Use of Modifications and Covered Code by Initial Developer.
+               V.1. In General.
+               The obligations of Section 3 apply to Netscape, except to
+               the extent specified in this Amendment, Section V.2 and V.3.
+
+               V.2. Other Products.
+               Netscape may include Covered Code in products other than the
+               Netscape's Branded Code which are released by Netscape
+               during the two (2) years following the release date of the
+               Original Code, without such additional products becoming
+               subject to the terms of this License, and may license such
+               additional products on different terms from those contained
+               in this License.
+
+               V.3. Alternative Licensing.
+               Netscape may license the Source Code of Netscape's Branded
+               Code, including Modifications incorporated therein, without
+               such Netscape Branded Code becoming subject to the terms of
+               this License, and may license such Netscape Branded Code on
+               different terms from those contained in this License.
+
+          VI. Litigation.
+          Notwithstanding the limitations of Section 11 above, the
+          provisions regarding litigation in Section 11(a), (b) and (c) of
+          the License shall apply to all disputes relating to this License.
+
+     EXHIBIT A-Netscape Public License.
+
+          "The contents of this file are subject to the Netscape 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/NPL/
+
+          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 Communicator client code, released
+          March 31, 1998.
+
+          The Initial Developer of the Original Code is Netscape
+          Communications Corporation. Portions created by Netscape are
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All
+          Rights Reserved.
+
+          Contributor(s): ______________________________________.
+
+          Alternatively, the contents of this file may be used under the
+          terms of the _____ license (the "[___] License"), in which case
+          the provisions of [______] License are applicable  instead of
+          those above.  If you wish to allow use of your version of this
+          file only under the terms of the [____] License and not to allow
+          others to use your version of this file under the NPL, indicate
+          your decision by deleting  the provisions above and replace  them
+          with the notice and other provisions required by the [___]
+          License.  If you do not delete the provisions above, a recipient
+          may use your version of this file under either the NPL or the
+          [___] License."
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/rules
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/rules
@@ -0,0 +1,130 @@
+#!/usr/bin/make -f
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
+DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
+DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/')
+DEBIAN_DATE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*cvs\([0-9]*\).*$$/\1/')
+
+DEBIAN_MOZ_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \([0-9a-zA-Z.]*\).*$$/\1/ p')
+
+DEBIAN_MOZ_SOURCE_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
+DEBIAN_MOZ_APPLICATION := $(shell dpkg-parsechangelog | sed -n 's/Source: \(.*\)$$/\1/ p')
+DEBIAN_MOZ_UPSTREAM_APPLICATION ?= $(DEBIAN_MOZ_APPLICATION)
+
+DEB_TAR_SRCDIR		:= mozilla
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        OPTFLAGS = -O0
+else
+        OPTFLAGS = -O2 -fno-strict-aliasing
+endif
+
+# we are modern and build with 4.2 everywhere
+CXX=g++-4.2
+CC=gcc-4.2
+export CXX CC
+
+OPTFLAGS += -g
+
+#DEB_AUTO_UPDATE_DEBIAN_CONTROL=1
+#DEB_AUTO_UPDATE_AUTOCONF=2.13
+
+include /usr/share/cdbs/1/rules/tarball.mk
+include $(CURDIR)/debian/cdbs-rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+DEB_DH_INSTALL_ARGS_thunderbird := -Xgnome -Ximgicon -Xmozlibthai
+DEB_DH_INSTALL_ARGS_thunderbird-dev := -Xnspr -Xnss
+
+DEB_CONFIGURE_USER_FLAGS= \
+        --disable-debug \
+        --disable-elf-dynstr-gc \
+        --disable-freetype2 \
+        --disable-gtktest \
+        --disable-installer \
+        --disable-profilesharing \
+        --disable-strip \
+        --disable-strip-libs \
+        --disable-tests \
+        --disable-updater \
+        --disable-xprint \
+        --enable-application=mail \
+        --enable-canvas \
+        --enable-composer \
+        --enable-default-toolkit=gtk2 \
+        --enable-extensions=default \
+        --enable-gnomevfs \
+        --enable-ldap \
+        --enable-mathml \
+        --enable-official-branding \
+        --enable-optimize="-pipe -w $(OPTFLAGS)" \
+        --enable-pango \
+        --enable-postscript \
+        --enable-svg \
+        --enable-svg-renderer=cairo \
+        --enable-system-cairo \
+        --enable-system-myspell \
+        --enable-xft \
+        --enable-xinerama \
+        --with-default-mozilla-five-home=$(LIB_DIR) \
+        --with-distribution-id=com.ubuntu \
+        --with-user-appdir=.mozilla-thunderbird \
+        --with-system-png=/usr \
+        --with-system-jpeg=/usr \
+        --with-system-zlib=/usr \
+        --with-system-nss \
+        --with-system-nspr \
+	$(NULL)
+
+USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.4.0'; a=$$?; if test $$a != 1; then echo 1; fi)
+
+# for old cairo versions we cannot use system cairo
+ifeq (1, $(USE_SYSTEM_CAIRO))
+   DEB_CONFIGURE_USER_FLAGS += \
+        --enable-system-cairo
+else
+   DEB_CONFIGURE_USER_FLAGS += \
+        --disable-system-cairo
+endif
+
+UUDECODE = \
+	$(NULL)
+
+pre-build::
+	set -e; for i in $(UUDECODE); do \
+		uudecode -o debian/$$i debian/$$i.uu; \
+		done
+	set -e; /usr/bin/docbook-to-man $(CURDIR)/debian/thunderbird.sgml > $(CURDIR)/debian/thunderbird.1
+
+clean::
+	set -e; for i in $(UUDECODE); do \
+		rm -f debian/$$i; \
+		done
+	set -e; rm -f $(CURDIR)/debian/thunderbird.1
+
+$(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz: $(DEBIAN_MOZ_UPSTREAM_APPLICATION)-$(DEBIAN_MOZ_UPSTREAM_VERSION)-source.tar.bz2
+	set -e; rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \
+		mkdir $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \
+		cp $^ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/; \
+		tar cvzf $@ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/$^ ; \
+		rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)
+
+update-orig: $(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz
+
+echox:
+	set -e; echo DEBIAN_MOZ_APPLICATION = $(DEBIAN_MOZ_APPLICATION); \
+		echo DEBIAN_MOZ_SOURCE_VERSION = $(DEBIAN_MOZ_SOURCE_VERSION)
+
+
+CFLAGS =
+CXXFLAGS =
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.sgml
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.sgml
@@ -0,0 +1,129 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexander</firstname>">
+  <!ENTITY dhsurname   "<surname>Sack</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>September 28, 2003</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>asac@jwsdot.com</email>">
+  <!ENTITY dhusername  "Alexander Sack">
+  <!ENTITY dhucpackage "<refentrytitle>THUNDERBIRD</refentrytitle>">
+  <!ENTITY dhpackage   "thunderbird">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>MPL</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym></acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose> thunderbird - Mail User Agent (MUA) and newsgroup/RSS
+        client for X11 derived from the Mozilla suite.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>thunderbird</command>
+
+      <arg><option>-P <replaceable>profile</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>Thunderbird provides IMAP/POP support, a built-in RSS reader,
+        support for HTML mail, powerful quick search, saved search
+        folders, advanced message filtering, junk mail controls,
+        message grouping, labels, return receipts, smart address book
+        LDAP address completion, import tools, and the ability to
+        manage multiple identities in email and newsgroup accounts.
+        Thunderbird provides enterprise and government grade security
+        such as S/MIME, digital signing, message encryption, and support
+        for certificates and security devices.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-P <replaceable>profile</replaceable></option>
+        </term>
+        <listitem>
+          <para>If  no profile is given to the -P option, the profile
+                manager will pop-up. You will be allowed to create or
+                select a profile.  Thunderbird then launches with the
+                selected profile.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+    <literallayout>
+The Thunderbird Homepage:
+http://www.mozilla.org/projects/thunderbird/
+
+The Debian Thunderbird FAQ:
+http://www.jwsdot.com/debian/faq.html
+</literallayout>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.manpages
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.manpages
@@ -0,0 +1 @@
+debian/thunderbird.1
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird.js
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird.js
@@ -0,0 +1,16 @@
+// This is the Debian specific preferences file for Mozilla Firefox
+// You can make any change in here, it is the purpose of this file.
+// You can, with this file and all files present in the
+// /etc/thunderbird/pref directory, override any preference that is
+// present in /usr/lib/thunderbird/defaults/pref directory.
+// While your changes will be kept on upgrade if you modify files in
+// /etc/thunderbird/pref, please note that they won't be kept if you
+// do them in /usr/lib/thunderbird/defaults/pref.
+
+pref("extensions.update.enabled", true);
+
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mail checking (gnome).
+pref("mail.shell.checkDefaultMail", false);
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/control.in
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/control.in
@@ -0,0 +1,67 @@
+Source: thunderbird
+Section: web
+Priority: optional
+Maintainer: Alexander Sack <asac@ubuntu.com>
+Build-Depends: @cdbs@, libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.8), zlib1g-dev, liborbit2-dev, libidl-dev (>= 0.8.0), zip, libxft-dev, libfreetype6-dev, libpng12-dev, libjpeg62-dev, libxrender-dev, libxinerama-dev, libcairo2-dev, libgnome2-dev, libgconf2-dev, libgnomevfs2-dev, libgnomeui-dev, sharutils, m4, binutils (>= 2.17-1) [mips mipsel], libhunspell-dev, libnss3-dev, libnspr4-dev, docbook-to-man
+Standards-Version: 3.7.2.1
+
+Package: thunderbird
+Architecture: any
+Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}
+Suggests: thunderbird-gnome-support (= ${Source-Version}), latex-xft-fonts, libthai0
+Conflicts: mozilla-thunderbird (<< 1.6~)
+Replaces: mozilla-thunderbird
+Provides: mail-reader
+Section: mail
+Description: mail/news client with RSS and integrated spam filter support
+ Thunderbird is a mail/news/RSS client. XXX Todo
+
+Package: mozilla-thunderbird
+Architecture: all
+Depends: thunderbird
+Description: Transition package for mozilla-thunderbird rename
+ Package to ease upgrading from older mozilla-thunderbird
+ package to the new thunderbird package.
+ .
+ This package can be purged at anytime once the thunderbird
+ package has been installed.
+
+
+#Package: thunderbird-dom-inspector
+#Architecture: all
+#Depends: thunderbird (>= ${source:Version}), thunderbird (<< ${source:Version}.1~)
+#Description: tool for inspecting the DOM of pages in Mozilla Thunderbird
+# This is a tool that allows you to inspect the DOM for web pages in
+# Thunderbird.  This is of great use to people who are doing Mozilla chrome
+# development for thunderbird plugins.
+
+Package: thunderbird-gnome-support
+Architecture: any
+Section: mail
+Depends: ${shlibs:Depends}, thunderbird (= ${Source-Version})
+Provides: gnome-www-browser
+Description: Support for Gnome in Mozilla Thunderbird
+ This is an extension to Thunderbird that allows it to use protocol
+ handlers from Gnome-VFS, such as smb or sftp, and other Gnome
+ integration features.
+
+Package: thunderbird-dev
+Architecture: any
+Section: mail
+Depends: thunderbird (= ${Source-Version}), thunderbird-gnome-support (= ${Source-Version})
+Conflicts: mozilla-thunderbird-dev (<< 1.6~)
+Replaces: mozilla-thunderbird-dev
+Description: Development files for Mozilla Thunderbird
+ This package contains the development headers, idl files and static libraries 
+ needed to develop applications using Mozilla Thunderbird.
+
+Package: mozilla-thunderbird-dev
+Architecture: all
+Depends: thunderbird-dev
+Description: Transition package for mozilla-thunderbird rename
+ Package to ease upgrading from older mozilla-thunderbird-dev
+ package to the new thunderbird-dev package.
+ .
+ This package can be purged at anytime once the thunderbird
+ package has been installed.
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird-dom-inspector.dirs
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird-dom-inspector.dirs
@@ -0,0 +1 @@
+usr/lib/thunderbird/extensions
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/remove.binonly.sh
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/remove.binonly.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+
+rm -fv ./build/wince/shunt/build/shunt.vcb
+rm -fv ./build/wince/shunt/build/shunt.vco
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u
+# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it:
+rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
+rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
+rm -fv ./modules/oji/tests/script/killer.exe
+rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
+rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
+rm -fv ./extensions/manticore/resources/manticore.psd
+rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc
+rm -fv ./config/bin2rc.exe
+rm -fv ./config/makedep.exe
+rm -fv ./config/mangle.exe
+rm -fv ./config/mantomak.exe
+rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
+rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx
+rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx
+rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib
+rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc
+rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc
+rm -fv ./embedding/minimo/mozconfig
+rm -fv ./embedding/qa/testembed/testembed.aps
+rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
+rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib
+rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
+rm -fv ./intl/unicharutil/tools/data/case.dat
+rm -fv ./intl/unicharutil/tools/data/cmbcl.dat
+rm -fv ./intl/unicharutil/tools/data/ctype.dat
+rm -fv ./intl/unicharutil/tools/data/decomp.dat
+rm -fv ./intl/unicharutil/tools/data/num.dat
+rm -fv ./js/src/fdlibm/fdlibm.mdp
+rm -fv ./js/src/js.mdp
+rm -fv ./js/src/liveconnect/jsj_nodl.c
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection
+rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
+rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
+rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
+rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
+rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp
+rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp
+rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script
+rm -fv ./xpinstall/test/pre_checkin.xpi
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib
+rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc
+rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp
+rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib
+rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings
+rm -fv ./gfx/src/mac/nsMacGFX.rsrc
+rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda
+rm -fv ./layout/doc/object_diagram_template.sda
+rm -fv ./layout/html/tests/block/bugs/RealSnow.jar
+rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc
+rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewer.ppob
+rm -fv ./webshell/tests/viewer/mac/viewer.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc
+rm -fv ./webshell/tests/viewer/viewer-beos.rsrc
+rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
+rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt
+rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
+
+rm -fvr other-licenses/7zstub/
+rm -fv README/mozilla/README.os2
+
+rm -fv netwerk/protocol/ftp/doc/rfc959.txt
+rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt
+
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/thunderbird-restart-required.update-notifier
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/thunderbird-restart-required.update-notifier
@@ -0,0 +1,9 @@
+Name: Thunderbird restart required
+Name-fr: Relancement de Thunderbird requis
+Priority: High
+Terminal: False
+DontShowAfterReboot: True
+Description: Thunderbird has been upgraded (or reinstalled) and must be restarted.
+ Please quit and restart your web browser now.
+Description-fr: Thunderbird a été mis à jour (ou réinstallé) et doit être relancé.
+ Veuillez quitter et redémarrer votre navigateur.
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/main-fsh
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/main-fsh
@@ -0,0 +1,35 @@
+---
+ config/autoconf.mk.in |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2006-09-14 20:07:03.000000000 +0200
++++ mozilla/config/autoconf.mk.in	2007-04-10 19:27:03.000000000 +0200
+@@ -52,23 +52,23 @@
+ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
+ MOZ_APP_VERSION = @MOZ_APP_VERSION@
+ 
+ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ 
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
+ 
+ MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
+ 
+ MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/90_fit_1024x600_am-server.xul.patch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/90_fit_1024x600_am-server.xul.patch
@@ -0,0 +1,18 @@
+Index: mozilla/mailnews/base/prefs/resources/content/am-server.xul
+===================================================================
+--- mozilla/mailnews/base/prefs/resources/content/am-server.xul	2008-09-20 14:42:56.981258832 +0000
++++ mozilla/mailnews/base/prefs/resources/content/am-server.xul	2008-09-20 14:42:56.981258832 +0000
+@@ -61,6 +61,7 @@
+ 
+   <dialogheader title="&serverSettings.label;"/>
+ 
++ <vbox flex="1" style="overflow:auto">
+   <grid>
+     <columns>
+       <column/>
+@@ -343,4 +344,5 @@
+        </template>
+      </menulist>
+    </hbox> 
++  </vbox>
+ </page>
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/ship_movemail_rdf
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/ship_movemail_rdf
@@ -0,0 +1,25 @@
+---
+ mailnews/base/ispdata/Makefile.in |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: mozilla/mailnews/base/ispdata/Makefile.in
+===================================================================
+--- mozilla.orig/mailnews/base/ispdata/Makefile.in
++++ mozilla/mailnews/base/ispdata/Makefile.in
+@@ -61,12 +61,15 @@
+ EXPORT_RESOURCE_FILES += dotmac.rdf
+ endif
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ GARBAGE		+= $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES)) 
+ 
+ ifneq ($(EXPORT_RESOURCE_FILES),$(NULL))
+-libs::
++libs:: $(EXPORT_RESOURCE_FILES)
+ 	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_FILES)) $(EXPORT_DIR)
+ 
++install:: $(EXPORT_RESOURCE_FILES)
++	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp
++	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp/US
+ endif
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/system-cairo-fix
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/system-cairo-fix
@@ -0,0 +1,28 @@
+---
+ gfx/thebes/src/Makefile.in |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: mozilla/gfx/thebes/src/Makefile.in
+===================================================================
+--- mozilla.orig/gfx/thebes/src/Makefile.in	2007-04-16 13:17:50.000000000 +0000
++++ mozilla/gfx/thebes/src/Makefile.in	2007-04-16 13:18:13.000000000 +0000
+@@ -17,16 +17,19 @@
+ 	xpcom
+ 
+ CPPSRCS	= \
+ 	gfxContext.cpp \
+ 	gfxImageSurface.cpp \
+ 	gfxPattern.cpp \
+ 	$(NULL)
+ 
++CXXFLAGS += \
++	$(TK_CFLAGS)
++
+ 
+ ifeq ($(MOZ_GFX_TOOLKIT),windows)
+ CPPSRCS	+= 	gfxWindowsSurface.cpp
+ endif
+ 
+ ifeq ($(MOZ_GFX_TOOLKIT),gtk2)
+ CPPSRCS	+= 	gfxXlibSurface.cpp
+ endif
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/syspref-folder-support
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/syspref-folder-support
@@ -0,0 +1,40 @@
+---
+ modules/libpref/src/nsPrefService.cpp |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+Index: mozilla/modules/libpref/src/nsPrefService.cpp
+===================================================================
+--- mozilla.orig/modules/libpref/src/nsPrefService.cpp	2007-02-05 01:38:32.000000000 +0000
++++ mozilla/modules/libpref/src/nsPrefService.cpp	2007-04-25 15:06:10.000000000 +0000
+@@ -753,16 +753,31 @@
+ #endif
+   };
+ 
+   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
+   if (NS_FAILED(rv)) {
+     NS_WARNING("Error parsing application default preferences.");
+   }
+ 
++  // Load files from defaults/syspref
++  nsCOMPtr<nsIFile> SysPrefDir;
++  rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++  rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref"));
++  NS_ENSURE_SUCCESS(rv, rv);
++  PRBool exists;
++  if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) {
++    rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0);
++    if (NS_FAILED(rv)) {
++      NS_WARNING("Error parsing system default preferences.");
++    }
++
++  }
++
+   // xxxbsmedberg: TODO load default prefs from a category
+   // but the architecture is not quite there yet
+ 
+   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+   if (NS_FAILED(rv)) return rv;
+ 
+   nsCOMPtr<nsISimpleEnumerator> dirList;
+   dirSvc->Get(NS_APP_PREFS_DEFAULTS_DIR_LIST,
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/ubuntu-printing-patch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/ubuntu-printing-patch
@@ -0,0 +1,131 @@
+---
+ layout/style/html.css                              |    7 +++++++
+ modules/libpref/src/init/all.js                    |    4 ++--
+ toolkit/components/printing/content/printdialog.js |    5 +++++
+ xpfe/global/resources/content/printdialog.js       |    7 ++++++-
+ 4 files changed, 20 insertions(+), 3 deletions(-)
+
+Index: mozilla/layout/style/html.css
+===================================================================
+--- mozilla.orig/layout/style/html.css	2006-08-27 21:58:15.000000000 +0000
++++ mozilla/layout/style/html.css	2007-04-17 08:51:52.000000000 +0000
+@@ -462,16 +462,23 @@
+ marquee[direction="up"], marquee[direction="down"] {
+   -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical');
+   height: 200px;
+ }
+ 
+ /* PRINT ONLY rules follow */
+ @media print {
+ 
++  body {
++    font-family: times, serif;
++  }
++  tt, pre, listing, xmp, plaintext, code, kbd, samp {
++    font-family: courier, monospace;
++  }
++
+   marquee { -moz-binding: none; }
+ 
+   /* XXX this should not be necessary, we should be stopping blinking
+      of any kind in print preview, not just the <blink> element */
+   blink {
+     text-decoration: none;
+   }
+  
+Index: mozilla/modules/libpref/src/init/all.js
+===================================================================
+--- mozilla.orig/modules/libpref/src/init/all.js	2007-01-05 01:04:33.000000000 +0000
++++ mozilla/modules/libpref/src/init/all.js	2007-04-17 08:51:52.000000000 +0000
+@@ -1882,17 +1882,17 @@
+ pref("java.private_java_version_file", "~/.java/versions");
+ pref("java.default_java_location_solaris", "/usr/j2se");
+ pref("java.default_java_location_others", "/usr/java");
+ pref("java.java_plugin_library_name", "javaplugin_oji");
+ pref("applications.telnet", "xterm -e telnet %h %p");
+ pref("applications.tn3270", "xterm -e tn3270 %h");
+ pref("applications.rlogin", "xterm -e rlogin %h");
+ pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
+-pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
++pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
+ pref("print.printer_list", ""); // list of printers, separated by spaces
+ pref("print.print_reversed", false);
+ pref("print.print_color", true);
+ pref("print.print_landscape", false);
+ pref("print.print_paper_size", 0);
+ 
+ // Enables you to specify the gap from the edge of the paper to the margin
+ // this is used by both Printing and Print Preview
+@@ -2219,17 +2219,17 @@
+ 
+ /* Xprint print module prefs */
+ pref("print.xprint.font.force_outline_scaled_fonts", true);
+ 
+ /* PostScript print module prefs */
+ // pref("print.postscript.enabled",      true);
+ pref("print.postscript.paper_size",    "letter");
+ pref("print.postscript.orientation",   "portrait");
+-pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
++pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
+ 
+ /* PostScript print module font config
+  * this list is used by the postscript font
+  * to enumerate the list of langGroups
+  * there should be a call to get the
+  * langGroups; see bug 75054
+  */
+ pref("print.postscript.nativefont.ar",             "");
+Index: mozilla/toolkit/components/printing/content/printdialog.js
+===================================================================
+--- mozilla.orig/toolkit/components/printing/content/printdialog.js	2005-03-09 18:54:03.000000000 +0000
++++ mozilla/toolkit/components/printing/content/printdialog.js	2007-04-17 08:51:52.000000000 +0000
+@@ -155,16 +155,21 @@
+           // build popup menu from printer names
+           while (aDataObject.hasMoreElements()) {
+             printerName = aDataObject.getNext();
+             printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString);
+             var printerNameStr = printerName.toString();
+             if (strDefaultPrinterName == "")
+                strDefaultPrinterName = printerNameStr;
+ 
++            // We strip PostScript/ from the front of displayed printer
++            // names.  It's a bit kludgy to do this here but at least
++            // for Ubuntu all the printers come via CUPS.
++            var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
++
+             list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
+           }
+           if (strDefaultPrinterName != "") {
+             this.listElement.removeAttribute("disabled");
+           } else {
+             var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties");
+             this.listElement.setAttribute("value", strDefaultPrinterName);
+             this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter"));
+Index: mozilla/xpfe/global/resources/content/printdialog.js
+===================================================================
+--- mozilla.orig/xpfe/global/resources/content/printdialog.js	2004-12-23 08:00:26.000000000 +0000
++++ mozilla/xpfe/global/resources/content/printdialog.js	2007-04-17 08:51:52.000000000 +0000
+@@ -155,17 +155,22 @@
+           // build popup menu from printer names
+           while (aDataObject.hasMoreElements()) {
+             printerName = aDataObject.getNext();
+             printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString);
+             var printerNameStr = printerName.toString();
+             if (strDefaultPrinterName == "")
+                strDefaultPrinterName = printerNameStr;
+ 
+-            list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
++            // We strip PostScript/ from the front of displayed printer
++            // names.  It's a bit kludgy to do this here but at least
++            // for Ubuntu all the printers come via CUPS.
++            var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
++
++            list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
+           }
+           if (strDefaultPrinterName != "") {
+             this.listElement.removeAttribute("disabled");
+           } else {
+             var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties");
+             this.listElement.setAttribute("value", strDefaultPrinterName);
+             this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter"));
+ 
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/82_prefs.dpatch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/82_prefs.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 82_prefs.dpatch by Mike Hommey <glandium@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix font defaults.
+## DP: Set javascript.options.showInConsole. (DROPPED FROM ICEDOVE PATCH)
+
+@DPATCH@
+
+=== modules/libpref/src/init/all.js
+==================================================================
+--- xulrunner/modules/libpref/src/init/all.js	(revision 67)
++++ xulrunner/modules/libpref/src/init/all.js	(local)
+@@ -1872,33 +1873,33 @@
+ 
+ // th
+ 
+-pref("font.name.serif.tr", "Times");
+-pref("font.name.sans-serif.tr", "Helvetica");
+-pref("font.name.monospace.tr", "Courier");
++pref("font.name.serif.tr", "serif");
++pref("font.name.sans-serif.tr", "sans-serif");
++pref("font.name.monospace.tr", "monospace");
+ 
+ pref("font.name.serif.x-baltic", "serif");
+ pref("font.name.sans-serif.x-baltic", "sans-serif");
+ pref("font.name.monospace.x-baltic", "monospace");
+ 
+-pref("font.name.serif.x-central-euro", "Times");
+-pref("font.name.sans-serif.x-central-euro", "Helvetica");
+-pref("font.name.monospace.x-central-euro", "Courier");
++pref("font.name.serif.x-central-euro", "serif");
++pref("font.name.sans-serif.x-central-euro", "sans-serif");
++pref("font.name.monospace.x-central-euro", "monospace");
+ 
+ pref("font.name.serif.x-cyrillic", "serif");
+ pref("font.name.sans-serif.x-cyrillic", "sans-serif");
+ pref("font.name.monospace.x-cyrillic", "monospace");
+ 
+-pref("font.name.serif.x-unicode", "Times");
+-pref("font.name.sans-serif.x-unicode", "Helvetica");
+-pref("font.name.monospace.x-unicode", "Courier");
++pref("font.name.serif.x-unicode", "serif");
++pref("font.name.sans-serif.x-unicode", "sans-serif");
++pref("font.name.monospace.x-unicode", "monospace");
+ 
+-pref("font.name.serif.x-user-def", "Times");
+-pref("font.name.sans-serif.x-user-def", "Helvetica");
+-pref("font.name.monospace.x-user-def", "Courier");
++pref("font.name.serif.x-user-def", "serif");
++pref("font.name.sans-serif.x-user-def", "sans-serif");
++pref("font.name.monospace.x-user-def", "monospace");
+ 
+-pref("font.name.serif.x-western", "Times");
+-pref("font.name.sans-serif.x-western", "Helvetica");
+-pref("font.name.monospace.x-western", "Courier");
++pref("font.name.serif.x-western", "serif");
++pref("font.name.sans-serif.x-western", "sans-serif");
++pref("font.name.monospace.x-western", "monospace");
+ 
+ pref("font.name.serif.zh-CN", "serif");
+ pref("font.name.sans-serif.zh-CN", "sans-serif");
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/series
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/series
@@ -0,0 +1,20 @@
+main-fsh
+system-cairo-fix
+ubuntu-look-and-feel-report-a-bug-menuitem
+gnome-mime-handling
+bz335810-pango-cursor-up-down-fix
+ubuntu-printing-patch
+mailnews_mime_export
+moz-user-dir-for-xre-profiles
+hunspell-support
+syspref-folder-support
+reply-to-list-support
+82_prefs.dpatch
+90_fit_1024x600_mailnews_abCardOverlay.xul.patch
+90_fit_1024x600_AccountManager.dtd.patch
+90_fit_1024x600_am-server.xul.patch
+force-no-pragma-visibility-for-gcc-4.2_4.3
+ship_movemail_rdf
+bz344818_att264996_detect_xrender
+bz280419_att_267284-readonly-download.patch
+autoconf-regen
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/90_fit_1024x600_mailnews_abCardOverlay.xul.patch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/90_fit_1024x600_mailnews_abCardOverlay.xul.patch
@@ -0,0 +1,232 @@
+Index: mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul
+===================================================================
+--- mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul	2008-08-20 06:08:35.517829862 +0000
++++ mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul	2008-08-20 06:16:37.469834511 +0000
+@@ -65,14 +65,19 @@
+       <vbox index="name" flex="1">
+       <groupbox flex="1">
+         <caption label="&Name.box;"/>
+-        <vbox>
++        <grid>
++	 <columns>
++	  <column />
++	  <column />
++	 </columns>
+ 
+         <!-- LOCALIZATION NOTE: 
+         NameField1, NameField2, PhoneticField1, PhoneticField2
+         those fields are either LN or FN depends on the target country.
+         They are configurable in the .dtd file. 
+         -->
+-
++	 <rows>
++	  <row>
+           <hbox>
+             <spacer flex="1"/>
+             <label control="&NameField1.id;" value="&NameField1.label;" accesskey="&NameField1.accesskey;" class="CardEditLabel"/>
+@@ -105,6 +110,8 @@
+               <textbox id="&PhoneticField2.id;" flex="1" hidden="true"/>
+             </hbox>
+           </hbox>
++	  </row>
++	  <row>
+           <hbox>
+             <spacer flex="1"/>
+             <label control="DisplayName" value="&DisplayName.label;" accesskey="&DisplayName.accesskey;" class="CardEditLabel"/>
+@@ -119,24 +126,28 @@
+               <textbox id="NickName" flex="1"/>
+             </hbox>
+           </hbox>
+-        </vbox>
++	  </row>
++	 </rows>
++        </grid>
+       </groupbox>
+ 
+       <groupbox flex="1">
+         <caption label="&Internet.box;"/>
+         <vbox>
+           <hbox>
+-            <spacer flex="1"/>
+-            <label control="PrimaryEmail" value="&PrimaryEmail.label;" accesskey="&PrimaryEmail.accesskey;"  class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="PrimaryEmail" flex="1" class="uri-element"/>
++            <hbox>
++              <spacer flex="1"/>
++              <label control="PrimaryEmail" value="&PrimaryEmail.label;" accesskey="&PrimaryEmail.accesskey;"  class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="PrimaryEmail" flex="1" class="uri-element"/>
++              </hbox>
+             </hbox>
+-          </hbox>
+-          <hbox id="secondaryEmailContainer">
+-            <spacer flex="1"/>
+-            <label control="SecondEmail" value="&SecondEmail.label;" accesskey="&SecondEmail.accesskey;" class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="SecondEmail" flex="1" class="uri-element"/>
++            <hbox id="secondaryEmailContainer">
++              <spacer flex="1"/>
++              <label control="SecondEmail" value="&SecondEmail.label;" accesskey="&SecondEmail.accesskey;" class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="SecondEmail" flex="1" class="uri-element"/>
++              </hbox>
+             </hbox>
+           </hbox>
+           <hbox id="screenNameContainer">
+@@ -167,19 +178,22 @@
+         <caption label="&Phones.box;"/>
+         <vbox>
+           <hbox>
+-            <spacer flex="1"/>
+-            <label control="WorkPhone" value="&WorkPhone.label;" accesskey="&WorkPhone.accesskey;" class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="WorkPhone" flex="1"/>
++            <hbox>
++              <spacer flex="1"/>
++              <label control="WorkPhone" value="&WorkPhone.label;" accesskey="&WorkPhone.accesskey;" class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="WorkPhone" flex="1"/>
++              </hbox>
+             </hbox>
+-          </hbox>
+-          <hbox>
+-            <spacer flex="1"/>
+-            <label control="HomePhone" value="&HomePhone.label;" accesskey="&HomePhone.accesskey;" class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="HomePhone" flex="1"/>
++            <hbox>
++              <spacer flex="1"/>
++              <label control="HomePhone" value="&HomePhone.label;" accesskey="&HomePhone.accesskey;" class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="HomePhone" flex="1"/>
++              </hbox>
+             </hbox>
+           </hbox>
++	  <hbox>
+           <hbox>
+             <spacer flex="1"/>
+             <label control="FaxNumber" value="&FaxNumber.label;" accesskey="&FaxNumber.accesskey;" class="CardEditLabel"/>
+@@ -194,6 +208,7 @@
+               <textbox id="PagerNumber" flex="1"/>
+             </hbox>
+           </hbox>
++          </hbox>
+           <hbox>
+             <spacer flex="1"/>
+             <label control="CellularNumber" value="&CellularNumber.label;" accesskey="&CellularNumber.accesskey;" class="CardEditLabel"/>
+@@ -210,6 +225,7 @@
+       <groupbox id="homeAddressGroup" flex="1">
+         <caption label="&Home.box;"/>
+         <vbox>
++	  <hbox>
+           <hbox>
+             <spacer flex="1"/>
+             <label control="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/>
+@@ -224,24 +240,28 @@
+               <textbox id="HomeAddress2" flex="1"/>
+             </hbox>
+           </hbox>
+-          <hbox>
+-            <spacer flex="1"/>
+-            <label control="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="HomeCity" flex="1"/>
+-            </hbox>
+           </hbox>
+           <hbox>
+-            <spacer flex="1"/>
+-            <label control="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="HomeState" flex="1"/>
+-              <spacer class="stateZipSpacer"/>
+-              <label control="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
+-              <textbox id="HomeZipCode" flex="1"/>
++            <hbox>
++              <spacer flex="1"/>
++              <label control="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="HomeCity" flex="1"/>
++              </hbox>
++            </hbox>
++            <hbox>
++              <spacer flex="1"/>
++              <label control="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
++              <hbox class="CardEditWidth">
++                <textbox id="HomeState" flex="1"/>
++                <spacer class="stateZipSpacer"/>
++                <label control="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
++                <textbox id="HomeZipCode" flex="1"/>
++              </hbox>
+             </hbox>
+           </hbox>
+           <hbox>
++          <hbox>
+             <spacer flex="1"/>
+             <label control="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/>
+             <hbox class="CardEditWidth">
+@@ -255,6 +275,7 @@
+               <textbox id="WebPage2" flex="1" class="uri-element"/>
+             </hbox>
+           </hbox>
++          </hbox>
+         </vbox>
+       </groupbox>
+ 
+@@ -283,6 +304,7 @@
+               </hbox>
+             </hbox>
+             <hbox>
++            <hbox>
+               <spacer flex="1"/>
+               <label control="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/>
+               <hbox class="CardEditWidth">
+@@ -296,24 +318,28 @@
+                 <textbox id="WorkAddress2" flex="1"/>
+               </hbox>
+             </hbox>
+-            <hbox>
+-              <spacer flex="1"/>
+-              <label control="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
+-              <hbox class="CardEditWidth">
+-                <textbox id="WorkCity" flex="1"/>
+-              </hbox>
+             </hbox>
+             <hbox>
+-              <spacer flex="1"/>
+-              <label control="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
+-              <hbox class="CardEditWidth">
+-                <textbox id="WorkState" flex="1"/>
+-                <spacer class="stateZipSpacer"/>
+-                <label control="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
+-                <textbox id="WorkZipCode" flex="1"/>
++              <hbox>
++                <spacer flex="1"/>
++                <label control="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
++                <hbox class="CardEditWidth">
++                  <textbox id="WorkCity" flex="1"/>
++                </hbox>
++              </hbox>
++              <hbox>
++                <spacer flex="1"/>
++                <label control="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
++                <hbox class="CardEditWidth">
++                  <textbox id="WorkState" flex="1"/>
++                  <spacer class="stateZipSpacer"/>
++                  <label control="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
++                  <textbox id="WorkZipCode" flex="1"/>
++                </hbox>
+               </hbox>
+             </hbox>
+             <hbox>
++            <hbox>
+               <spacer flex="1"/>
+               <label control="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/>
+               <hbox class="CardEditWidth">
+@@ -327,6 +353,7 @@
+                 <textbox id="WebPage1" flex="1" class="uri-element"/>
+               </hbox>
+             </hbox>
++            </hbox>
+           </vbox>
+         </groupbox>
+       </vbox>
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/gnome-mime-handling
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/gnome-mime-handling
@@ -0,0 +1,380 @@
+=== uriloader/exthandler/Makefile.in
+==================================================================
+--- xulrunner/uriloader/exthandler/Makefile.in	(revision 116)
++++ xulrunner/uriloader/exthandler/Makefile.in	(local)
+@@ -102,7 +102,7 @@
+ LOCAL_INCLUDES = -I$(srcdir)
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+-OSHELPER	+= nsGNOMERegistry.cpp
++OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+=== uriloader/exthandler/unix/nsGNOMERegistry.cpp
+--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(local)
+@@ -42,7 +42,6 @@
+ #include "nsString.h"
+ #include "nsIComponentManager.h"
+ #include "nsILocalFile.h"
+-#include "nsMIMEInfoImpl.h"
+ #include "nsAutoPtr.h"
+ 
+ #include <glib.h>
+@@ -56,12 +55,12 @@
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
+ 
+-typedef struct {
++struct GnomeVFSMimeApplication {
+   char *id;
+   char *name;
+   char *command;
+   /* there is more here, but we don't need it */
+-} GnomeVFSMimeApplication;
++};
+ 
+ typedef GConfClient * (*_gconf_client_get_default_fn)();
+ typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
+@@ -264,7 +263,7 @@
+ }
+ 
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromExtension(const char *aFileExt)
+ {
+   if (!gconfLib)
+@@ -286,7 +285,7 @@
+   return GetFromType(mimeType);
+ }
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromType(const char *aMIMEType)
+ {
+   if (!gconfLib)
+@@ -296,7 +295,7 @@
+   if (!handlerApp)
+     return nsnull;
+ 
+-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
++  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
+   NS_ENSURE_TRUE(mimeInfo, nsnull);
+ 
+   // Get the list of extensions and append then to the mimeInfo.
+@@ -320,11 +319,21 @@
+     return nsnull;
+   }
+ 
+-  gchar *commandPath = g_find_program_in_path(nativeCommand);
++  gchar **argv;
++  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
++  if (!res) {
++    NS_ERROR("Could not convert helper app command to filesystem encoding");
++    _gnome_vfs_mime_application_free(handlerApp);
++    return nsnull;
++  }
+ 
++  gchar *commandPath = g_find_program_in_path(argv[0]);
++
+   g_free(nativeCommand);
++  g_strfreev(argv);
+ 
+   if (!commandPath) {
++    NS_WARNING("could not find command in path");
+     _gnome_vfs_mime_application_free(handlerApp);
+     return nsnull;
+   }
+@@ -342,7 +351,7 @@
+ 
+   _gnome_vfs_mime_application_free(handlerApp);
+ 
+-  nsMIMEInfoBase* retval;
++  nsMIMEInfoUnix* retval;
+   NS_ADDREF((retval = mimeInfo));
+   return retval;
+ }
+=== uriloader/exthandler/unix/nsGNOMERegistry.h
+--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(local)
+@@ -35,10 +35,13 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#ifndef nsGNOMERegistry_h__
++#define nsGNOMERegistry_h__
++
+ #include "nsIURI.h"
+ #include "nsCOMPtr.h"
+ 
+-class nsMIMEInfoBase;
++#include "nsMIMEInfoUnix.h"
+ 
+ class nsGNOMERegistry
+ {
+@@ -52,7 +55,9 @@
+   static void GetAppDescForScheme(const nsACString& aScheme,
+                                   nsAString& aDesc);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
+ };
++
++#endif // nsGNOMERegistry_h__
+=== uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(local)
+@@ -0,0 +1,196 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.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
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsMIMEInfoUnix.h"
++#include "prlink.h"
++#include "prmem.h"
++#include <glib.h>
++#include <glib-object.h>
++
++static PRLibrary *gnomeLib;
++static PRLibrary *vfsLib;
++
++typedef struct _GnomeProgram GnomeProgram;
++typedef struct _GnomeModuleInfo GnomeModuleInfo;
++
++typedef enum {
++  GNOME_VFS_OK // there's more but we don't care about them.
++} GnomeVFSResult;
++
++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
++                              (GnomeVFSMimeApplication *app,
++                               GList *uris);
++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
++						 const GnomeModuleInfo *, int,
++						 char **, const char *, ...);
++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
++typedef GnomeProgram * (*_gnome_program_get_fn)();
++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
++
++#define DECL_FUNC_PTR(func) static _##func##_fn _##func
++
++DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
++DECL_FUNC_PTR(gnome_vfs_mime_application_free);
++DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
++DECL_FUNC_PTR(gnome_program_init);
++DECL_FUNC_PTR(gnome_program_get);
++DECL_FUNC_PTR(libgnome_module_info_get);
++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
++
++static PRLibrary *
++LoadVersionedLibrary(const char* libName, const char* libVersion)
++{
++  char *platformLibName = PR_GetLibraryName(nsnull, libName);
++  nsCAutoString versionLibName(platformLibName);
++  versionLibName.Append(libVersion);
++  PR_Free(platformLibName);
++  return PR_LoadLibrary(versionLibName.get());
++}
++
++static void
++Cleanup()
++{
++  // Unload all libraries
++  if (gnomeLib)
++    PR_UnloadLibrary(gnomeLib);
++  if (vfsLib)
++    PR_UnloadLibrary(vfsLib);
++
++  gnomeLib = vfsLib = nsnull;
++}
++
++static void
++InitGnomeVFS()
++{
++  static PRBool initialized = PR_FALSE;
++
++  if (initialized)
++    return;
++
++  #define ENSURE_LIB(lib) \
++    PR_BEGIN_MACRO \
++    if (!lib) { \
++      Cleanup(); \
++      return; \
++    } \
++    PR_END_MACRO
++
++  #define GET_LIB_FUNCTION(lib, func, failure) \
++    PR_BEGIN_MACRO \
++    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
++    if (!_##func) { \
++      failure; \
++    } \
++    PR_END_MACRO
++
++  // Attempt to open libgnome
++  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
++  ENSURE_LIB(gnomeLib);
++
++  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
++  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
++  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
++
++  // Attempt to open libgnomevfs
++  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
++  ENSURE_LIB(vfsLib);
++
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
++  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
++
++  // Initialize GNOME, if it's not already initialized.  It's not
++  // necessary to tell GNOME about our actual command line arguments.
++
++  if (!_gnome_program_get()) {
++    char *argv[1] = { "gecko" };
++    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
++                        1, argv, NULL);
++  }
++
++  // Note: after GNOME has been initialized, do not ever unload these
++  // libraries.  They register atexit handlers, so if they are unloaded, we'll
++  // crash on exit.  
++}
++
++void
++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
++{
++  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
++    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
++
++    mPreferredAction = nsIMIMEInfo::useSystemDefault;
++
++    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
++    if (name) 
++      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
++  }
++}
++
++nsMIMEInfoUnix::~nsMIMEInfoUnix()
++{
++  if (mDefaultVFSApplication)
++    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
++}
++
++nsresult
++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
++{
++  NS_ENSURE_ARG_POINTER(aFile);
++
++  InitGnomeVFS();
++
++  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
++    nsCAutoString nativePath;
++    aFile->GetNativePath(nativePath);
++
++    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
++
++    GList *uris = NULL;
++    uris = g_list_append(uris, uri);
++
++    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
++
++    g_free(uri);
++    g_list_free(uris);
++
++    if (result != GNOME_VFS_OK)
++      return NS_ERROR_FAILURE;
++
++    return NS_OK;
++  }
++
++  if (!mDefaultApplication)
++    return NS_ERROR_FILE_NOT_FOUND;
++
++  return LaunchWithIProcess(mDefaultApplication, aFile);
++}
+=== uriloader/exthandler/unix/nsMIMEInfoUnix.h
+--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(local)
+@@ -0,0 +1,48 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.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
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nsMimeInfoUnix_h__
++#define nsMimeInfoUnix_h__
++
++#include "nsMIMEInfoImpl.h"
++
++struct GnomeVFSMimeApplication;
++
++class nsMIMEInfoUnix : public nsMIMEInfoImpl
++{
++public:
++  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
++  virtual ~nsMIMEInfoUnix();
++
++  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
++
++protected:
++  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
++
++  GnomeVFSMimeApplication *mDefaultVFSApplication;
++};
++ 
++#endif // nsMimeInfoUnix_h__
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/autoconf-regen
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/autoconf-regen
@@ -0,0 +1,9612 @@
+---
+ configure | 1716 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 916 insertions(+), 800 deletions(-)
+
+Index: mozilla/configure
+===================================================================
+--- mozilla.orig/configure
++++ mozilla/configure
+@@ -55,16 +55,18 @@
+                           Use system libjpeg [installed at prefix PFX]"
+ ac_help="$ac_help
+   --with-system-zlib[=PFX]
+                           Use system libz [installed at prefix PFX]"
+ ac_help="$ac_help
+   --with-system-png[=PFX]
+                           Use system libpng [installed at prefix PFX]"
+ ac_help="$ac_help
++  --enable-system-myspell   Use system myspell (located with pkgconfig)"
++ac_help="$ac_help
+   --with-java-include-path=dir   Location of Java SDK headers"
+ ac_help="$ac_help
+   --with-java-bin-path=dir   Location of Java binaries (java, javac, jar)"
+ ac_help="$ac_help
+   --enable-default-toolkit=TK
+                           Select default toolkit
+                           Platform specific defaults:
+                             BeOS - beos
+@@ -955,17 +957,17 @@
+ 
+ 
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:964: checking host system type" >&5
++echo "configure:966: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+ NONE)
+   case $nonopt in
+   NONE)
+     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+@@ -976,17 +978,17 @@
+ 
+ host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 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:987: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+ NONE)
+   case $nonopt in
+   NONE) target_alias=$host_alias ;;
+   *) target_alias=$nonopt ;;
+   esac ;;
+@@ -994,17 +996,17 @@
+ 
+ target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+ target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 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:1005: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+ NONE)
+   case $nonopt in
+   NONE) build_alias=$host_alias ;;
+   *) build_alias=$nonopt ;;
+   esac ;;
+@@ -1064,22 +1066,22 @@
+ WINDRES_VERSION=2.14.90
+ W32API_VERSION=2.4
+ GNOMEVFS_VERSION=2.0
+ GNOMEUI_VERSION=2.2.0
+ GCONF_VERSION=1.2.1
+ LIBGNOME_VERSION=2.0
+ 
+ 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:1080: 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
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1167,17 +1169,17 @@
+ fi
+ 
+ 
+ for ac_prog in nsinstall 
+ 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:1176: checking for $ac_word" >&5
++echo "configure:1178: 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
+   case "$NSINSTALL_BIN" in
+   /*)
+   ac_cv_path_NSINSTALL_BIN="$NSINSTALL_BIN" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -1209,17 +1211,17 @@
+ 
+ if test -z "$COMPILE_ENVIRONMENT"; then
+ if test -z "$NSINSTALL_BIN" || test "$NSINSTALL_BIN" = ":"; then
+    for ac_prog in $PYTHON python
+ 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:1218: checking for $ac_word" >&5
++echo "configure:1220: 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
+   case "$PYTHON" in
+   /*)
+   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -1280,23 +1282,23 @@
+     echo "cross compiling from $host to $target"
+     cross_compiling=yes
+ 
+     _SAVE_CC="$CC"
+     _SAVE_CFLAGS="$CFLAGS"
+     _SAVE_LDFLAGS="$LDFLAGS"
+ 
+     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
+-echo "configure:1289: checking for host c compiler" >&5
++echo "configure:1291: checking for host c compiler" >&5
+     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1295: checking for $ac_word" >&5
++echo "configure:1297: 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
+   if test -n "$HOST_CC"; then
+   ac_cv_prog_HOST_CC="$HOST_CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1321,23 +1323,23 @@
+ done
+ test -n "$HOST_CC" || HOST_CC=""""
+ 
+     if test -z "$HOST_CC"; then
+         { echo "configure: error: no acceptable c compiler found in \$PATH" 1>&2; exit 1; }
+     fi
+     echo "$ac_t""$HOST_CC" 1>&6
+     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
+-echo "configure:1330: checking for host c++ compiler" >&5
++echo "configure:1332: checking for host c++ compiler" >&5
+     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1336: checking for $ac_word" >&5
++echo "configure:1338: 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
+   if test -n "$HOST_CXX"; then
+   ac_cv_prog_HOST_CXX="$HOST_CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1376,17 +1378,17 @@
+     if test -z "$HOST_LDFLAGS"; then
+         HOST_LDFLAGS="$LDFLAGS"
+     fi
+     for ac_prog in $HOST_RANLIB ranlib
+ 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:1385: checking for $ac_word" >&5
++echo "configure:1387: 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
+   if test -n "$HOST_RANLIB"; then
+   ac_cv_prog_HOST_RANLIB="$HOST_RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy=":"
+@@ -1411,17 +1413,17 @@
+ done
+ test -n "$HOST_RANLIB" || HOST_RANLIB="ranlib"
+ 
+     for ac_prog in $HOST_AR ar
+ 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:1420: checking for $ac_word" >&5
++echo "configure:1422: 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
+   if test -n "$HOST_AR"; then
+   ac_cv_prog_HOST_AR="$HOST_AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy=":"
+@@ -1446,50 +1448,50 @@
+ done
+ test -n "$HOST_AR" || HOST_AR="ar"
+ 
+     CC="$HOST_CC"
+     CFLAGS="$HOST_CFLAGS"
+     LDFLAGS="$HOST_LDFLAGS"
+ 
+     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
++echo "configure:1457: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 1457 "configure"
++#line 1459 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1466: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: installation or configuration problem: host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+ 
+     CC="$HOST_CXX"
+     CFLAGS="$HOST_CXXFLAGS"
+ 
+     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
++echo "configure:1481: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 1481 "configure"
++#line 1483 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1490: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: installation or configuration problem: host compiler $HOST_CXX cannot create executables." 1>&2; exit 1; } 
+ fi
+@@ -1508,17 +1510,17 @@
+         ;;
+     esac
+ 
+     for ac_prog in $CC "${target_alias}-gcc" "${target}-gcc"
+ 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:1517: checking for $ac_word" >&5
++echo "configure:1519: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1542,17 +1544,17 @@
+ test -n "$CC" && break
+ done
+ test -n "$CC" || CC=":"
+ 
+     unset ac_cv_prog_CC
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1551: checking for $ac_word" >&5
++echo "configure:1553: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1572,17 +1574,17 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1581: checking for $ac_word" >&5
++echo "configure:1583: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+@@ -1623,17 +1625,17 @@
+ fi
+ 
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1632: checking for $ac_word" >&5
++echo "configure:1634: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1655,33 +1657,33 @@
+ fi
+  ;;
+     esac
+   fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1666: 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.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1675 "configure"
++#line 1677 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1682: \"$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
+     ac_cv_prog_cc_cross=no
+   else
+     ac_cv_prog_cc_cross=yes
+   fi
+ else
+@@ -1697,31 +1699,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1708: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1711: checking whether we are using GNU C" >&5
++echo "configure:1713: 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
+   cat > conftest.c <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1722: \"$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
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
+@@ -1730,17 +1732,17 @@
+ else
+   GCC=
+ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1741: 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
+   echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+   ac_cv_prog_cc_g=no
+@@ -1766,17 +1768,17 @@
+   fi
+ fi
+ 
+     for ac_prog in $CXX "${target_alias}-g++" "${target}-g++"
+ 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:1775: checking for $ac_word" >&5
++echo "configure:1777: 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
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1802,17 +1804,17 @@
+ test -n "$CXX" || CXX=":"
+ 
+     unset ac_cv_prog_CXX
+     for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+ 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:1811: checking for $ac_word" >&5
++echo "configure:1813: 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
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1834,33 +1836,33 @@
+ fi
+ 
+ test -n "$CXX" && break
+ done
+ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1845: 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.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1854 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1861: \"$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
+     ac_cv_prog_cxx_cross=no
+   else
+     ac_cv_prog_cxx_cross=yes
+   fi
+ else
+@@ -1876,31 +1878,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1887: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1890: checking whether we are using GNU C++" >&5
++echo "configure:1892: 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
+   cat > conftest.C <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1901: \"$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
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+ 
+@@ -1909,17 +1911,17 @@
+ else
+   GXX=
+ fi
+ 
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:1920: 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
+   echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+   ac_cv_prog_cxx_g=yes
+ else
+   ac_cv_prog_cxx_g=no
+@@ -1940,81 +1942,30 @@
+ else
+   if test "$GXX" = yes; then
+     CXXFLAGS="-O2"
+   else
+     CXXFLAGS=
+   fi
+ fi
+ 
+-for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   '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 <<EOF
+-#line 1959 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  continue
+-fi
+-rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#line 1977 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1984: \"$ac_compile\") 1>&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*)
+                                 CFLAGS=$_SAVE_CFLAGS
+         CXXFLAGS=$_SAVE_CXXFLAGS
+         ;;
+     esac
+ 
+     for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib"
+ 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:2013: checking for $ac_word" >&5
++echo "configure:1964: 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
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2039,17 +1990,17 @@
+ done
+ test -n "$RANLIB" || RANLIB=":"
+ 
+     for ac_prog in $AR "${target_alias}-ar" "${target}-ar"
+ 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:2048: checking for $ac_word" >&5
++echo "configure:1999: 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
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2074,17 +2025,17 @@
+ done
+ test -n "$AR" || AR=":"
+ 
+     for ac_prog in $AS "${target_alias}-as" "${target}-as"
+ 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:2083: checking for $ac_word" >&5
++echo "configure:2034: 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
+   case "$AS" in
+   /*)
+   ac_cv_path_AS="$AS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -2115,17 +2066,17 @@
+ done
+ test -n "$AS" || AS=":"
+ 
+     for ac_prog in $LD "${target_alias}-ld" "${target}-ld"
+ 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:2124: checking for $ac_word" >&5
++echo "configure:2075: 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
+   if test -n "$LD"; then
+   ac_cv_prog_LD="$LD" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2150,17 +2101,17 @@
+ done
+ test -n "$LD" || LD=":"
+ 
+     for ac_prog in $STRIP "${target_alias}-strip" "${target}-strip"
+ 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:2159: checking for $ac_word" >&5
++echo "configure:2110: 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
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2185,17 +2136,17 @@
+ done
+ test -n "$STRIP" || STRIP=":"
+ 
+     for ac_prog in $WINDRES "${target_alias}-windres" "${target}-windres"
+ 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:2194: checking for $ac_word" >&5
++echo "configure:2145: 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
+   if test -n "$WINDRES"; then
+   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2223,17 +2174,17 @@
+     cat >> confdefs.h <<\EOF
+ #define CROSS_COMPILE 1
+ EOF
+ 
+ else
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2232: checking for $ac_word" >&5
++echo "configure:2183: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2253,17 +2204,17 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2262: checking for $ac_word" >&5
++echo "configure:2213: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+@@ -2304,17 +2255,17 @@
+ fi
+ 
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2313: checking for $ac_word" >&5
++echo "configure:2264: 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
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2336,33 +2287,33 @@
+ fi
+  ;;
+     esac
+   fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2296: 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.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2356 "configure"
++#line 2307 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2312: \"$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
+     ac_cv_prog_cc_cross=no
+   else
+     ac_cv_prog_cc_cross=yes
+   fi
+ else
+@@ -2378,31 +2329,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2338: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2392: checking whether we are using GNU C" >&5
++echo "configure:2343: 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
+   cat > conftest.c <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2352: \"$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
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
+@@ -2411,17 +2362,17 @@
+ else
+   GCC=
+ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2371: 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
+   echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+   ac_cv_prog_cc_g=no
+@@ -2447,17 +2398,17 @@
+   fi
+ fi
+ 
+     for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+ 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:2456: checking for $ac_word" >&5
++echo "configure:2407: 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
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2479,33 +2430,33 @@
+ fi
+ 
+ test -n "$CXX" && break
+ done
+ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2439: 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.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2499 "configure"
++#line 2450 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2455: \"$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
+     ac_cv_prog_cxx_cross=no
+   else
+     ac_cv_prog_cxx_cross=yes
+   fi
+ else
+@@ -2521,31 +2472,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2481: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2535: checking whether we are using GNU C++" >&5
++echo "configure:2486: 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
+   cat > conftest.C <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2495: \"$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
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+ 
+@@ -2554,17 +2505,17 @@
+ else
+   GXX=
+ fi
+ 
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2514: 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
+   echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+   ac_cv_prog_cxx_g=yes
+ else
+   ac_cv_prog_cxx_g=no
+@@ -2585,71 +2536,20 @@
+ else
+   if test "$GXX" = yes; then
+     CXXFLAGS="-O2"
+   else
+     CXXFLAGS=
+   fi
+ fi
+ 
+-for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   '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 <<EOF
+-#line 2604 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  continue
+-fi
+-rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#line 2622 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-
+     # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2648: checking for $ac_word" >&5
++echo "configure:2548: 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
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2671,17 +2571,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     for ac_prog in $AS as
+ 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:2680: checking for $ac_word" >&5
++echo "configure:2580: 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
+   case "$AS" in
+   /*)
+   ac_cv_path_AS="$AS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -2712,17 +2612,17 @@
+ done
+ test -n "$AS" || AS="$CC"
+ 
+     for ac_prog in ar
+ 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:2721: checking for $ac_word" >&5
++echo "configure:2621: 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
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2747,17 +2647,17 @@
+ done
+ test -n "$AR" || AR=":"
+ 
+     for ac_prog in ld
+ 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:2756: checking for $ac_word" >&5
++echo "configure:2656: 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
+   if test -n "$LD"; then
+   ac_cv_prog_LD="$LD" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2782,17 +2682,17 @@
+ done
+ test -n "$LD" || LD=":"
+ 
+     for ac_prog in strip
+ 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:2791: checking for $ac_word" >&5
++echo "configure:2691: 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
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2817,17 +2717,17 @@
+ done
+ test -n "$STRIP" || STRIP=":"
+ 
+     for ac_prog in windres
+ 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:2826: checking for $ac_word" >&5
++echo "configure:2726: 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
+   if test -n "$WINDRES"; then
+   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2906,17 +2806,17 @@
+     if test "$GCC" != "yes"; then
+         # Check to see if we are really running in a msvc environemnt
+         _WIN32_MSVC=1
+         for ac_prog in midl
+ 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:2915: checking for $ac_word" >&5
++echo "configure:2815: 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
+   if test -n "$MIDL"; then
+   ac_cv_prog_MIDL="$MIDL" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2948,24 +2848,24 @@
+         ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2957 "configure"
++#line 2857 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+  printf("Hello World\n"); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2864: \"$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*
+   { echo "configure: error: \$(CC) test failed.  You must have MS VC++ in your path to build." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -2973,24 +2873,24 @@
+         ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2982 "configure"
++#line 2882 "configure"
+ #include "confdefs.h"
+ #include <new.h>
+ int main() {
+  unsigned *test = new unsigned(42); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2889: \"$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*
+   { echo "configure: error: \$(CXX) test failed.  You must have MS VC++ in your path to build." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -3036,17 +2936,17 @@
+ 
+         # Check midl version
+         _MIDL_FULL_VERSION=`"${MIDL}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`
+         _MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
+         _MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
+         _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
+          # Add flags if necessary
+          echo $ac_n "checking for midl flags""... $ac_c" 1>&6
+-echo "configure:3045: checking for midl flags" >&5
++echo "configure:2945: 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
+              # compatible with versions of Windows older than Win2k.
+              # This switches us back to the old behaviour. When we drop
+              # support for Windows older than Win2k, we should remove
+              # this.
+              MIDL_FLAGS="${MIDL_FLAGS} -no_robust"
+@@ -3058,47 +2958,47 @@
+         
+         unset _MSVC_VER_FILTER
+         
+     else
+         # Check w32api version
+         _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
+         _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
+         echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
+-echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5
++echo "configure:2967: checking for w32api version >= $W32API_VERSION" >&5
+         cat > conftest.$ac_ext <<EOF
+-#line 3069 "configure"
++#line 2969 "configure"
+ #include "confdefs.h"
+ #include <w32api.h>
+ int main() {
+ #if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \
+                 (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \
+                  __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION)
+                 #error "test failed."
+             #endif
+             
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    res=yes 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+    res=no 
+ fi
+ rm -f conftest*
+         echo "$ac_t""$res" 1>&6
+         if test "$res" != "yes"; then
+             { echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&2; exit 1; }
+         fi
+         # Check windres version
+         echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
+-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5
++echo "configure:2997: 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 }'`
+         _WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+         _WINDRES_RELEASE_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+         WINDRES_MAJOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
+         WINDRES_MINOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+         WINDRES_RELEASE_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+@@ -3115,72 +3015,72 @@
+     ;;
+ esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+     SKIP_COMPILER_CHECKS=1
+     SKIP_LIBRARY_CHECKS=1
+     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3124: checking how to run the C preprocessor" >&5
++echo "configure:3024: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     # This must be in double quotes, not single quotes, because CPP may get
+   # substituted into the Makefile and "${CC-cc}" will confuse make.
+   CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 3139 "configure"
++#line 3039 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3045: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 3156 "configure"
++#line 3056 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3062: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3173 "configure"
++#line 3073 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3079: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3198,27 +3098,27 @@
+   ac_cv_prog_CPP="$CPP"
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ for ac_hdr in mmintrin.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3207: checking for $ac_hdr" >&5
++echo "configure:3107: 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
+-#line 3212 "configure"
++#line 3112 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3117: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -3239,41 +3139,41 @@
+ fi
+ done
+ 
+ fi
+ 
+ if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
+     if test "x$CC" != xcc; then
+   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
+-echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:3148: checking whether $CC and cc understand -c and -o together" >&5
+ else
+   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
+-echo "configure:3251: checking whether cc understands -c and -o together" >&5
++echo "configure:3151: 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]/_/'`"
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'foo(){}' > conftest.c
+ # Make sure it works both with $CC and with simple cc.
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
+-if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-   test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++if { (eval echo configure:3163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++   test -f conftest.o && { (eval echo configure:3164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ then
+   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+   if test "x$CC" != xcc; then
+     # Test first that cc exists at all.
+-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+       ac_try='cc -c conftest.c -o conftest.o 1>&5'
+-      if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-	 test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++      if { (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++	 test -f conftest.o && { (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+       then
+         # cc works too.
+         :
+       else
+         # cc exists but doesn't like -o.
+         eval ac_cv_prog_cc_${ac_cc}_c_o=no
+       fi
+     fi
+@@ -3299,72 +3199,72 @@
+         _OLDCC=$CC
+         _OLDCXX=$CXX
+         CC="${srcdir}/build/hcc '$CC'"
+         CXX="${srcdir}/build/hcpp '$CXX'"
+     fi
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3308: checking how to run the C preprocessor" >&5
++echo "configure:3208: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     # This must be in double quotes, not single quotes, because CPP may get
+   # substituted into the Makefile and "${CC-cc}" will confuse make.
+   CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 3323 "configure"
++#line 3223 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3229: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 3340 "configure"
++#line 3240 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3246: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3357 "configure"
++#line 3257 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3263: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3379,35 +3279,35 @@
+ fi
+   CPP="$ac_cv_prog_CPP"
+ else
+   ac_cv_prog_CPP="$CPP"
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:3388: checking how to run the C++ preprocessor" >&5
++echo "configure:3288: 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
+ else
+   ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+   CXXCPP="${CXX-g++} -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3401 "configure"
++#line 3301 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3306: \"$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
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3444,17 +3344,17 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:3453: checking for a BSD compatible install" >&5
++echo "configure:3353: 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
+ else
+     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+   for ac_dir in $PATH; do
+     # Account for people who put trailing slashes in PATH elements.
+     case "$ac_dir/" in
+@@ -3497,17 +3397,17 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:3506: checking whether ln -s works" >&5
++echo "configure:3406: 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
+   rm -f conftestdata
+ if ln -s X conftestdata 2>/dev/null
+ then
+   rm -f conftestdata
+   ac_cv_prog_LN_S="ln -s"
+@@ -3522,17 +3422,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ for ac_prog in $PERL perl5 perl 
+ 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:3531: checking for $ac_word" >&5
++echo "configure:3431: 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
+   case "$PERL" in
+   /*)
+   ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3562,40 +3462,40 @@
+ test -n "$PERL" && break
+ done
+ 
+ if test -z "$PERL" || test "$PERL" = ":"; then
+     { echo "configure: error: perl not found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
+-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5
++echo "configure:3471: 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
+ 
+ if test "$_perl_res" != 0; then
+     { echo "configure: error: Perl $PERL_VERSION or higher is required." 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
+-echo "configure:3581: checking for full perl installation" >&5
++echo "configure:3481: 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
+     echo "$ac_t""no" 1>&6
+     { echo "configure: error: Cannot find Config.pm or \$Config{archlib}.  A full perl installation is required." 1>&2; exit 1; }
+ else
+     echo "$ac_t""yes" 1>&6    
+ fi
+ 
+ # Extract the first word of "doxygen", so it can be a program name with args.
+ set dummy doxygen; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3594: checking for $ac_word" >&5
++echo "configure:3494: 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
+   case "$DOXYGEN" in
+   /*)
+   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3621,17 +3521,17 @@
+   echo "$ac_t""$DOXYGEN" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "whoami", so it can be a program name with args.
+ set dummy whoami; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3630: checking for $ac_word" >&5
++echo "configure:3530: 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
+   case "$WHOAMI" in
+   /*)
+   ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3657,17 +3557,17 @@
+   echo "$ac_t""$WHOAMI" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "autoconf", so it can be a program name with args.
+ set dummy autoconf; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3666: checking for $ac_word" >&5
++echo "configure:3566: 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
+   case "$AUTOCONF" in
+   /*)
+   ac_cv_path_AUTOCONF="$AUTOCONF" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3693,17 +3593,17 @@
+   echo "$ac_t""$AUTOCONF" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "unzip", so it can be a program name with args.
+ set dummy unzip; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3702: checking for $ac_word" >&5
++echo "configure:3602: 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
+   case "$UNZIP" in
+   /*)
+   ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3731,17 +3631,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ for ac_prog in zip
+ 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:3740: checking for $ac_word" >&5
++echo "configure:3640: 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
+   case "$ZIP" in
+   /*)
+   ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3772,17 +3672,17 @@
+ done
+ 
+ if test -z "$ZIP" || test "$ZIP" = ":"; then
+     { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; }
+ fi
+ # Extract the first word of "makedepend", so it can be a program name with args.
+ set dummy makedepend; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3781: checking for $ac_word" >&5
++echo "configure:3681: 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
+   case "$SYSTEM_MAKEDEPEND" in
+   /*)
+   ac_cv_path_SYSTEM_MAKEDEPEND="$SYSTEM_MAKEDEPEND" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3807,17 +3707,17 @@
+   echo "$ac_t""$SYSTEM_MAKEDEPEND" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "xargs", so it can be a program name with args.
+ set dummy xargs; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3816: checking for $ac_word" >&5
++echo "configure:3716: 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
+   case "$XARGS" in
+   /*)
+   ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3870,17 +3770,17 @@
+         fi
+     fi
+ 
+                 for ac_prog in pbbuild xcodebuild pbxbuild
+ 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:3879: checking for $ac_word" >&5
++echo "configure:3779: 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
+   case "$PBBUILD" in
+   /*)
+   ac_cv_path_PBBUILD="$PBBUILD" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3920,17 +3820,17 @@
+           HAS_XCODE_2_1=1;
+         fi
+       ;;
+     esac
+ 
+             # Extract the first word of "sdp", so it can be a program name with args.
+ set dummy sdp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3929: checking for $ac_word" >&5
++echo "configure:3829: 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
+   case "$SDP" in
+   /*)
+   ac_cv_path_SDP="$SDP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4051,34 +3951,34 @@
+     CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}"
+ 
+     if test "$GCC_VERSION_FULL" = "4.0.0" ; then
+                                     LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
+     fi
+   fi
+ 
+   echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
+-echo "configure:4060: checking for valid compiler/Mac OS X SDK combination" >&5
++echo "configure:3960: 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'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+   cat > conftest.$ac_ext <<EOF
+-#line 4069 "configure"
++#line 3969 "configure"
+ #include "confdefs.h"
+ #include <new>
+                  int main() { return 0; }
+ int main() {
+ result=yes
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   
+@@ -4093,17 +3993,17 @@
+ 
+ case "$host_os" in
+ cygwin*|mingw*|mks*|msvc*)
+     for ac_prog in $MAKE make gmake
+ 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:4102: checking for $ac_word" >&5
++echo "configure:4002: 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
+   case "$MAKE" in
+   /*)
+   ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4136,17 +4036,17 @@
+ 
+     ;;
+ *)
+     for ac_prog in $MAKE gmake make
+ 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:4145: checking for $ac_word" >&5
++echo "configure:4045: 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
+   case "$MAKE" in
+   /*)
+   ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4204,17 +4104,17 @@
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ 
+ # If we find X, set shell vars x_includes and x_libraries to the
+ # paths, otherwise set no_x=yes.
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:4213: checking for X" >&5
++echo "configure:4113: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+   withval="$with_x"
+   :
+ fi
+ 
+ # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+@@ -4266,22 +4166,22 @@
+ fi
+ 
+ if test "$ac_x_includes" = NO; then
+   # Guess where to find include files, by looking for this one X11 .h file.
+   test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 4275 "configure"
++#line 4175 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4180: \"$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*
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+@@ -4340,24 +4240,24 @@
+   test -z "$x_direct_test_library" && x_direct_test_library=Xt
+   test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+ 
+   # See if we find them without any special options.
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4349 "configure"
++#line 4249 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4256: \"$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.
+ ac_x_libraries=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -4453,50 +4353,50 @@
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+     X_LIBS="$X_LIBS -L$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+     "SunOS 5"*)
+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:4462: checking whether -R must be followed by a space" >&5
++echo "configure:4362: checking whether -R must be followed by a space" >&5
+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+       cat > conftest.$ac_ext <<EOF
+-#line 4465 "configure"
++#line 4365 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_R_nospace=no
+ fi
+ rm -f conftest*
+       if test $ac_R_nospace = yes; then
+ 	echo "$ac_t""no" 1>&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 4488 "configure"
++#line 4388 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_R_space=no
+ fi
+@@ -4518,39 +4418,39 @@
+ 
+   if test "$ISC" = yes; then
+     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+   else
+     # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:4527: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:4427: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4535 "configure"
++#line 4435 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa();
+ 
+ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4449: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4562,39 +4462,39 @@
+   echo "$ac_t""yes" 1>&6
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:4571: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:4471: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4579 "configure"
++#line 4479 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa();
+ 
+ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4493: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4613,22 +4513,22 @@
+ 
+     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+     # to get the SysV transport functions.
+     # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+     # needs -lnsl.
+     # The nsl library prevents programs from opening the X display
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:4622: checking for gethostbyname" >&5
++echo "configure:4522: 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 <<EOF
+-#line 4627 "configure"
++#line 4527 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4644,17 +4544,17 @@
+ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+ choke me
+ #else
+ gethostbyname();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4553: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=no"
+ fi
+@@ -4665,39 +4565,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:4674: checking for gethostbyname in -lnsl" >&5
++echo "configure:4574: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4682 "configure"
++#line 4582 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gethostbyname();
+ 
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4596: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4717,22 +4617,22 @@
+     # lieder@skyler.mavd.honeywell.com says without -lsocket,
+     # socket/setsockopt and other routines are undefined under SCO ODT
+     # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+     # on later versions), says simon@lia.di.epfl.ch: it contains
+     # gethostby* variants that don't use the nameserver (or something).
+     # -lsocket must be given before -lnsl if both are needed.
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:4726: checking for connect" >&5
++echo "configure:4626: 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 <<EOF
+-#line 4731 "configure"
++#line 4631 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4748,17 +4648,17 @@
+ #if defined (__stub_connect) || defined (__stub___connect)
+ choke me
+ #else
+ connect();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4657: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_connect=no"
+ fi
+@@ -4769,39 +4669,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:4778: checking for connect in -lsocket" >&5
++echo "configure:4678: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4786 "configure"
++#line 4686 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char connect();
+ 
+ int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4700: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4815,22 +4715,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     fi
+ 
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:4824: checking for remove" >&5
++echo "configure:4724: 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 <<EOF
+-#line 4829 "configure"
++#line 4729 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4846,17 +4746,17 @@
+ #if defined (__stub_remove) || defined (__stub___remove)
+ choke me
+ #else
+ remove();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4755: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_remove=no"
+ fi
+@@ -4867,39 +4767,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:4876: checking for remove in -lposix" >&5
++echo "configure:4776: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4884 "configure"
++#line 4784 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char remove();
+ 
+ int main() {
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4798: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4913,22 +4813,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:4922: checking for shmat" >&5
++echo "configure:4822: 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 <<EOF
+-#line 4927 "configure"
++#line 4827 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4944,17 +4844,17 @@
+ #if defined (__stub_shmat) || defined (__stub___shmat)
+ choke me
+ #else
+ shmat();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4853: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=no"
+ fi
+@@ -4965,39 +4865,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:4974: checking for shmat in -lipc" >&5
++echo "configure:4874: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4982 "configure"
++#line 4882 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char shmat();
+ 
+ int main() {
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4896: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5020,39 +4920,39 @@
+   test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+   # check for ICE first), but we must link in the order -lSM -lICE or
+   # we get undefined symbols.  So assume we have SM if we have ICE.
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:5029: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:4929: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5037 "configure"
++#line 4937 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber();
+ 
+ int main() {
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4951: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5480,41 +5380,41 @@
+ fi
+ 
+ MKSHLIB_FORCE_ALL=
+ MKSHLIB_UNFORCE_ALL=
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test "$GNU_CC"; then
+   echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
+-echo "configure:5489: checking whether ld has archive extraction flags" >&5
++echo "configure:5389: 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
+   _SAVE_LDFLAGS=$LDFLAGS; _SAVE_LIBS=$LIBS
+     ac_cv_mkshlib_force_and_unforce="no"
+     exec 3<&0 <<LOOP_INPUT
+ 	force="-Wl,--whole-archive";   unforce="-Wl,--no-whole-archive"
+ 	force="-Wl,-z -Wl,allextract"; unforce="-Wl,-z -Wl,defaultextract"
+ 	force="-Wl,-all";              unforce="-Wl,-none"
+ LOOP_INPUT
+     while read line
+     do
+       eval $line
+       LDFLAGS=$force
+       LIBS=$unforce
+       cat > conftest.$ac_ext <<EOF
+-#line 5506 "configure"
++#line 5406 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5413: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+     done
+@@ -5537,95 +5437,95 @@
+ if test "$COMPILE_ENVIRONMENT"; then
+ configure_static_assert_macros='
+ #define CONFIGURE_STATIC_ASSERT(condition) CONFIGURE_STATIC_ASSERT_IMPL(condition, __LINE__)
+ #define CONFIGURE_STATIC_ASSERT_IMPL(condition, line) CONFIGURE_STATIC_ASSERT_IMPL2(condition, line)
+ #define CONFIGURE_STATIC_ASSERT_IMPL2(condition, line) typedef int static_assert_line_##line[(condition) ? 1 : -1]
+ '
+ 
+ echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
+-echo "configure:5546: checking that static assertion macros used in autoconf tests work" >&5
++echo "configure:5446: checking that static assertion macros used in autoconf tests work" >&5
+ if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+   ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+   ac_cv_static_assertion_macros_work="yes"
+   cat > conftest.$ac_ext <<EOF
+-#line 5560 "configure"
++#line 5460 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(1)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5467: \"$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*
+   ac_cv_static_assertion_macros_work="no"
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 5577 "configure"
++#line 5477 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+   cat > conftest.$ac_ext <<EOF
+-#line 5600 "configure"
++#line 5500 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(1)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5507: \"$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*
+   ac_cv_static_assertion_macros_work="no"
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 5617 "configure"
++#line 5517 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   ac_ext=C
+@@ -5650,26 +5550,26 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
+-echo "configure:5659: checking for 64-bit OS" >&5
++echo "configure:5559: checking for 64-bit OS" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 5661 "configure"
++#line 5561 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+ fi
+@@ -5819,28 +5719,28 @@
+             ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 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:5828: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
++echo "configure:5728: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
+             cat > conftest.$ac_ext <<EOF
+-#line 5830 "configure"
++#line 5730 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ #if (__IBMCPP__ < 502)
+                  #error "Bad compiler"
+                  #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _BAD_COMPILER=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _BAD_COMPILER=1
+ fi
+@@ -5868,27 +5768,27 @@
+         DLL_SUFFIX='_shr.a'
+         ;;
+     esac
+     if test "$COMPILE_ENVIRONMENT"; then
+         for ac_hdr in sys/inttypes.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5877: checking for $ac_hdr" >&5
++echo "configure:5777: 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
+-#line 5882 "configure"
++#line 5782 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5787: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -5920,32 +5820,32 @@
+     no_x=yes
+     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     _PLATFORM_DEFAULT_TOOLKIT="beos"
+     DSO_LDOPTS='-nostart'
+     TK_LIBS='-lbe -lroot'
+     LIBS="$LIBS -lbe"
+     if test "$COMPILE_ENVIRONMENT"; then
+         echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
+-echo "configure:5929: checking for main in -lbind" >&5
++echo "configure:5829: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbind  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5937 "configure"
++#line 5837 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5844: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5956,32 +5856,32 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -lbind"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+         echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
+-echo "configure:5965: checking for main in -lzeta" >&5
++echo "configure:5865: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lzeta  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5973 "configure"
++#line 5873 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5880: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -6039,28 +5939,28 @@
+     STRIP="$STRIP -x -S"
+     _PLATFORM_DEFAULT_TOOLKIT='mac'
+     MOZ_ENABLE_POSTSCRIPT=
+     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+     # set MACOSX to generate lib/mac/MoreFiles/Makefile
+     MACOSX=1
+ 
+         echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
+-echo "configure:6048: checking for -dead_strip option to ld" >&5
++echo "configure:5948: checking for -dead_strip option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-dead_strip"
+     cat > conftest.$ac_ext <<EOF
+-#line 6052 "configure"
++#line 5952 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   _HAVE_DEAD_STRIP=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _HAVE_DEAD_STRIP=
+ fi
+@@ -6918,24 +6818,24 @@
+ 
+        CFLAGS="$CFLAGS -xstrconst -xbuiltin=%all"
+        CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
+        LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
+        if test -z "$CROSS_COMPILE" && test -f /usr/lib/ld/map.noexstk; then
+            _SAVE_LDFLAGS=$LDFLAGS
+            LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
+            cat > conftest.$ac_ext <<EOF
+-#line 6927 "configure"
++#line 6827 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   LDFLAGS=$_SAVE_LDFLAGS
+ fi
+ rm -f conftest*
+@@ -6953,36 +6853,36 @@
+        AR_FLAGS='-o $@'
+        AS='/usr/ccs/bin/as'
+        ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
+        AS_DASH_C_FLAG=''
+        TARGET_COMPILER_ABI="sunc"
+         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:6962: checking for Forte compiler version >= WS6U2" >&5
++echo "configure:6862: 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.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+        cat > conftest.$ac_ext <<EOF
+-#line 6972 "configure"
++#line 6872 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ #if (__SUNPRO_CC < 0x530)
+            #error "Denied"
+            #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _BAD_COMPILER=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _BAD_COMPILER=1
+ fi
+@@ -7122,47 +7022,47 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:7131: checking for ANSI C header files" >&5
++echo "configure:7031: 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 <<EOF
+-#line 7136 "configure"
++#line 7036 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7044: \"$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*
+   ac_cv_header_stdc=yes
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_stdc=no
+ fi
+ rm -f conftest*
+ 
+ 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
+-#line 7161 "configure"
++#line 7061 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+ else
+   rm -rf conftest*
+@@ -7170,17 +7070,17 @@
+ fi
+ rm -f conftest*
+ 
+ fi
+ 
+ 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
+-#line 7179 "configure"
++#line 7079 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+ else
+   rm -rf conftest*
+@@ -7191,28 +7091,28 @@
+ fi
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7200 "configure"
++#line 7100 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int main () { int i; for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:7211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_header_stdc=no
+ fi
+@@ -7226,22 +7126,22 @@
+ if test $ac_cv_header_stdc = yes; then
+   cat >> confdefs.h <<\EOF
+ #define STDC_HEADERS 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:7235: checking for working const" >&5
++echo "configure:7135: 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 <<EOF
+-#line 7240 "configure"
++#line 7140 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ /* Ultrix mips cc rejects this.  */
+ typedef int charset[2]; const charset x;
+ /* SunOS 4.1.1 cc rejects this.  */
+ char const *const *ccp;
+@@ -7280,17 +7180,17 @@
+   struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+   const int foo = 10;
+ }
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_c_const=no
+ fi
+@@ -7301,22 +7201,22 @@
+ if test $ac_cv_c_const = no; then
+   cat >> confdefs.h <<\EOF
+ #define const 
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:7310: checking for mode_t" >&5
++echo "configure:7210: 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 <<EOF
+-#line 7315 "configure"
++#line 7215 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7334,22 +7234,22 @@
+ if test $ac_cv_type_mode_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define mode_t int
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:7343: checking for off_t" >&5
++echo "configure:7243: 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 <<EOF
+-#line 7348 "configure"
++#line 7248 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7367,22 +7267,22 @@
+ if test $ac_cv_type_off_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define off_t long
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:7376: checking for pid_t" >&5
++echo "configure:7276: 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 <<EOF
+-#line 7381 "configure"
++#line 7281 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7400,22 +7300,22 @@
+ if test $ac_cv_type_pid_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define pid_t int
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:7409: checking for size_t" >&5
++echo "configure:7309: 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 <<EOF
+-#line 7414 "configure"
++#line 7314 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7433,30 +7333,30 @@
+ if test $ac_cv_type_size_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define size_t unsigned
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
+-echo "configure:7442: checking for st_blksize in struct stat" >&5
++echo "configure:7342: 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 <<EOF
+-#line 7447 "configure"
++#line 7347 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ int main() {
+ struct stat s; s.st_blksize;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=no
+ fi
+@@ -7467,30 +7367,30 @@
+ if test $ac_cv_struct_st_blksize = yes; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ST_BLKSIZE 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
+-echo "configure:7476: checking for siginfo_t" >&5
++echo "configure:7376: 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 <<EOF
+-#line 7481 "configure"
++#line 7381 "configure"
+ #include "confdefs.h"
+ #define _POSIX_C_SOURCE 199506L
+                   #include <signal.h>
+ int main() {
+ siginfo_t* info;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_siginfo_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_siginfo_t=false
+ fi
+@@ -7514,30 +7414,30 @@
+ 
+    cat >> confdefs.h <<\EOF
+ #define __off_t 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for int16_t""... $ac_c" 1>&6
+-echo "configure:7523: checking for int16_t" >&5
++echo "configure:7423: 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 <<EOF
+-#line 7528 "configure"
++#line 7428 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int16_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int16_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int16_t=false
+ fi
+@@ -7549,30 +7449,30 @@
+ #define HAVE_INT16_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int32_t""... $ac_c" 1>&6
+-echo "configure:7558: checking for int32_t" >&5
++echo "configure:7458: 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 <<EOF
+-#line 7563 "configure"
++#line 7463 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int32_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int32_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int32_t=false
+ fi
+@@ -7584,30 +7484,30 @@
+ #define HAVE_INT32_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int64_t""... $ac_c" 1>&6
+-echo "configure:7593: checking for int64_t" >&5
++echo "configure:7493: 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 <<EOF
+-#line 7598 "configure"
++#line 7498 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int64_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int64_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int64_t=false
+ fi
+@@ -7619,30 +7519,30 @@
+ #define HAVE_INT64_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int64""... $ac_c" 1>&6
+-echo "configure:7628: checking for int64" >&5
++echo "configure:7528: 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 <<EOF
+-#line 7633 "configure"
++#line 7533 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int64 foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int64=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int64=false
+ fi
+@@ -7654,30 +7554,30 @@
+ #define HAVE_INT64 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint""... $ac_c" 1>&6
+-echo "configure:7663: checking for uint" >&5
++echo "configure:7563: 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 <<EOF
+-#line 7668 "configure"
++#line 7568 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint=false
+ fi
+@@ -7689,30 +7589,30 @@
+ #define HAVE_UINT 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint_t""... $ac_c" 1>&6
+-echo "configure:7698: checking for uint_t" >&5
++echo "configure:7598: 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 <<EOF
+-#line 7703 "configure"
++#line 7603 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint_t=false
+ fi
+@@ -7724,30 +7624,30 @@
+ #define HAVE_UINT_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
+-echo "configure:7733: checking for uint16_t" >&5
++echo "configure:7633: 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 <<EOF
+-#line 7738 "configure"
++#line 7638 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint16_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint16_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint16_t=false
+ fi
+@@ -7768,30 +7668,30 @@
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ 
+ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
+-echo "configure:7777: checking for uname.domainname" >&5
++echo "configure:7677: 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 <<EOF
+-#line 7782 "configure"
++#line 7682 "configure"
+ #include "confdefs.h"
+ #include <sys/utsname.h>
+ int main() {
+  struct utsname *res; char *domain; 
+             (void)uname(res);  if (res != 0) { domain = res->domainname; } 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_uname_domainname_field=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_uname_domainname_field=false
+ fi
+@@ -7805,30 +7705,30 @@
+ EOF
+ 
+     echo "$ac_t""yes" 1>&6
+ else
+     echo "$ac_t""no" 1>&6
+ fi
+ 
+ echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
+-echo "configure:7814: checking for uname.__domainname" >&5
++echo "configure:7714: 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 <<EOF
+-#line 7819 "configure"
++#line 7719 "configure"
+ #include "confdefs.h"
+ #include <sys/utsname.h>
+ int main() {
+  struct utsname *res; char *domain; 
+             (void)uname(res);  if (res != 0) { domain = res->__domainname; } 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_uname_us_domainname_field=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_uname_us_domainname_field=false
+ fi
+@@ -7851,31 +7751,31 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ 
+ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
+-echo "configure:7860: checking for usable wchar_t (2 bytes, unsigned)" >&5
++echo "configure:7760: checking for usable wchar_t (2 bytes, unsigned)" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7865 "configure"
++#line 7765 "configure"
+ #include "confdefs.h"
+ #include <stddef.h>
+                      $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                      CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_v2="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_v2="no"
+ fi
+@@ -7898,31 +7798,31 @@
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     _SAVE_CXXFLAGS=$CXXFLAGS
+     CXXFLAGS="$CXXFLAGS -fshort-wchar"
+ 
+     echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
+-echo "configure:7907: checking for compiler -fshort-wchar option" >&5
++echo "configure:7807: checking for compiler -fshort-wchar option" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7912 "configure"
++#line 7812 "configure"
+ #include "confdefs.h"
+ #include <stddef.h>
+                          $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                          CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_option_v2="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_option_v2="no"
+ fi
+@@ -7946,17 +7846,17 @@
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ fi
+ 
+ if test "$GNU_CC"; then
+   echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
+-echo "configure:7955: checking for visibility(hidden) attribute" >&5
++echo "configure:7855: 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
+   cat > conftest.c <<EOF
+                   int foo __attribute__ ((visibility ("hidden"))) = 1;
+ EOF
+                   ac_cv_visibility_hidden=no
+                   if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+@@ -7971,17 +7871,17 @@
+ echo "$ac_t""$ac_cv_visibility_hidden" 1>&6
+   if test "$ac_cv_visibility_hidden" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
+ EOF
+ 
+ 
+     echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
+-echo "configure:7980: checking for visibility(default) attribute" >&5
++echo "configure:7880: 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
+   cat > conftest.c <<EOF
+                     int foo __attribute__ ((visibility ("default"))) = 1;
+ EOF
+                     ac_cv_visibility_default=no
+                     if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+@@ -7996,17 +7896,17 @@
+ echo "$ac_t""$ac_cv_visibility_default" 1>&6
+     if test "$ac_cv_visibility_default" = "yes"; then
+       cat >> confdefs.h <<\EOF
+ #define HAVE_VISIBILITY_ATTRIBUTE 1
+ EOF
+ 
+ 
+       echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
+-echo "configure:8005: checking for visibility pragma support" >&5
++echo "configure:7905: 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
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+                       int foo_hidden = 1;
+ #pragma GCC visibility push(default)
+                       int foo_default = 1;
+@@ -8021,17 +7921,17 @@
+                       fi
+                       rm -f conftest.cs
+                     
+ fi
+ 
+ echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
+       if test "$ac_cv_visibility_pragma" = "yes"; then
+         echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
+-echo "configure:8030: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
++echo "configure:7930: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+ struct __attribute__ ((visibility ("default"))) TestStruct {
+   static void Init();
+ };
+@@ -8049,17 +7949,17 @@
+                        fi
+                        rm -rf conftest.{c,S}
+                        
+ fi
+ 
+ echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
+ 
+         echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
+-echo "configure:8058: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
++echo "configure:7958: 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
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
+ #pragma GCC visibility pop
+@@ -8079,48 +7979,47 @@
+                        fi
+                        rm -f conftest.{c,S}
+                        
+ fi
+ 
+ echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
+         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+                 "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
++          VISIBILITY_FLAGS='-fvisibility=hidden'
+         else
+           VISIBILITY_FLAGS='-fvisibility=hidden'
+         fi # have visibility pragma bug
+       fi   # have visibility pragma
+     fi     # have visibility(default) attribute
+   fi       # have visibility(hidden) attribute
+ fi         # GNU_CC
+ 
+ 
+ 
+ 
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+ 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:8106: checking for $ac_hdr that defines DIR" >&5
++echo "configure:8005: 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 <<EOF
+-#line 8111 "configure"
++#line 8010 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+ int main() {
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=no"
+ fi
+@@ -8135,36 +8034,36 @@
+  ac_header_dirent=$ac_hdr; break
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ # 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:8144: checking for opendir in -ldir" >&5
++echo "configure:8043: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8152 "configure"
++#line 8051 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8062: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8176,36 +8075,36 @@
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -ldir"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:8185: checking for opendir in -lx" >&5
++echo "configure:8084: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8193 "configure"
++#line 8092 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8103: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8227,27 +8126,27 @@
+ # for stuff like -lXshm
+     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+     ;;
+ esac
+ for ac_hdr in sys/byteorder.h compat.h getopt.h
+ 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:8135: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8241 "configure"
++#line 8140 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ 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:8145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8267,27 +8166,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in sys/bitypes.h memory.h unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8276: checking for $ac_hdr" >&5
++echo "configure:8175: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8281 "configure"
++#line 8180 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8307,27 +8206,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in gnu/libc-version.h nl_types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8316: checking for $ac_hdr" >&5
++echo "configure:8215: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8321 "configure"
++#line 8220 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8347,27 +8246,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in malloc.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8356: checking for $ac_hdr" >&5
++echo "configure:8255: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8361 "configure"
++#line 8260 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8387,27 +8286,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in X11/XKBlib.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8396: checking for $ac_hdr" >&5
++echo "configure:8295: 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
+-#line 8401 "configure"
++#line 8300 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8305: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8428,27 +8327,27 @@
+ fi
+ done
+ 
+ 
+ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8437: checking for $ac_hdr" >&5
++echo "configure:8336: 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
+-#line 8442 "configure"
++#line 8341 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8346: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8469,27 +8368,27 @@
+ fi
+ done
+ 
+ 
+ for ac_hdr in mmintrin.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8478: checking for $ac_hdr" >&5
++echo "configure:8377: 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
+-#line 8483 "configure"
++#line 8382 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8387: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8516,27 +8415,27 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ NEW_H=new.h
+ ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for new""... $ac_c" 1>&6
+-echo "configure:8525: checking for new" >&5
++echo "configure:8424: 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
+-#line 8530 "configure"
++#line 8429 "configure"
+ #include "confdefs.h"
+ #include <new>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8434: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8567,27 +8466,27 @@
+ case $target in
+ *-aix4.3*|*-aix5*)
+ 	;;
+ *)
+ 	for ac_hdr in sys/cdefs.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8576: checking for $ac_hdr" >&5
++echo "configure:8475: 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
+-#line 8581 "configure"
++#line 8480 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8485: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8611,36 +8510,36 @@
+ 	;;
+ esac
+ 
+ case $target in
+ *-hpux11.*)
+ 	;;
+ *)
+ 	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
+-echo "configure:8620: checking for gethostbyname_r in -lc_r" >&5
++echo "configure:8519: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8628 "configure"
++#line 8527 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gethostbyname_r();
+ 
+ int main() {
+ gethostbyname_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8538: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8660,36 +8559,36 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+ esac
+ echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
+-echo "configure:8669: checking for atan in -lm" >&5
++echo "configure:8568: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8677 "configure"
++#line 8576 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char atan();
+ 
+ int main() {
+ atan()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8587: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8713,63 +8612,63 @@
+ 
+ 
+ 
+ case $target in
+ *-darwin*)
+ 	;;
+ *)
+ 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:8722: checking for dlopen in -ldl" >&5
++echo "configure:8621: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8730 "configure"
++#line 8629 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dlopen();
+ 
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8640: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   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:8758: checking for dlfcn.h" >&5
++echo "configure:8657: 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
+-#line 8763 "configure"
++#line 8662 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8667: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8795,36 +8694,36 @@
+ 
+ 	;;
+ esac
+ if test ! "$GNU_CXX"; then
+ 
+     case $target in
+     *-aix*)
+ 	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
+-echo "configure:8804: checking for demangle in -lC_r" >&5
++echo "configure:8703: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lC_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8812 "configure"
++#line 8711 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char demangle();
+ 
+ int main() {
+ demangle()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8722: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8844,36 +8743,36 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+      *)
+ 	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
+-echo "configure:8853: checking for demangle in -lC" >&5
++echo "configure:8752: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lC  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8861 "configure"
++#line 8760 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char demangle();
+ 
+ int main() {
+ demangle()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8771: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8894,36 +8793,36 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+      esac
+ fi
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:8903: checking for socket in -lsocket" >&5
++echo "configure:8802: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8911 "configure"
++#line 8810 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char socket();
+ 
+ int main() {
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8821: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8958,36 +8857,36 @@
+     cat >> confdefs.h <<EOF
+ #define FUNCPROTO 15
+ EOF
+ 
+ 	XLIBS="-lX11 $XLIBS"
+ 	_SAVE_LDFLAGS="$LDFLAGS"
+ 	LDFLAGS="$XLDFLAGS $LDFLAGS"
+ 	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
+-echo "configure:8967: checking for XDrawLines in -lX11" >&5
++echo "configure:8866: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8975 "configure"
++#line 8874 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XDrawLines();
+ 
+ int main() {
+ XDrawLines()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8885: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8999,36 +8898,36 @@
+   echo "$ac_t""yes" 1>&6
+   X11_LIBS="-lX11"
+ else
+   echo "$ac_t""no" 1>&6
+ MISSING_X="$MISSING_X -lX11"
+ fi
+ 
+ 	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
+-echo "configure:9008: checking for XextAddDisplay in -lXext" >&5
++echo "configure:8907: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9016 "configure"
++#line 8915 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XextAddDisplay();
+ 
+ int main() {
+ XextAddDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8926: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9042,36 +8941,36 @@
+ else
+   echo "$ac_t""no" 1>&6
+ MISSING_X="$MISSING_X -lXext"
+ fi
+ 
+    
+      
+ 	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:9051: checking for XtFree in -lXt" >&5
++echo "configure:8950: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9059 "configure"
++#line 8958 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XtFree();
+ 
+ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9082,36 +8981,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+    XT_LIBS="-lXt"
+ else
+   echo "$ac_t""no" 1>&6
+ 
+         unset ac_cv_lib_Xt_XtFree
+ 	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
+-echo "configure:9091: checking for IceFlush in -lICE" >&5
++echo "configure:8990: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9099 "configure"
++#line 8998 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char IceFlush();
+ 
+ int main() {
+ IceFlush()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9122,36 +9021,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   XT_LIBS="-lICE $XT_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
+-echo "configure:9131: checking for SmcCloseConnection in -lSM" >&5
++echo "configure:9030: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9139 "configure"
++#line 9038 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char SmcCloseConnection();
+ 
+ int main() {
+ SmcCloseConnection()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9162,36 +9061,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   XT_LIBS="-lSM $XT_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  
+         echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:9171: checking for XtFree in -lXt" >&5
++echo "configure:9070: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9179 "configure"
++#line 9078 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XtFree();
+ 
+ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9089: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9215,36 +9114,36 @@
+     # crashes in plugins linked against Motif - Bug #98892
+     case "${target_os}" in
+     aix*)
+         XT_LIBS="-lXm $XT_LIBS"
+         ;;
+     esac
+ 
+                 echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
+-echo "configure:9224: checking for XineramaIsActive in -lXinerama" >&5
++echo "configure:9123: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9232 "configure"
++#line 9131 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XineramaIsActive();
+ 
+ int main() {
+ XineramaIsActive()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9142: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9256,27 +9155,27 @@
+   echo "$ac_t""yes" 1>&6
+   MOZ_XINERAMA_LIBS="-lXinerama"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     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:9265: checking for X11/extensions/Xinerama.h" >&5
++echo "configure:9164: 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
+-#line 9270 "configure"
++#line 9169 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/Xinerama.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9174: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9289,36 +9188,36 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+                 echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
+-echo "configure:9298: checking for XShmCreateImage in -lXext" >&5
++echo "configure:9197: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9306 "configure"
++#line 9205 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XShmCreateImage();
+ 
+ int main() {
+ XShmCreateImage()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9216: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9330,27 +9229,27 @@
+   echo "$ac_t""yes" 1>&6
+   _HAVE_XSHM_XEXT=1
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     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:9339: checking for X11/extensions/XShm.h" >&5
++echo "configure:9238: 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
+-#line 9344 "configure"
++#line 9243 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/XShm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9248: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9370,36 +9269,36 @@
+         test -n "$_HAVE_XSHM_XEXT"; then
+         cat >> confdefs.h <<\EOF
+ #define HAVE_XSHM 1
+ EOF
+ 
+     fi
+ 
+                 echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
+-echo "configure:9379: checking for XieFloGeometry in -lXIE" >&5
++echo "configure:9278: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9387 "configure"
++#line 9286 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XieFloGeometry();
+ 
+ int main() {
+ XieFloGeometry()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9297: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9411,27 +9310,27 @@
+   echo "$ac_t""yes" 1>&6
+   MOZ_XIE_LIBS="-lXIE"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     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:9420: checking for X11/extensions/XIElib.h" >&5
++echo "configure:9319: 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
+-#line 9425 "configure"
++#line 9324 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/XIElib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9329: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9495,17 +9394,17 @@
+   ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+   if test x${FT2_CONFIG+set} != xset ; then
+     FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+   fi
+ fi
+ # 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:9504: checking for $ac_word" >&5
++echo "configure:9403: 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
+   case "$FT2_CONFIG" in
+   /*)
+   ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -9531,17 +9430,17 @@
+   echo "$ac_t""$FT2_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+ min_ft_version=6.1.0
+ echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
+-echo "configure:9540: checking for FreeType - version >= $min_ft_version" >&5
++echo "configure:9439: checking for FreeType - version >= $min_ft_version" >&5
+ no_ft=""
+ if test "$FT2_CONFIG" = "no" ; then
+   no_ft=yes
+ else
+   FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+   FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+   ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+          sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -9579,17 +9478,17 @@
+       ac_save_CFLAGS="$CFLAGS"
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $FT2_CFLAGS"
+       LIBS="$FT2_LIBS $LIBS"
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9588 "configure"
++#line 9487 "configure"
+ #include "confdefs.h"
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int
+@@ -9605,17 +9504,17 @@
+   else
+   {
+     FT_Done_FreeType(library);
+     return 0;
+   }
+ }
+ 
+ EOF
+-if { (eval echo configure:9614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_ft=yes
+ fi
+@@ -9657,17 +9556,17 @@
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+-echo "configure:9666: checking for pthread_create in -lpthreads" >&5
++echo "configure:9565: checking for pthread_create in -lpthreads" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9679,17 +9578,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:9688: checking for pthread_create in -lpthread" >&5
++echo "configure:9587: checking for pthread_create in -lpthread" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9701,17 +9600,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:9710: checking for pthread_create in -lc_r" >&5
++echo "configure:9609: checking for pthread_create in -lc_r" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9723,17 +9622,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
+-echo "configure:9732: checking for pthread_create in -lc" >&5
++echo "configure:9631: checking for pthread_create in -lc" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9779,17 +9678,17 @@
+ fi
+ 
+ 
+ if test "$USE_PTHREADS"x != x
+ then
+ 				rm -f conftest*
+ 	ac_cv_have_dash_pthread=no
+ 	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
+-echo "configure:9788: checking whether ${CC-cc} accepts -pthread" >&5
++echo "configure:9687: 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
+ 		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 			ac_cv_have_dash_pthread=yes
+ 	        case "$target_os" in
+ 	        freebsd*)
+ # Freebsd doesn't use -pthread for compiles, it uses them for linking
+@@ -9802,17 +9701,17 @@
+ 		fi
+ 	fi
+ 	rm -f conftest*
+     echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6
+ 
+ 			    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:9811: checking whether ${CC-cc} accepts -pthreads" >&5
++echo "configure:9710: 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
+ 	    	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 			    ac_cv_have_dash_pthreads=yes
+ 			    CFLAGS="$CFLAGS -pthreads"
+ 			    CXXFLAGS="$CXXFLAGS -pthreads"
+ 		    fi
+@@ -9897,17 +9796,17 @@
+ 				CFLAGS="$CFLAGS -mt" 
+ 				CXXFLAGS="$CXXFLAGS -mt" 
+ 			fi
+ 			;;
+ 	esac
+ fi
+ 
+ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
+-echo "configure:9906: checking whether mmap() sees write()s" >&5
++echo "configure:9805: checking whether mmap() sees write()s" >&5
+ 
+ 
+ mmap_test_prog='
+     #include <stdlib.h>
+     #include <unistd.h>
+     #include <sys/mman.h>
+     #include <sys/types.h>
+     #include <sys/stat.h>
+@@ -9936,21 +9835,21 @@
+     }
+ '
+ 
+ 
+ if test "$cross_compiling" = yes; then
+   result="yes"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9945 "configure"
++#line 9844 "configure"
+ #include "confdefs.h"
+ $mmap_test_prog 
+ EOF
+-if { (eval echo configure:9949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   result="no"
+ fi
+@@ -9965,23 +9864,23 @@
+ #define MMAP_MISSES_WRITES 1
+ EOF
+ 
+ fi
+ 
+ 
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:9974: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:9873: 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 <<EOF
+-#line 9980 "configure"
++#line 9879 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "$ac_pattern" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=yes
+@@ -9989,17 +9888,17 @@
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=no
+ fi
+ rm -f conftest*
+ 
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 9998 "configure"
++#line 9897 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "$ac_pattern" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=yes
+@@ -10011,35 +9910,35 @@
+ 
+ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:10020: checking for 8-bit clean memcmp" >&5
++echo "configure:9919: 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
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10028 "configure"
++#line 9927 "configure"
+ #include "confdefs.h"
+ 
+ main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+ }
+ 
+ EOF
+-if { (eval echo configure:10038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9937: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_func_memcmp_clean=no
+ fi
+@@ -10049,22 +9948,22 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+ 
+ 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:10058: checking for $ac_func" >&5
++echo "configure:9957: 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 <<EOF
+-#line 10063 "configure"
++#line 9962 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10077,17 +9976,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9985: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10104,22 +10003,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_func in flockfile getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10113: checking for $ac_func" >&5
++echo "configure:10012: 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 <<EOF
+-#line 10118 "configure"
++#line 10017 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10132,17 +10031,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10040: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10161,22 +10060,22 @@
+ fi
+ done
+ 
+ 
+ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100200"; then
+   for ac_func in localtime_r strtok_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10170: checking for $ac_func" >&5
++echo "configure:10069: 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 <<EOF
+-#line 10175 "configure"
++#line 10074 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10189,17 +10088,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10097: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10225,29 +10124,29 @@
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
+-echo "configure:10234: checking for wcrtomb" >&5
++echo "configure:10133: 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 <<EOF
+-#line 10239 "configure"
++#line 10138 "configure"
+ #include "confdefs.h"
+ #include <wchar.h>
+ int main() {
+ mbstate_t ps={0};wcrtomb(0,'f',&ps);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_have_wcrtomb="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_wcrtomb="no"
+ fi
+@@ -10257,29 +10156,29 @@
+ echo "$ac_t""$ac_cv_have_wcrtomb" 1>&6
+ if test "$ac_cv_have_wcrtomb" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define HAVE_WCRTOMB 1
+ EOF
+ 
+ fi
+ echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
+-echo "configure:10266: checking for mbrtowc" >&5
++echo "configure:10165: 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 <<EOF
+-#line 10271 "configure"
++#line 10170 "configure"
+ #include "confdefs.h"
+ #include <wchar.h>
+ int main() {
+ mbstate_t ps={0};mbrtowc(0,0,0,&ps);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_have_mbrtowc="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_mbrtowc="no"
+ fi
+@@ -10298,34 +10197,34 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ fi
+ 
+ echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
+-echo "configure:10307: checking for res_ninit()" >&5
++echo "configure:10206: 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 <<EOF
+-#line 10312 "configure"
++#line 10211 "configure"
+ #include "confdefs.h"
+ 
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
+         #include <resolv.h>
+         
+ int main() {
+ int foo = res_ninit(&_res);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10223: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_res_ninit=no
+ fi
+@@ -10345,33 +10244,33 @@
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
+-echo "configure:10354: checking for gnu_get_libc_version()" >&5
++echo "configure:10253: 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 <<EOF
+-#line 10359 "configure"
++#line 10258 "configure"
+ #include "confdefs.h"
+ 
+         #ifdef HAVE_GNU_LIBC_VERSION_H
+         #include <gnu/libc-version.h>
+         #endif
+         
+ int main() {
+ const char *glibc_version = gnu_get_libc_version();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10269: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_gnu_get_libc_version=no 
+         
+@@ -10390,39 +10289,39 @@
+ fi
+ 
+ case $target_os in
+     os2*|msvc*|mks*|cygwin*|mingw*|darwin*|wince*)
+         ;;
+     *)
+     
+ echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
+-echo "configure:10399: checking for iconv in -lc" >&5
++echo "configure:10298: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10407 "configure"
++#line 10306 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char iconv();
+ 
+ int main() {
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10320: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10431,39 +10330,39 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   _ICONV_LIBS="$_ICONV_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
+-echo "configure:10440: checking for iconv in -liconv" >&5
++echo "configure:10339: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10448 "configure"
++#line 10347 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char iconv();
+ 
+ int main() {
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10361: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10472,39 +10371,39 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   _ICONV_LIBS="$_ICONV_LIBS -liconv"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+-echo "configure:10481: checking for libiconv in -liconv" >&5
++echo "configure:10380: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10489 "configure"
++#line 10388 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char libiconv();
+ 
+ int main() {
+ libiconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10402: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10521,36 +10420,36 @@
+ 
+ fi
+ 
+ fi
+ 
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $_ICONV_LIBS"
+ echo $ac_n "checking for iconv()""... $ac_c" 1>&6
+-echo "configure:10530: checking for iconv()" >&5
++echo "configure:10429: 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 <<EOF
+-#line 10535 "configure"
++#line 10434 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdlib.h>
+         #include <iconv.h>
+         
+ int main() {
+ 
+             iconv_t h = iconv_open("", "");
+             iconv(h, NULL, NULL, NULL, NULL);
+             iconv_close(h);
+         
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_iconv=no 
+         
+@@ -10564,37 +10463,37 @@
+     cat >> confdefs.h <<\EOF
+ #define HAVE_ICONV 1
+ EOF
+ 
+     DYNAMIC_XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS $_ICONV_LIBS"
+     LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
+     LIBICONV="$_ICONV_LIBS"
+     echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
+-echo "configure:10573: checking for iconv() with const input" >&5
++echo "configure:10472: 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 <<EOF
+-#line 10578 "configure"
++#line 10477 "configure"
+ #include "confdefs.h"
+ 
+             #include <stdlib.h>
+             #include <iconv.h>
+             
+ int main() {
+ 
+                 const char *input = "testing";
+                 iconv_t h = iconv_open("", "");
+                 iconv(h, &input, NULL, NULL, NULL);
+                 iconv_close(h);
+             
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_func_const_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_const_iconv=no 
+             
+@@ -10613,29 +10512,29 @@
+ fi
+ LIBS=$_SAVE_LIBS
+ 
+     ;;
+ esac
+ 
+ 
+   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+-echo "configure:10622: checking for nl_langinfo and CODESET" >&5
++echo "configure:10521: 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 <<EOF
+-#line 10627 "configure"
++#line 10526 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int main() {
+ char* cs = nl_langinfo(CODESET);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_langinfo_codeset=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   am_cv_langinfo_codeset=no
+ fi
+@@ -10657,123 +10556,123 @@
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
+-echo "configure:10666: checking for an implementation of va_copy()" >&5
++echo "configure:10565: 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
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv_va_copy=no
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10676 "configure"
++#line 10575 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             va_copy (args2, args1);
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10589: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_va_copy=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+ 
+ fi
+ 
+ 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:10707: checking for an implementation of __va_copy()" >&5
++echo "configure:10606: 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
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv___va_copy=no
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10717 "configure"
++#line 10616 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             __va_copy (args2, args1);
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10630: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv___va_copy=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+ 
+ fi
+ 
+ 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:10748: checking whether va_lists can be copied by value" >&5
++echo "configure:10647: 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
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv_va_val_copy=yes
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10758 "configure"
++#line 10657 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             args2 = args1;
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10671: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_va_val_copy=no
+ fi
+@@ -10862,17 +10761,17 @@
+ 	    cd ${_curdir}
+ 	    rm -rf conftest* _conftest
+ 	    	    ;;
+ esac
+ 
+ if test "$GNU_CXX"; then
+ 
+   echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
+-echo "configure:10871: checking for C++ exceptions flag" >&5
++echo "configure:10770: 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
+ else
+   echo "int main() { return 0; }" | cat > conftest.C
+ 
+   ${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1
+ 
+@@ -10897,35 +10796,35 @@
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ 
+ HAVE_GCC3_ABI=
+ if test "$GNU_CC"; then
+   echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
+-echo "configure:10906: checking for gcc 3.0 ABI" >&5
++echo "configure:10805: 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 <<EOF
+-#line 10911 "configure"
++#line 10810 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+   return 0;
+ #else
+ #error Not gcc3.
+ #endif
+                       
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_gcc_three_abi="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_gcc_three_abi="no"
+ fi
+@@ -10939,32 +10838,32 @@
+   else
+       TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-gcc2}"
+   fi
+ fi
+ 
+ 
+ 
+ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
+-echo "configure:10948: checking for C++ \"explicit\" keyword" >&5
++echo "configure:10847: 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 <<EOF
+-#line 10953 "configure"
++#line 10852 "configure"
+ #include "confdefs.h"
+ class X {
+                                public: explicit X(int i) : i_(i) {}
+                                private: int i_;
+                                };
+ int main() {
+ X x(3);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_explicit=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_explicit=no
+ fi
+@@ -10975,22 +10874,22 @@
+ if test "$ac_cv_cpp_explicit" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_EXPLICIT 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
+-echo "configure:10984: checking for C++ \"typename\" keyword" >&5
++echo "configure:10883: 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 <<EOF
+-#line 10989 "configure"
++#line 10888 "configure"
+ #include "confdefs.h"
+ class param {
+                                public:
+                                    typedef unsigned long num_type;
+                                };
+ 
+                                template <class T> class tplt {
+                                public:
+@@ -10999,17 +10898,17 @@
+                                        return num;
+                                    }
+                                };
+ int main() {
+ tplt<param> A;
+                                A.foo(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_typename=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_typename=no
+ fi
+@@ -11020,32 +10919,32 @@
+ if test "$ac_cv_cpp_typename" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_TYPENAME 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
+-echo "configure:11029: checking for modern C++ template specialization syntax support" >&5
++echo "configure:10928: 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 <<EOF
+-#line 11034 "configure"
++#line 10933 "configure"
+ #include "confdefs.h"
+ template <class T> struct X { int a; };
+                                class Y {};
+                                template <> struct X<Y> { double a; };
+ int main() {
+ X<int> int_x;
+                                X<Y> y_x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_modern_specialize_template_syntax=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_modern_specialize_template_syntax=no
+ fi
+@@ -11057,30 +10956,30 @@
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
+-echo "configure:11066: checking whether partial template specialization works" >&5
++echo "configure:10965: 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 <<EOF
+-#line 11071 "configure"
++#line 10970 "configure"
+ #include "confdefs.h"
+ template <class T> class Foo {};
+                                template <class T> class Foo<T*> {};
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11079: \"$ac_compile\") 1>&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_partial_specialization=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_partial_specialization=no
+ fi
+@@ -11091,34 +10990,34 @@
+ if test "$ac_cv_cpp_partial_specialization" = yes ; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
+-echo "configure:11100: checking whether operators must be re-defined for templates derived from templates" >&5
++echo "configure:10999: 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 <<EOF
+-#line 11105 "configure"
++#line 11004 "configure"
+ #include "confdefs.h"
+ template <class T> class Base { };
+                                 template <class T>
+                                 Base<T> operator+(const Base<T>& lhs, const Base<T>& rhs) { return lhs; }
+                                 template <class T> class Derived : public Base<T> { };
+ int main() {
+ Derived<char> a, b;
+                                 Base<char> c = a + b;
+                                 return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_need_derived_template_operators=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_need_derived_template_operators=yes
+ fi
+@@ -11130,31 +11029,31 @@
+   cat >> confdefs.h <<\EOF
+ #define NEED_CPP_DERIVED_TEMPLATE_OPERATORS 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
+-echo "configure:11139: checking whether we need to cast a derived template to pass as its base class" >&5
++echo "configure:11038: 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 <<EOF
+-#line 11144 "configure"
++#line 11043 "configure"
+ #include "confdefs.h"
+ template <class T> class Base { };
+                                 template <class T> class Derived : public Base<T> { };
+                                 template <class T> int foo(const Base<T>&) { return 0; }
+ int main() {
+ Derived<char> bar; return foo(bar);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_need_cpp_template_cast_to_base=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_need_cpp_template_cast_to_base=yes
+ fi
+@@ -11165,22 +11064,22 @@
+ if test "$ac_cv_need_cpp_template_cast_to_base" = yes ; then
+   cat >> confdefs.h <<\EOF
+ #define NEED_CPP_TEMPLATE_CAST_TO_BASE 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
+-echo "configure:11174: checking whether the compiler can resolve const ambiguities for templates" >&5
++echo "configure:11073: 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 <<EOF
+-#line 11179 "configure"
++#line 11078 "configure"
+ #include "confdefs.h"
+ 
+                                 template <class T> class ptrClass {
+                                   public: T* ptr;
+                                 };
+ 
+                                 template <class T> T* a(ptrClass<T> *arg) {
+                                   return arg->ptr;
+@@ -11191,17 +11090,17 @@
+                                   return arg->ptr;
+                                 }
+                                
+ int main() {
+  ptrClass<int> i;
+                                  a(&i); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_can_resolve_const_ambiguity=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_can_resolve_const_ambiguity=no
+ fi
+@@ -11213,41 +11112,41 @@
+   cat >> confdefs.h <<\EOF
+ #define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
+-echo "configure:11222: checking whether the C++ \"using\" keyword can change access" >&5
++echo "configure:11121: 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 <<EOF
+-#line 11227 "configure"
++#line 11126 "configure"
+ #include "confdefs.h"
+ class A { protected: int foo() { return 0; } };
+                    class B : public A { public: using A::foo; };
+ int main() {
+ B b; return b.foo();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 11238 "configure"
++#line 11137 "configure"
+ #include "confdefs.h"
+ class A { public: int foo() { return 1; } };
+                        class B : public A { private: using A::foo; };
+ int main() {
+ B b; return b.foo();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_access_changing_using2=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_access_changing_using2=yes
+ fi
+@@ -11265,38 +11164,38 @@
+ if test "$ac_cv_cpp_access_changing_using2" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_ACCESS_CHANGING_USING 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
+-echo "configure:11274: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
++echo "configure:11173: 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 <<EOF
+-#line 11279 "configure"
++#line 11178 "configure"
+ #include "confdefs.h"
+ class X { 
+                                  public: int go(const X&) {return 3;}
+                                          int jo(const X&) {return 3;}
+                                };
+                                class Y : public X {
+                                  public:  int go(int) {return 2;}
+                                           int jo(int) {return 2;}
+                                           using X::jo;
+                                  private: using X::go;
+                                };
+ int main() {
+ X x; Y y; y.jo(x);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_ambiguity_resolving_using=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_ambiguity_resolving_using=no
+ fi
+@@ -11307,29 +11206,29 @@
+ if test "$ac_cv_cpp_ambiguity_resolving_using" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
+-echo "configure:11316: checking for \"std::\" namespace" >&5
++echo "configure:11215: 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 <<EOF
+-#line 11321 "configure"
++#line 11220 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+ int main() {
+ return std::min(0, 1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_namespace_std=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_namespace_std=no
+ fi
+@@ -11340,32 +11239,32 @@
+ if test "$ac_cv_cpp_namespace_std" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_NAMESPACE_STD 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
+-echo "configure:11349: checking whether standard template operator!=() is ambiguous" >&5
++echo "configure:11248: 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 <<EOF
+-#line 11354 "configure"
++#line 11253 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+                                 struct T1 {};
+                                 int operator==(const T1&, const T1&) { return 0; }
+                                 int operator!=(const T1&, const T1&) { return 0; }
+ int main() {
+ T1 a,b; return a != b;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_unambiguous_std_notequal=unambiguous
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_unambiguous_std_notequal=ambiguous
+ fi
+@@ -11377,30 +11276,30 @@
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
+-echo "configure:11386: checking for C++ reinterpret_cast" >&5
++echo "configure:11285: 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 <<EOF
+-#line 11391 "configure"
++#line 11290 "configure"
+ #include "confdefs.h"
+ struct X { int i; };
+                                struct Y { int i; };
+ int main() {
+ X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11399: \"$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_cpp_reinterpret_cast=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_reinterpret_cast=no
+ fi
+@@ -11411,41 +11310,44 @@
+ if test "$ac_cv_cpp_reinterpret_cast" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_NEW_CASTS 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
+-echo "configure:11420: checking for C++ dynamic_cast to void*" >&5
++echo "configure:11319: 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
+   if test "$cross_compiling" = yes; then
+   ac_cv_cpp_dynamic_cast_void_ptr=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11428 "configure"
++#line 11327 "configure"
+ #include "confdefs.h"
++#ifdef __cplusplus
++extern "C" void exit(int);
++#endif
+ class X { int i; public: virtual ~X() { } };
+                             class Y { int j; public: virtual ~Y() { } };
+                             class Z : public X, public Y { int k; };
+ 
+                             int main() {
+                                  Z mdo;
+                                  X *subx = (X*)&mdo;
+                                  Y *suby = (Y*)&mdo;
+                                  return !((((void*)&mdo != (void*)subx) &&
+                                            ((void*)&mdo == dynamic_cast<void*>(subx))) ||
+                                           (((void*)&mdo != (void*)suby) &&
+                                            ((void*)&mdo == dynamic_cast<void*>(suby))));
+                             }
+ EOF
+-if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11346: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_cpp_dynamic_cast_void_ptr=no
+ fi
+@@ -11459,29 +11361,29 @@
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
+-echo "configure:11468: checking whether C++ requires implementation of unused virtual methods" >&5
++echo "configure:11370: 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 <<EOF
+-#line 11473 "configure"
++#line 11375 "configure"
+ #include "confdefs.h"
+ class X {private: virtual void never_called();};
+ int main() {
+ X x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11382: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_unused_required=yes
+ fi
+@@ -11494,33 +11396,33 @@
+ #define NEED_CPP_UNUSED_IMPLEMENTATIONS 1
+ EOF
+ 
+ fi
+ 
+ 
+ 
+ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
+-echo "configure:11503: checking for trouble comparing to zero near std::operator!=()" >&5
++echo "configure:11405: 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 <<EOF
+-#line 11508 "configure"
++#line 11410 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+                                 template <class T> class Foo {};
+                                 class T2;
+                                 template <class T> int operator==(const T2*, const T&) { return 0; }
+                                 template <class T> int operator!=(const T2*, const T&) { return 0; }
+ int main() {
+ Foo<int> f; return (0 != f);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_trouble_comparing_to_zero=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_trouble_comparing_to_zero=yes
+ fi
+@@ -11542,29 +11444,29 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ 
+ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:11551: checking for LC_MESSAGES" >&5
++echo "configure:11453: 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 <<EOF
+-#line 11556 "configure"
++#line 11458 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ int category = LC_MESSAGES;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_i18n_lc_messages=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_i18n_lc_messages=no
+ fi
+@@ -11635,17 +11537,17 @@
+ 			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
+ 		fi
+ 	fi
+ 
+ 	unset ac_cv_path_NSPR_CONFIG
+ 	# 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:11644: checking for $ac_word" >&5
++echo "configure:11546: 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
+   case "$NSPR_CONFIG" in
+   /*)
+   ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -11670,17 +11572,17 @@
+ if test -n "$NSPR_CONFIG"; then
+   echo "$ac_t""$NSPR_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	min_nspr_version=4.0.0
+ 	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
+-echo "configure:11679: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
++echo "configure:11581: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+ 
+ 	no_nspr=""
+ 	if test "$NSPR_CONFIG" = "no"; then
+ 		no_nspr="yes"
+ 	else
+ 		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
+ 		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+ 
+@@ -11772,17 +11674,17 @@
+ 			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+ 		fi
+ 	fi
+ 
+ 	unset ac_cv_path_NSS_CONFIG
+ 	# 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:11781: checking for $ac_word" >&5
++echo "configure:11683: 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
+   case "$NSS_CONFIG" in
+   /*)
+   ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -11807,17 +11709,17 @@
+ if test -n "$NSS_CONFIG"; then
+   echo "$ac_t""$NSS_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	min_nss_version=3.0.0
+ 	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+-echo "configure:11816: checking for NSS - version >= $min_nss_version (skipping)" >&5
++echo "configure:11718: checking for NSS - version >= $min_nss_version (skipping)" >&5
+ 
+ 	no_nss=""
+ 	if test "$NSS_CONFIG" = "no"; then
+ 		no_nss="yes"
+ 	else
+ 		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+ 		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+ 
+@@ -11882,36 +11784,36 @@
+ if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then
+     CFLAGS="-I${JPEG_DIR}/include $CFLAGS"
+     LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then
+     SYSTEM_JPEG=
+ else
+     echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
+-echo "configure:11891: checking for jpeg_destroy_compress in -ljpeg" >&5
++echo "configure:11793: checking for jpeg_destroy_compress in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg $JPEG_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11899 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char jpeg_destroy_compress();
+ 
+ int main() {
+ jpeg_destroy_compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -11930,31 +11832,31 @@
+ fi
+ 
+ if test "$SYSTEM_JPEG" = 1; then
+     LIBS="$JPEG_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_JPEG= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11939 "configure"
++#line 11841 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 	#include <sys/types.h>
+ 	#include <jpeglib.h>
+ 	int main () {
+ 	    #if JPEG_LIB_VERSION >= $MOZJPEG
+ 		exit(0);
+ 	    #else
+ 		exit(1);
+ 	    #endif
+ 	}
+ 	
+ EOF
+-if { (eval echo configure:11953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_JPEG=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=
+ fi
+@@ -11985,36 +11887,36 @@
+ if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
+     CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
+     LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
+     SYSTEM_ZLIB=
+ else
+     echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
+-echo "configure:11994: checking for gzread in -lz" >&5
++echo "configure:11896: checking for gzread in -lz" >&5
+ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz $ZLIB_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12002 "configure"
++#line 11904 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gzread();
+ 
+ int main() {
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12032,17 +11934,17 @@
+ 
+ fi
+ if test "$SYSTEM_ZLIB" = 1; then
+     LIBS="$ZLIB_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_ZLIB= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12041 "configure"
++#line 11943 "configure"
+ #include "confdefs.h"
+ 
+     #include <stdio.h>
+     #include <string.h>
+     #include <zlib.h>
+     int parse_version(const char *str, int *ver) {
+       return (sscanf(str, "%d.%d.%d", ver, ver+1, ver+2)==3?0:1);
+     }
+@@ -12053,17 +11955,17 @@
+       if ((sys[0] == req[0]) &&
+           ((sys[1] > req[1]) || ((sys[1] == req[1]) && (sys[2] >= req[2]))))
+         exit(0);
+       else
+         exit(1);
+     }
+     
+ EOF
+-if { (eval echo configure:12062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_ZLIB=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=
+ fi
+@@ -12096,36 +11998,36 @@
+ if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
+     CFLAGS="-I${PNG_DIR}/include $CFLAGS"
+     LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
+     SYSTEM_PNG=
+ else
+     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
+-echo "configure:12105: checking for png_get_valid in -lpng" >&5
++echo "configure:12007: checking for png_get_valid in -lpng" >&5
+ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng $PNG_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12113 "configure"
++#line 12015 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char png_get_valid();
+ 
+ int main() {
+ png_get_valid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12143,31 +12045,31 @@
+ 
+ fi
+ if test "$SYSTEM_PNG" = 1; then
+     LIBS="$PNG_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_PNG= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12152 "configure"
++#line 12054 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 	#include <sys/types.h>
+ 	#include <png.h>
+ 	int main () {
+ 	    #if PNG_LIBPNG_VER >= $MOZPNG
+ 		exit(0);
+ 	    #else
+ 		exit(1);
+ 	    #endif
+ 	}
+ 	
+ EOF
+-if { (eval echo configure:12166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_PNG=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_PNG= PNG_CFLAGS= PNG_LIBS=
+ fi
+@@ -12182,16 +12084,38 @@
+ 
+ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
+     PNG_CFLAGS="-I${PNG_DIR}/include"
+     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ fi
+ 
+ fi # SKIP_LIBRARY_CHECKS
+ 
++# Check whether --enable-system-myspell or --disable-system-myspell was given.
++if test "${enable_system_myspell+set}" = set; then
++  enableval="$enable_system_myspell"
++  if test "$enableval" = "yes"; then
++    SYSTEM_MYSPELL=1 
++  elif test "$enableval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, system-myspell, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
++
++
++if test -n "$SYSTEM_MYSPELL"; then
++        MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
++    MOZ_MYSPELL_LIBS="-lhunspell"
++fi
++
++
++
++
++
+ JAVA_INCLUDE_PATH=
+ # Check whether --with-java-include-path or --without-java-include-path was given.
+ if test "${with_java_include_path+set}" = set; then
+   withval="$with_java_include_path"
+   JAVA_INCLUDE_PATH=$withval
+ fi
+ 
+ 
+@@ -12407,17 +12331,17 @@
+      fi
+   fi
+ 
+     unset ac_cv_path_GTK_CONFIG
+ 
+   # 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:12416: checking for $ac_word" >&5
++echo "configure:12340: 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
+   case "$GTK_CONFIG" in
+   /*)
+   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -12442,17 +12366,17 @@
+ if test -n "$GTK_CONFIG"; then
+   echo "$ac_t""$GTK_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_gtk_version=$GTK_VERSION
+   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+-echo "configure:12451: checking for GTK - version >= $min_gtk_version" >&5
++echo "configure:12375: checking for GTK - version >= $min_gtk_version" >&5
+   no_gtk=""
+   if test "$GTK_CONFIG" = "no" ; then
+     no_gtk=yes
+   else
+     GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+     GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+     gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -12465,17 +12389,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GTK_CFLAGS"
+       LIBS="$LIBS $GTK_LIBS"
+       rm -f conf.gtktest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12474 "configure"
++#line 12398 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -12543,17 +12467,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:12552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_gtk=yes
+ fi
+@@ -12578,27 +12502,27 @@
+      else
+        if test -f conf.gtktest ; then
+         :
+        else
+           echo "*** Could not run GTK test program, checking why..."
+           CFLAGS="$CFLAGS $GTK_CFLAGS"
+           LIBS="$LIBS $GTK_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 12587 "configure"
++#line 12511 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12521: \"$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"
+           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -12640,17 +12564,17 @@
+ 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:12649: checking for $ac_word" >&5
++echo "configure:12573: 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.
+   ;;
+   ?:/*)			 
+@@ -12684,29 +12608,29 @@
+      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 gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6
+-echo "configure:12693: checking for gtk+-2.0 >= 1.3.7" >&5
++echo "configure:12617: 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:12700: checking MOZ_GTK2_CFLAGS" >&5
++echo "configure:12624: 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:12705: checking MOZ_GTK2_LIBS" >&5
++echo "configure:12629: 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\"`"
+             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
+         else
+             MOZ_GTK2_CFLAGS=""
+             MOZ_GTK2_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -12761,17 +12685,17 @@
+     if test -x "$QTDIR/bin/moc"; then
+       HOST_MOC="$QTDIR/bin/moc"
+     else
+       for ac_prog in moc
+ 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:12770: checking for $ac_word" >&5
++echo "configure:12694: 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
+   if test -n "$HOST_MOC"; then
+   ac_cv_prog_HOST_MOC="$HOST_MOC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -12813,32 +12737,32 @@
+     ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
+-echo "configure:12822: checking for main in -lqt" >&5
++echo "configure:12746: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lqt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12830 "configure"
++#line 12754 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12761: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12847,32 +12771,32 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   QT_LIB=-lqt
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
+-echo "configure:12856: checking for main in -lqt-mt" >&5
++echo "configure:12780: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lqt-mt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12864 "configure"
++#line 12788 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12795: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12898,30 +12822,30 @@
+ 
+     _SAVE_CXXFLAGS=$CXXFLAGS
+     _SAVE_LIBS=$LIBS
+ 
+     CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
+     LIBS="$LIBS $QT_LIBS"
+     
+     echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
+-echo "configure:12907: checking Qt - version >= $QT_VERSION" >&5
++echo "configure:12831: checking Qt - version >= $QT_VERSION" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 12909 "configure"
++#line 12833 "configure"
+ #include "confdefs.h"
+ #include <qglobal.h>
+ int main() {
+ 
+         #if (QT_VERSION < $QT_VERSION_NUM)
+             #error  "QT_VERSION too old"
+         #endif
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+ fi
+@@ -13507,17 +13431,17 @@
+ 
+     
+   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:13516: checking for $ac_word" >&5
++echo "configure:13440: 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.
+   ;;
+   ?:/*)			 
+@@ -13551,29 +13475,29 @@
+      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 xft""... $ac_c" 1>&6
+-echo "configure:13560: checking for xft" >&5
++echo "configure:13484: 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:13567: checking MOZ_XFT_CFLAGS" >&5
++echo "configure:13491: 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:13572: checking MOZ_XFT_LIBS" >&5
++echo "configure:13496: 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\"`"
+             echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
+         else
+             MOZ_XFT_CFLAGS=""
+             MOZ_XFT_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13598,17 +13522,17 @@
+ 
+     
+   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:13607: checking for $ac_word" >&5
++echo "configure:13531: 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.
+   ;;
+   ?:/*)			 
+@@ -13642,29 +13566,29 @@
+      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 pango >= 1.1.0""... $ac_c" 1>&6
+-echo "configure:13651: checking for pango >= 1.1.0" >&5
++echo "configure:13575: checking for pango >= 1.1.0" >&5
+ 
+         if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13658: checking _PANGOCHK_CFLAGS" >&5
++echo "configure:13582: checking _PANGOCHK_CFLAGS" >&5
+             _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
+             echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
+-echo "configure:13663: checking _PANGOCHK_LIBS" >&5
++echo "configure:13587: checking _PANGOCHK_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"
+             echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
+         else
+             _PANGOCHK_CFLAGS=""
+             _PANGOCHK_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13714,17 +13638,17 @@
+ 
+     
+   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:13723: checking for $ac_word" >&5
++echo "configure:13647: 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.
+   ;;
+   ?:/*)			 
+@@ -13758,29 +13682,29 @@
+      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 pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
+-echo "configure:13767: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
++echo "configure:13691: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
+ 
+         if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13774: checking MOZ_PANGO_CFLAGS" >&5
++echo "configure:13698: checking MOZ_PANGO_CFLAGS" >&5
+             MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
+             echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
+-echo "configure:13779: checking MOZ_PANGO_LIBS" >&5
++echo "configure:13703: checking MOZ_PANGO_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
+             echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
+         else
+             MOZ_PANGO_CFLAGS=""
+             MOZ_PANGO_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13838,36 +13762,36 @@
+ fi
+ 
+ 
+ if test "$MOZ_X11"
+ then
+     _SAVE_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$XLDFLAGS $LDFLAGS"
+     echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
+-echo "configure:13847: checking for XpGetPrinterList in -lXp" >&5
++echo "configure:13771: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 13855 "configure"
++#line 13779 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XpGetPrinterList();
+ 
+ int main() {
+ XpGetPrinterList()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13790: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -13930,17 +13854,17 @@
+     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:13939: checking for $ac_word" >&5
++echo "configure:13863: 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.
+   ;;
+   ?:/*)			 
+@@ -13974,29 +13898,29 @@
+      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 gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
+-echo "configure:13983: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
++echo "configure:13907: 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:13990: checking MOZ_GNOMEVFS_CFLAGS" >&5
++echo "configure:13914: 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:13995: checking MOZ_GNOMEVFS_LIBS" >&5
++echo "configure:13919: 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\"`"
+             echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
+         else
+             MOZ_GNOMEVFS_CFLAGS=""
+             MOZ_GNOMEVFS_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14037,17 +13961,17 @@
+     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:14046: checking for $ac_word" >&5
++echo "configure:13970: 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.
+   ;;
+   ?:/*)			 
+@@ -14081,29 +14005,29 @@
+      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 gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
+-echo "configure:14090: checking for gconf-2.0 >= $GCONF_VERSION" >&5
++echo "configure:14014: 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:14097: checking MOZ_GCONF_CFLAGS" >&5
++echo "configure:14021: 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:14102: checking MOZ_GCONF_LIBS" >&5
++echo "configure:14026: 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\"`"
+             echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
+         else
+             MOZ_GCONF_CFLAGS=""
+             MOZ_GCONF_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14140,17 +14064,17 @@
+     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:14149: checking for $ac_word" >&5
++echo "configure:14073: 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.
+   ;;
+   ?:/*)			 
+@@ -14184,29 +14108,29 @@
+      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 libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
+-echo "configure:14193: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
++echo "configure:14117: 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:14200: checking MOZ_LIBGNOME_CFLAGS" >&5
++echo "configure:14124: 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:14205: checking MOZ_LIBGNOME_LIBS" >&5
++echo "configure:14129: 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\"`"
+             echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6
+         else
+             MOZ_LIBGNOME_CFLAGS=""
+             MOZ_LIBGNOME_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14274,17 +14198,17 @@
+     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:14283: checking for $ac_word" >&5
++echo "configure:14207: 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.
+   ;;
+   ?:/*)			 
+@@ -14318,29 +14242,29 @@
+      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 libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
+-echo "configure:14327: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
++echo "configure:14251: 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:14334: checking MOZ_GNOMEUI_CFLAGS" >&5
++echo "configure:14258: 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:14339: checking MOZ_GNOMEUI_LIBS" >&5
++echo "configure:14263: 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\"`"
+             echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
+         else
+             MOZ_GNOMEUI_CFLAGS=""
+             MOZ_GNOMEUI_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14816,17 +14740,17 @@
+         JAVA_PATH="$JAVA_BIN_PATH"
+   else
+         JAVA_PATH="$JAVA_HOME/bin:$PATH"
+   fi
+ 
+   # 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:14825: checking for $ac_word" >&5
++echo "configure:14749: 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
+   case "$JAVAC" in
+   /*)
+   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -14852,17 +14776,17 @@
+   echo "$ac_t""$JAVAC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   # 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:14861: checking for $ac_word" >&5
++echo "configure:14785: 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
+   case "$JAR" in
+   /*)
+   ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15099,36 +15023,36 @@
+    SVG_RENDERER=$SVG_DEFAULT_RENDERER
+ fi
+ 
+ 
+   case "$SVG_RENDERER" in
+   gdiplus)
+     MOZ_SVG_RENDERER_GDIPLUS=1
+                         echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
+-echo "configure:15108: checking for Gdiplus.h" >&5
++echo "configure:15032: checking for Gdiplus.h" >&5
+     
+     ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     cat > conftest.$ac_ext <<EOF
+-#line 15118 "configure"
++#line 15042 "configure"
+ #include "confdefs.h"
+ #include <windows.h>
+                     #include <unknwn.h>
+                     #include <Gdiplus.h>
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: Building the SVG GDI+ renderer requires an appropriate Microsoft SDK." 1>&2; exit 1; }
+ fi
+@@ -15198,17 +15122,17 @@
+ if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then
+     # Disable installer for Windows builds that use the new toolkit if NSIS
+     # isn't in the path.
+     for ac_prog in makensis
+ 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:15207: checking for $ac_word" >&5
++echo "configure:15131: 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
+   case "$MAKENSIS" in
+   /*)
+   ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15243,17 +15167,17 @@
+     fi
+     # The Windows build for NSIS requires the iconv command line utility to
+     # convert the charset of the locale files.
+     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:15252: checking for $ac_word" >&5
++echo "configure:15176: 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
+   case "$HOST_ICONV" in
+   /*)
+   ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15312,23 +15236,23 @@
+ fi
+ 
+ # The Windows build requires the iconv command line utility
+ # in order to build the updater.
+ case "$target_os" in
+     msvc*|mks*|cygwin*|mingw*|wince*)
+         if test -n "$MOZ_UPDATER"; then
+             echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:15321: checking for iconv" >&5
++echo "configure:15245: 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:15327: checking for $ac_word" >&5
++echo "configure:15251: 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
+   if test -n "$HOST_ICONV"; then
+   ac_cv_prog_HOST_ICONV="$HOST_ICONV" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -15670,28 +15594,28 @@
+         ;;
+   esac
+ MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DTRACING"
+ 
+ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED"
+ 
+ if test -n "$MOZ_DEBUG"; then
+     echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
+-echo "configure:15679: checking for valid debug flags" >&5
++echo "configure:15603: checking for valid debug flags" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 15683 "configure"
++#line 15607 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _results=no
+ fi
+@@ -15722,28 +15646,28 @@
+ else
+   MOZ_OPTIMIZE=1
+ fi
+ 
+ 
+ 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:15731: checking for valid optimization flags" >&5
++echo "configure:15655: checking for valid optimization flags" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 15735 "configure"
++#line 15659 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _results=no
+ fi
+@@ -15950,36 +15874,36 @@
+     _ENABLE_EFENCE= 
+   else
+     { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; }
+   fi
+ fi
+ 
+ if test -n "$_ENABLE_EFENCE"; then
+     echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
+-echo "configure:15959: checking for malloc in -lefence" >&5
++echo "configure:15883: 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
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lefence  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 15967 "configure"
++#line 15891 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char malloc();
+ 
+ int main() {
+ malloc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15902: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -16070,22 +15994,22 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     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:16079: checking for $ac_func" >&5
++echo "configure:16003: 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 <<EOF
+-#line 16084 "configure"
++#line 16008 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -16101,17 +16025,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16034: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -16344,22 +16268,22 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     for ac_func in __cxa_demangle
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:16353: checking for $ac_func" >&5
++echo "configure:16277: 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 <<EOF
+-#line 16358 "configure"
++#line 16282 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -16375,17 +16299,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16308: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -16513,39 +16437,39 @@
+ fi
+ 
+ 
+ 
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+ # Compiler Options
+ 
+ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
+-echo "configure:16522: checking for gcc -pipe support" >&5
++echo "configure:16446: checking for gcc -pipe support" >&5
+ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
+     echo '#include <stdio.h>' > dummy-hello.c
+     echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
+     ${CC} -S dummy-hello.c -o dummy-hello.s 2>&5
+     cat dummy-hello.s | ${AS_BIN} -o dummy-hello.S - 2>&5
+     if test $? = 0; then
+         _res_as_stdin="yes"
+     else
+         _res_as_stdin="no"
+     fi
+     if test "$_res_as_stdin" = "yes"; then
+         _SAVE_CFLAGS=$CFLAGS
+         CFLAGS="$CFLAGS -pipe"
+         cat > conftest.$ac_ext <<EOF
+-#line 16537 "configure"
++#line 16461 "configure"
+ #include "confdefs.h"
+  #include <stdio.h> 
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _res_gcc_pipe="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _res_gcc_pipe="no" 
+ fi
+@@ -16577,26 +16501,26 @@
+   fi
+ fi
+ 
+ 
+ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
+      _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:16586: checking whether compiler supports -Wno-long-long" >&5
++echo "configure:16510: checking whether compiler supports -Wno-long-long" >&5
+      cat > conftest.$ac_ext <<EOF
+-#line 16588 "configure"
++#line 16512 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16519: \"$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"
+ 	  result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -16607,26 +16531,26 @@
+      CFLAGS="$_SAVE_CFLAGS"
+ fi
+ 
+ 
+ _SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fprofile-generate"
+ 
+ echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
+-echo "configure:16616: checking whether C compiler supports -fprofile-generate" >&5
++echo "configure:16540: checking whether C compiler supports -fprofile-generate" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 16618 "configure"
++#line 16542 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    PROFILE_GEN_CFLAGS="-fprofile-generate"
+                  result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+@@ -16634,26 +16558,26 @@
+ rm -f conftest*
+ echo "$ac_t""$result" 1>&6
+ 
+ if test $result = "yes"; then
+   PROFILE_USE_CFLAGS="-fprofile-use"
+ else
+   CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
+   echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
+-echo "configure:16643: checking whether C compiler supports -fprofile-arcs" >&5
++echo "configure:16567: checking whether C compiler supports -fprofile-arcs" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 16645 "configure"
++#line 16569 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    PROFILE_GEN_CFLAGS="-fprofile-arcs"
+                    result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+@@ -16689,26 +16613,26 @@
+     { echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; }
+   fi
+ fi
+ 
+ if test "$_PEDANTIC"; then
+     _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:16698: checking whether C++ compiler has -pedantic long long bug" >&5
++echo "configure:16622: checking whether C++ compiler has -pedantic long long bug" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 16700 "configure"
++#line 16624 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="yes" 
+ fi
+@@ -16723,23 +16647,26 @@
+         ;;
+     yes)
+         { echo "configure: error: Your compiler appears to have a known bug where long long is miscompiled when using -pedantic.  Reconfigure using --disable-pedantic. " 1>&2; exit 1; }
+         ;;
+     esac
+ fi
+ 
+ echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
+-echo "configure:16732: checking for correct temporary object destruction order" >&5
++echo "configure:16656: checking for correct temporary object destruction order" >&5
+ if test "$cross_compiling" = yes; then
+   result="maybe"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 16737 "configure"
++#line 16661 "configure"
+ #include "confdefs.h"
++#ifdef __cplusplus
++extern "C" void exit(int);
++#endif
+  class A {
+              public:  A(int& x) : mValue(x) {}
+                       ~A() { mValue--; }
+                       operator char**() { return 0; }
+              private:  int& mValue;
+              };
+              void func(char **arg) {}
+              int m=2;
+@@ -16748,17 +16675,17 @@
+                   if (m==1) m = 0;
+              }
+              int main() {
+                  test();
+                  return(m);
+              }
+              
+ EOF
+-if { (eval echo configure:16757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   result="no"
+ fi
+@@ -16769,22 +16696,22 @@
+ 
+ if test "$result" = "no"; then
+     { echo "configure: error: Your compiler does not follow the C++ specification for temporary object destruction order." 1>&2; exit 1; }
+ fi
+ 
+ _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:16778: checking for correct overload resolution with const and templates" >&5
++echo "configure:16705: 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 <<EOF
+-#line 16783 "configure"
++#line 16710 "configure"
+ #include "confdefs.h"
+ 
+                       template <class T>
+                       class Pointer
+                         {
+                         public:
+                           T* myPtr;
+                         };
+@@ -16804,17 +16731,17 @@
+ int main() {
+ 
+                       Pointer<int> foo;
+                       const int* bar;
+                       return foo == bar;
+                     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_nscap_nonconst_opeq_bug="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_nscap_nonconst_opeq_bug="yes"
+ fi
+@@ -17096,17 +17023,17 @@
+     if test "$MOZ_ENABLE_GTK2"; 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:17105: checking for $ac_word" >&5
++echo "configure:17032: 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.
+   ;;
+   ?:/*)			 
+@@ -17140,29 +17067,29 @@
+      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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
+-echo "configure:17149: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:17076: 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:17156: checking LIBIDL_CFLAGS" >&5
++echo "configure:17083: 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:17161: checking LIBIDL_LIBS" >&5
++echo "configure:17088: 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\"`"
+             echo "$ac_t""$LIBIDL_LIBS" 1>&6
+         else
+             LIBIDL_CFLAGS=""
+             LIBIDL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -17275,17 +17202,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # 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:17284: checking for $ac_word" >&5
++echo "configure:17211: 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
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17310,17 +17237,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:17319: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:17246: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -17333,17 +17260,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17342 "configure"
++#line 17269 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -17409,17 +17336,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -17443,27 +17370,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17452 "configure"
++#line 17379 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:17462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17389: \"$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"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -17497,17 +17424,17 @@
+   rm -f conf.glibtest
+ 
+ 
+     unset ac_cv_path_LIBIDL_CONFIG
+ 
+   # 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:17506: checking for $ac_word" >&5
++echo "configure:17433: 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
+   case "$LIBIDL_CONFIG" in
+   /*)
+   ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17532,17 +17459,17 @@
+ if test -n "$LIBIDL_CONFIG"; then
+   echo "$ac_t""$LIBIDL_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_libIDL_version=$LIBIDL_VERSION
+   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
+-echo "configure:17541: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:17468: checking for libIDL - version >= $min_libIDL_version" >&5
+   no_libIDL=""
+   if test "$LIBIDL_CONFIG" = "no" ; then
+     no_libIDL=yes
+   else
+     LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
+     LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
+     # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
+     # this after we start requiring libIDL 0.6.8 or anything higher
+@@ -17559,17 +17486,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+       LIBS="$LIBIDL_LIBS $LIBS"
+       rm -f conf.libIDLtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17568 "configure"
++#line 17495 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int 
+ main ()
+@@ -17645,17 +17572,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_libIDL=yes
+ fi
+@@ -17679,28 +17606,28 @@
+      else
+        if test -f conf.libIDLtest ; then
+         :
+        else
+           echo "*** Could not run libIDL test program, checking why..."
+           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+           LIBS="$LIBS $LIBIDL_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17688 "configure"
++#line 17615 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int main() {
+  return IDL_get_libver_string ? 1 : 0; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:17699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17626: \"$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"
+           echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -17818,17 +17745,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # 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:17827: checking for $ac_word" >&5
++echo "configure:17754: 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
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17853,17 +17780,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:17862: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:17789: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -17876,17 +17803,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17885 "configure"
++#line 17812 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -17952,17 +17879,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -17986,27 +17913,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17995 "configure"
++#line 17922 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17932: \"$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"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18040,17 +17967,17 @@
+   rm -f conf.glibtest
+ 
+ 
+     unset ac_cv_path_LIBIDL_CONFIG
+ 
+   # 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:18049: checking for $ac_word" >&5
++echo "configure:17976: 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
+   case "$LIBIDL_CONFIG" in
+   /*)
+   ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18075,17 +18002,17 @@
+ if test -n "$LIBIDL_CONFIG"; then
+   echo "$ac_t""$LIBIDL_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_libIDL_version=$LIBIDL_VERSION
+   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
+-echo "configure:18084: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:18011: checking for libIDL - version >= $min_libIDL_version" >&5
+   no_libIDL=""
+   if test "$LIBIDL_CONFIG" = "no" ; then
+     no_libIDL=yes
+   else
+     LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
+     LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
+     # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
+     # this after we start requiring libIDL 0.6.8 or anything higher
+@@ -18102,17 +18029,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+       LIBS="$LIBIDL_LIBS $LIBS"
+       rm -f conf.libIDLtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18111 "configure"
++#line 18038 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int 
+ main ()
+@@ -18188,17 +18115,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:18197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_libIDL=yes
+ fi
+@@ -18222,28 +18149,28 @@
+      else
+        if test -f conf.libIDLtest ; then
+         :
+        else
+           echo "*** Could not run libIDL test program, checking why..."
+           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+           LIBS="$LIBS $LIBIDL_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 18231 "configure"
++#line 18158 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int main() {
+  return IDL_get_libver_string ? 1 : 0; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18169: \"$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"
+           echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18274,17 +18201,17 @@
+         if test -z "$_LIBIDL_FOUND"; 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:18283: checking for $ac_word" >&5
++echo "configure:18210: 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.
+   ;;
+   ?:/*)			 
+@@ -18318,29 +18245,29 @@
+      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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
+-echo "configure:18327: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:18254: 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:18334: checking LIBIDL_CFLAGS" >&5
++echo "configure:18261: 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:18339: checking LIBIDL_LIBS" >&5
++echo "configure:18266: 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\"`"
+             echo "$ac_t""$LIBIDL_LIBS" 1>&6
+         else
+             LIBIDL_CFLAGS=""
+             LIBIDL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -18366,17 +18293,17 @@
+         fi
+     fi
+                     if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then
+         for ac_prog in $ORBIT_CONFIG orbit-config
+ 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:18375: checking for $ac_word" >&5
++echo "configure:18302: 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
+   case "$ORBIT_CONFIG" in
+   /*)
+   ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18403,49 +18330,49 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ test -n "$ORBIT_CONFIG" && break
+ done
+ 
+         if test -n "$ORBIT_CONFIG"; then
+             echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
+-echo "configure:18412: checking for ORBit libIDL usability" >&5
++echo "configure:18339: 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}`
+             _ORBIT_LIB_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-L/); } }' -- ${_ORBIT_LIBS}`
+             LIBIDL_CFLAGS="$_ORBIT_INC_PATH"
+             LIBIDL_LIBS="$_ORBIT_LIB_PATH -lIDL -lglib"
+             LIBIDL_CONFIG=
+             _SAVE_CFLAGS="$CFLAGS"
+             _SAVE_LIBS="$LIBS"
+             CFLAGS="$LIBIDL_CFLAGS $CFLAGS"
+             LIBS="$LIBIDL_LIBS $LIBS"
+             if test "$cross_compiling" = yes; then
+   _LIBIDL_FOUND=1
+                 result="maybe" 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18429 "configure"
++#line 18356 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ int main() {
+   char *s;
+   s=strdup(IDL_get_libver_string());
+   if(s==NULL) {
+     exit(1);
+   }
+   exit(0);
+ }
+             
+ EOF
+-if { (eval echo configure:18444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18371: \"$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"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   LIBIDL_CFLAGS=
+@@ -18492,17 +18419,17 @@
+     if test "$MOZ_ENABLE_GTK2"; 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:18501: checking for $ac_word" >&5
++echo "configure:18428: 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.
+   ;;
+   ?:/*)			 
+@@ -18536,29 +18463,29 @@
+      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 glib-2.0 >= 1.3.7""... $ac_c" 1>&6
+-echo "configure:18545: checking for glib-2.0 >= 1.3.7" >&5
++echo "configure:18472: 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:18552: checking GLIB_CFLAGS" >&5
++echo "configure:18479: 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:18557: checking GLIB_LIBS" >&5
++echo "configure:18484: 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\"`"
+             echo "$ac_t""$GLIB_LIBS" 1>&6
+         else
+             GLIB_CFLAGS=""
+             GLIB_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -18632,17 +18559,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # 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:18641: checking for $ac_word" >&5
++echo "configure:18568: 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
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18667,17 +18594,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=${GLIB_VERSION}
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:18676: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:18603: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -18690,17 +18617,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18699 "configure"
++#line 18626 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -18766,17 +18693,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:18775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -18800,27 +18727,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 18809 "configure"
++#line 18736 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18746: \"$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"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18890,29 +18817,29 @@
+       ;;
+   *)
+       MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+       ;;
+   esac
+   # 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:18899: checking for working alloca.h" >&5
++echo "configure:18826: 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 <<EOF
+-#line 18904 "configure"
++#line 18831 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18838: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_alloca_h=no
+ fi
+@@ -18923,22 +18850,22 @@
+ if test $ac_cv_header_alloca_h = yes; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ALLOCA_H 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:18932: checking for alloca" >&5
++echo "configure:18859: 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 <<EOF
+-#line 18937 "configure"
++#line 18864 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+ # define alloca __builtin_alloca
+ #else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
+@@ -18956,17 +18883,17 @@
+ #  endif
+ # endif
+ #endif
+ 
+ int main() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18892: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_alloca_works=no
+ fi
+@@ -18988,22 +18915,22 @@
+   # use ar to extract alloca.o from them instead of compiling alloca.c.
+   ALLOCA=alloca.${ac_objext}
+   cat >> confdefs.h <<\EOF
+ #define C_ALLOCA 1
+ EOF
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:18997: checking whether alloca needs Cray hooks" >&5
++echo "configure:18924: 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 <<EOF
+-#line 19002 "configure"
++#line 18929 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+ #else
+ wenotbecray
+ #endif
+ 
+ EOF
+@@ -19018,22 +18945,22 @@
+ rm -f conftest*
+ 
+ fi
+ 
+ echo "$ac_t""$ac_cv_os_cray" 1>&6
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:19027: checking for $ac_func" >&5
++echo "configure:18954: 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 <<EOF
+-#line 19032 "configure"
++#line 18959 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -19046,17 +18973,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18982: \"$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
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -19073,25 +19000,25 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ done
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:19082: checking stack direction for C alloca" >&5
++echo "configure:19009: 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
+   if test "$cross_compiling" = yes; then
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 19090 "configure"
++#line 19017 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+   static char *addr = 0;
+   auto char dummy;
+   if (addr == 0)
+     {
+       addr = &dummy;
+@@ -19100,17 +19027,17 @@
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+ main ()
+ {
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:19109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_c_stack_direction=-1
+ fi
+@@ -19149,27 +19076,27 @@
+ 
+ 
+    if test "$MOZ_TREE_CAIRO"; then
+        # Check for headers defining standard int types.
+        for ac_hdr in stdint.h inttypes.h sys/int_types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:19158: checking for $ac_hdr" >&5
++echo "configure:19085: 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
+-#line 19163 "configure"
++#line 19090 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:19168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:19095: \"$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*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -19250,17 +19177,17 @@
+    else
+       
+   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:19259: checking for $ac_word" >&5
++echo "configure:19186: 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.
+   ;;
+   ?:/*)			 
+@@ -19294,29 +19221,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
+-echo "configure:19303: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:19230: 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:19310: checking CAIRO_CFLAGS" >&5
++echo "configure:19237: 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:19315: checking CAIRO_LIBS" >&5
++echo "configure:19242: 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\"`"
+             echo "$ac_t""$CAIRO_LIBS" 1>&6
+         else
+             CAIRO_CFLAGS=""
+             CAIRO_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -19336,23 +19263,220 @@
+   if test $succeeded = yes; then
+      :
+   else
+      { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) 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
+ 
+       MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
+       MOZ_CAIRO_LIBS=$CAIRO_LIBS
++
++      if test "$MOZ_X11"; then
++          if test "$MOZ_SVG_RENDERER_CAIRO"; then
++              
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:19282: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6
++echo "configure:19326: checking for cairo-xlib >= $CAIRO_VERSION" >&5
++
++        if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6
++echo "configure:19333: checking CAIRO_XLIB_CFLAGS" >&5
++            CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"`
++            echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6
++
++            echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6
++echo "configure:19338: checking CAIRO_XLIB_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`"
++            echo "$ac_t""$CAIRO_XLIB_LIBS" 1>&6
++        else
++            CAIRO_XLIB_CFLAGS=""
++            CAIRO_XLIB_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     :
++  fi
++
++              MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS
++              MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
++          fi
++          if test "$MOZ_ENABLE_CANVAS"; then
++              
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:19377: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6
++echo "configure:19421: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
++
++        if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6
++echo "configure:19428: checking CAIRO_XRENDER_CFLAGS" >&5
++            CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"`
++            echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6
++
++            echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6
++echo "configure:19433: checking CAIRO_XRENDER_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`"
++            echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6
++        else
++            CAIRO_XRENDER_CFLAGS=""
++            CAIRO_XRENDER_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     :
++  fi
++
++              MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS
++              MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS"
++          fi
++      fi
+    fi
+ fi
+ 
+ 
+ 
+ 
+ 
++
++
++
++
+ # Check whether --enable-xul or --disable-xul was given.
+ if test "${enable_xul+set}" = set; then
+   enableval="$enable_xul"
+   if test "$enableval" = "no"; then
+     MOZ_XUL= 
+   elif test "$enableval" = "yes"; then
+     :
+   else
+@@ -19371,17 +19495,17 @@
+ 
+ 
+ 
+ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then
+         if test -z "$PYTHON"; then
+         # 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:19380: checking for $ac_word" >&5
++echo "configure:19504: 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
+   case "$PYTHON" in
+   /*)
+   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -19647,24 +19771,24 @@
+     ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+     cat > conftest.$ac_ext <<EOF
+-#line 19656 "configure"
++#line 19780 "configure"
+ #include "confdefs.h"
+ #include <gmodule.h>
+ int main() {
+  int x = 1; x++; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19787: \"$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*
+   { echo "configure: error: Cannot build ctl without gmodule support in glib." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+@@ -19962,33 +20086,33 @@
+    
+ fi
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test "$MOZ_X11"; then
+                 _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $XCFLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 19971 "configure"
++#line 20095 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdio.h>
+         #include <X11/Xlib.h>
+     
+ int main() {
+ 
+         Display *dpy = 0;
+         if ((dpy = XOpenDisplay(NULL)) == NULL) {
+             fprintf(stderr, ": can't open %s\n", XDisplayName(NULL));
+             exit(1);
+         }
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20111: \"$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*
+    { echo "configure: error: Could not compile basic X program." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -20196,44 +20320,25 @@
+   fi
+ 
+ rm -f confdefs.h.save
+ mv confdefs.h confdefs.h.save
+ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
+ # 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
+ 
+ rm -f confdefs.h
+ mv confdefs.h.save confdefs.h
+ 
+ . ${srcdir}/allmakefiles.sh
+ if test -z "${AS_PERL}"; then
+@@ -20463,16 +20568,19 @@
+ s%@LIBOBJS@%$LIBOBJS%g
+ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g
+ s%@NSPR_CONFIG@%$NSPR_CONFIG%g
+ s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
+ s%@NSPR_LIBS@%$NSPR_LIBS%g
+ s%@NSS_CONFIG@%$NSS_CONFIG%g
+ s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+ s%@NSS_LIBS@%$NSS_LIBS%g
++s%@SYSTEM_MYSPELL@%$SYSTEM_MYSPELL%g
++s%@MOZ_MYSPELL_LIBS@%$MOZ_MYSPELL_LIBS%g
++s%@MOZ_MYSPELL_CFLAGS@%$MOZ_MYSPELL_CFLAGS%g
+ s%@GTK_CONFIG@%$GTK_CONFIG%g
+ s%@GTK_CFLAGS@%$GTK_CFLAGS%g
+ s%@GTK_LIBS@%$GTK_LIBS%g
+ s%@PKG_CONFIG@%$PKG_CONFIG%g
+ s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
+ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
+ s%@HOST_MOC@%$HOST_MOC%g
+ s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
+@@ -20587,19 +20695,27 @@
+ s%@OS2_SURFACE_FEATURE@%$OS2_SURFACE_FEATURE%g
+ s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g
+ s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g
+ s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g
+ s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g
+ s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g
+ s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g
+ s%@CAIRO_LIBS@%$CAIRO_LIBS%g
++s%@CAIRO_XLIB_CFLAGS@%$CAIRO_XLIB_CFLAGS%g
++s%@CAIRO_XLIB_LIBS@%$CAIRO_XLIB_LIBS%g
++s%@CAIRO_XRENDER_CFLAGS@%$CAIRO_XRENDER_CFLAGS%g
++s%@CAIRO_XRENDER_LIBS@%$CAIRO_XRENDER_LIBS%g
+ s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g
+ s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g
+ s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g
++s%@MOZ_CAIRO_XLIB_CFLAGS@%$MOZ_CAIRO_XLIB_CFLAGS%g
++s%@MOZ_CAIRO_XLIB_LIBS@%$MOZ_CAIRO_XLIB_LIBS%g
++s%@MOZ_CAIRO_XRENDER_CFLAGS@%$MOZ_CAIRO_XRENDER_CFLAGS%g
++s%@MOZ_CAIRO_XRENDER_LIBS@%$MOZ_CAIRO_XRENDER_LIBS%g
+ s%@MOZ_XUL@%$MOZ_XUL%g
+ s%@MOZ_PYTHON@%$MOZ_PYTHON%g
+ s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g
+ s%@MOZ_PYTHON_INCLUDES@%$MOZ_PYTHON_INCLUDES%g
+ s%@MOZ_PYTHON_LIBS@%$MOZ_PYTHON_LIBS%g
+ s%@MOZ_PYTHON_VER@%$MOZ_PYTHON_VER%g
+ s%@MOZ_PYTHON_VER_DOTTED@%$MOZ_PYTHON_VER_DOTTED%g
+ s%@MOZ_PYTHON_DEBUG_SUFFIX@%$MOZ_PYTHON_DEBUG_SUFFIX%g
+@@ -21163,17 +21279,17 @@
+       # The eval makes quoting arguments work.
+       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+       then :
+       else
+         { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+       fi
+     fi
+ 
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+     # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
+@@ -21306,15 +21422,15 @@
+       # The eval makes quoting arguments work.
+       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+       then :
+       else
+         { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+       fi
+     fi
+ 
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+ fi # COMPILE_ENVIRONMENT
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/mailnews_mime_export
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/mailnews_mime_export
@@ -0,0 +1,27 @@
+---
+ mailnews/mime/src/Makefile.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: mozilla/mailnews/mime/src/Makefile.in
+===================================================================
+--- mozilla.orig/mailnews/mime/src/Makefile.in	2005-04-15 17:52:51.000000000 +0000
++++ mozilla/mailnews/mime/src/Makefile.in	2007-04-23 11:55:55.000000000 +0000
+@@ -149,16 +149,18 @@
+ 		nsMimeHeaders.h \
+ 		nsStreamConverter.h \
+ 		nsMsgHeaderParser.h \
+ 		mimetext.h \
+ 		mimeleaf.h \
+ 		mimecth.h \
+ 		mimeobj.h \
+ 		mimei.h \
++		mimecryp.h \
++		mimemoz2.h \
+ 		modmimee.h \
+ 		mimecont.h \
+ 		mimemult.h \
+ 		mimemsig.h \
+ 		mimehdrs.h \
+ 		mimepbuf.h \
+ 		modlmime.h \
+ 		comi18n.h \
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem
@@ -0,0 +1,144 @@
+---
+ mail/base/content/mailWindowOverlay.xul     |   10 ++++
+ mail/base/content/ubuntuReportBugOverlay.js |   63 ++++++++++++++++++++++++++++
+ mail/base/jar.mn                            |    1 
+ 3 files changed, 74 insertions(+)
+
+Index: mozilla/mail/base/content/mailWindowOverlay.xul
+===================================================================
+--- mozilla.orig/mail/base/content/mailWindowOverlay.xul
++++ mozilla/mail/base/content/mailWindowOverlay.xul
+@@ -69,16 +69,20 @@
+ <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+ <script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
+ <script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
+ <script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
+ <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
+ <script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+ <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+ 
++<!-- ubuntu report a bug routines -->
++<script src="ubuntuReportBugOverlay.js"/>
++
++
+ <stringbundleset id="stringbundleset">
+   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+   <stringbundle id="bundle_shell" src="chrome://messenger/locale/shellservice.properties"/>
+   <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
+   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
+ </stringbundleset>
+  
+ <!-- Performance optimization...we include utilityOverlay.xul which defines some command sets
+@@ -1893,16 +1897,22 @@
+      <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
+ #ifdef XP_MACOSX
+           <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
+           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
+ #else
+           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
+           <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
+ #endif
++
++          <!-- ubuntu report a bug -->
++          <menuitem id="ubuntu_report_a_bug" label="Report a Bug..."
++                    oncommand="ubuntuReportBug(event);"/>
++          <!-- label="&reportABugTranslate.label;" at some point -->
++
+           <menuseparator id="menu_HelpAboutSeparator"/>
+           <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
+                     label="&updateCmd.label;" oncommand="checkForUpdates();"/>
+ #ifndef XP_MACOSX
+           <menuseparator id="menu_HelpAfterUpdatesSeparator"/>
+ #endif
+           <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
+                     label="&aboutCmd.label;"
+Index: mozilla/mail/base/content/ubuntuReportBugOverlay.js
+===================================================================
+--- /dev/null
++++ mozilla/mail/base/content/ubuntuReportBugOverlay.js
+@@ -0,0 +1,63 @@
++/*
++# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++# ***** 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
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1998
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Alexander Sack <asac@ubuntu.com>
++#
++# 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 *****
++*/
++
++function ubuntuReportBug(event) {
++
++  var executable =
++      Components.classes['@mozilla.org/file/local;1']
++      .createInstance(Components.interfaces.nsILocalFile);
++
++  executable.initWithPath("/usr/bin/ubuntu-bug");
++
++  if(!executable.isExecutable)
++	  alert('NOasd');
++
++  var procUtil =
++      Components.classes['@mozilla.org/process/util;1']
++      .createInstance(Components.interfaces.nsIProcess);
++
++  var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
++
++  procUtil.init(executable);
++
++  var args = new Array("-p", "mozilla-thunderbird" );
++  //  var args = new Array();
++  var res = procUtil.run(false, args, args.length);
++}
+Index: mozilla/mail/base/jar.mn
+===================================================================
+--- mozilla.orig/mail/base/jar.mn
++++ mozilla/mail/base/jar.mn
+@@ -37,16 +37,17 @@
+     content/messenger/aboutDialog.css               (content/aboutDialog.css)
+ *   content/messenger/credits.xhtml                 (content/credits.xhtml)
+     content/messenger/start.xhtml                   (content/start.xhtml)
+     content/messenger/startpage-h1.png              (content/startpage-h1.png)
+     content/messenger/startpage-h1-rtl.png          (content/startpage-h1-rtl.png)
+     content/messenger/startpage-h2.png              (content/startpage-h2.png)
+     content/messenger/startpage-h2-rtl.png          (content/startpage-h2-rtl.png)
+     content/messenger/startpage-li.png              (content/startpage-li.png)
++*   content/messenger/ubuntuReportBugOverlay.js     (content/ubuntuReportBugOverlay.js)
+     content/messenger/messenger.css                 (content/messenger.css)
+ *   content/messenger/search.xml                    (content/search.xml)
+ *   content/messenger/newmailalert.xul              (content/newmailalert.xul)
+     content/messenger/newmailalert.js               (content/newmailalert.js)
+ #ifdef MOZ_USE_GENERIC_BRANDING
+ % content branding %content/branding/ xpcnativewrappers=yes
+     content/branding/about-credits.png              (content/about-credits.png)
+     content/branding/about-thunderbird.png          (content/about-thunderbird.png)
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3
@@ -0,0 +1,34 @@
+
+pragma push hidden fails to build on gcc-4.3 even though GCC bug 26905 and 20297 are
+fixed; apparently some symbols lack a proper visibility hint. This patch makes build
+use -fvisibility=hidden flag even for compilers that don't have the visibility bugs
+mentioned above.
+
+---
+ configure.in |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-08-21 15:52:32.000000000 +0000
++++ mozilla/configure.in	2007-08-21 15:54:29.000000000 +0000
+@@ -2642,18 +2642,17 @@
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+                            ac_cv_visibility_builtin_bug=yes
+                          fi
+                        fi
+                        rm -f conftest.{c,S}
+                        ])
+         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+                 "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
++          VISIBILITY_FLAGS='-fvisibility=hidden'
+         else
+           VISIBILITY_FLAGS='-fvisibility=hidden'
+         fi # have visibility pragma bug
+       fi   # have visibility pragma
+     fi     # have visibility(default) attribute
+   fi       # have visibility(hidden) attribute
+ fi         # GNU_CC
+ 
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/bz280419_att_267284-readonly-download.patch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/bz280419_att_267284-readonly-download.patch
@@ -0,0 +1,28 @@
+---
+ uriloader/exthandler/nsExternalHelperAppService.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
+===================================================================
+--- mozilla.orig/uriloader/exthandler/nsExternalHelperAppService.cpp
++++ mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
+@@ -2422,16 +2422,19 @@
+     return NS_OK;
+   
+   // we only should have gotten here if the on stop request had been fired already.
+ 
+   NS_ASSERTION(mStopRequestIssued, "uhoh, how did we get here if we aren't done getting data?");
+   // if a stop request was already issued then proceed with launching the application.
+   if (mStopRequestIssued)
+   {
++    // make the tmp file readonly so users won't edit it and loose the changes
++    mFinalFileDestination->SetPermissions(0400);
++
+     rv = mMimeInfo->LaunchWithFile(mFinalFileDestination);
+     if (NS_FAILED(rv))
+     {
+       // Send error notification.
+       nsAutoString path;
+       mFinalFileDestination->GetPath(path);
+       SendStatusChange(kLaunchError, rv, nsnull, path);
+       Cancel(rv); // Cancel, and clean up temp file.
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/moz-user-dir-for-xre-profiles
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/moz-user-dir-for-xre-profiles
@@ -0,0 +1,38 @@
+---
+ toolkit/xre/nsXREDirProvider.cpp |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: mozilla/toolkit/xre/nsXREDirProvider.cpp
+===================================================================
+--- mozilla.orig/toolkit/xre/nsXREDirProvider.cpp	2007-04-23 17:10:23.000000000 +0200
++++ mozilla/toolkit/xre/nsXREDirProvider.cpp	2007-04-23 17:10:31.000000000 +0200
+@@ -860,21 +860,29 @@
+   char* writing = profileFolderName + 1;
+   if (gAppData->vendor) {
+     GetProfileFolderName(writing, gAppData->vendor);
+     
+     rv = localDir->AppendNative(nsDependentCString(profileFolderName));
+     NS_ENSURE_SUCCESS(rv, rv);
+  
+     char temp[MAXPATHLEN];
++#ifndef MOZ_USER_DIR
+     GetProfileFolderName(temp, gAppData->name);
++#else
++    GetProfileFolderName(temp, MOZ_USER_DIR + 1);
++#endif
+     appNameFolder = temp;
+   }
+   else {
++#ifndef MOZ_USER_DIR
+     GetProfileFolderName(writing, gAppData->name);
++#else
++    GetProfileFolderName(writing, MOZ_USER_DIR + 1);
++#endif
+     appNameFolder = profileFolderName;
+   }
+   rv = localDir->AppendNative(nsDependentCString(appNameFolder));
+   NS_ENSURE_SUCCESS(rv, rv);
+ #else
+ #error dont_know_how_to_get_product_dir_on_your_platform
+ #endif
+ 
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/hunspell-support
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/hunspell-support
@@ -0,0 +1,143 @@
+---
+ config/autoconf.mk.in                          |    4 ++++
+ configure.in                                   |   16 ++++++++++++++++
+ extensions/spellcheck/myspell/src/Makefile.in  |   24 ++++++++++++++++--------
+ extensions/spellcheck/myspell/src/mozMySpell.h |    2 +-
+ 4 files changed, 37 insertions(+), 9 deletions(-)
+
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2007-04-24 10:11:39.000000000 +0000
++++ mozilla/config/autoconf.mk.in	2007-04-24 10:11:43.000000000 +0000
+@@ -185,16 +185,20 @@
+ 
+ MOZ_XUL                    = @MOZ_XUL@
+ 
+ NECKO_PROTOCOLS = @NECKO_PROTOCOLS@
+ NECKO_DISK_CACHE = @NECKO_DISK_CACHE@
+ NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
+ NECKO_COOKIES = @NECKO_COOKIES@
+ 
++MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
++MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
++MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@
++
+ MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
+ MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
+ MOZ_NATIVE_PNG	= @SYSTEM_PNG@
+ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
+ 
+ MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
+ MOZ_MATHML = @MOZ_MATHML@
+ MOZ_XTF = @MOZ_XTF@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-04-24 10:11:39.000000000 +0000
++++ mozilla/configure.in	2007-04-24 10:11:43.000000000 +0000
+@@ -3862,16 +3862,32 @@
+ 
+ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
+     PNG_CFLAGS="-I${PNG_DIR}/include"
+     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ fi
+ 
+ fi # SKIP_LIBRARY_CHECKS
+ 
++dnl system MySpell Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-myspell,
++[  --enable-system-myspell   Use system myspell (located with pkgconfig)],
++    SYSTEM_MYSPELL=1 )
++
++if test -n "$SYSTEM_MYSPELL"; then
++    dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
++    MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
++    MOZ_MYSPELL_LIBS="-lhunspell"
++fi
++
++AC_SUBST(SYSTEM_MYSPELL)
++AC_SUBST(MOZ_MYSPELL_LIBS)
++AC_SUBST(MOZ_MYSPELL_CFLAGS)
++
+ dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+ JAVA_INCLUDE_PATH=
+ MOZ_ARG_WITH_STRING(java-include-path,
+ [  --with-java-include-path=dir   Location of Java SDK headers],
+     JAVA_INCLUDE_PATH=$withval)
+ 
+Index: mozilla/extensions/spellcheck/myspell/src/Makefile.in
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/Makefile.in	2007-04-24 10:11:39.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/Makefile.in	2007-04-24 10:11:43.000000000 +0000
+@@ -55,30 +55,38 @@
+ REQUIRES	= xpcom \
+ 		  string \
+ 		  uconv \
+ 		  unicharutil \
+ 		  spellchecker \
+ 		  xulapp \
+ 		  $(NULL)
+ 
+-CPPSRCS =         affentry.cpp \
+-		  affixmgr.cpp \
+-		  hashmgr.cpp \
+-		  suggestmgr.cpp \
+-		  csutil.cpp \
+-		  myspell.cpp \
+-		  mozMySpell.cpp \
+-		  mozMySpellFactory.cpp \
++CPPSRCS =         mozMySpell.cpp \
++                  mozMySpellFactory.cpp \
+                   $(NULL)
++ifndef MOZ_NATIVE_MYSPELL
++CPPSRCS +=        affentry.cpp \
++                  affixmgr.cpp \
++                  hashmgr.cpp \
++                  suggestmgr.cpp \
++                  csutil.cpp \
++                  myspell.cpp \
++                  $(NULL)
++endif
+ 
+ ifdef MOZ_XUL_APP
+ CPPSRCS += mozMySpellDirProvider.cpp
+ endif
+ 
+ EXTRA_DSO_LDOPTS = \
+ 		$(LIBS_DIR) \
+ 		$(XPCOM_LIBS) \
+ 		$(NSPR_LIBS) \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
++		$(MOZ_MYSPELL_LIBS) \
+ 		$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_MYSPELL
++CXXFLAGS += $(MOZ_MYSPELL_CFLAGS)
++endif
+Index: mozilla/extensions/spellcheck/myspell/src/mozMySpell.h
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/mozMySpell.h	2007-04-24 10:11:39.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/mozMySpell.h	2007-04-24 10:11:43.000000000 +0000
+@@ -51,17 +51,17 @@
+  * and affix compression in general, please see:
+  * http://www.cs.ucla.edu/ficus-members/geoff/ispell.html
+  * (the home page for ispell)
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifndef mozMySpell_h__
+ #define mozMySpell_h__
+ 
+-#include "myspell.hxx"
++#include "hunspell.hxx"
+ #include "mozISpellCheckingEngine.h"
+ #include "mozIPersonalDictionary.h"
+ #include "nsString.h"
+ #include "nsCOMPtr.h"
+ #include "nsIObserver.h"
+ #include "nsIUnicodeEncoder.h"
+ #include "nsIUnicodeDecoder.h"
+ #include "nsInterfaceHashtable.h"
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/90_fit_1024x600_AccountManager.dtd.patch
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/90_fit_1024x600_AccountManager.dtd.patch
@@ -0,0 +1,26 @@
+Index: mozilla/mail/locales/en-US/chrome/messenger/AccountManager.dtd
+===================================================================
+--- mozilla/mail/locales/en-US/chrome/messenger/AccountManager.dtd	2008-08-29 18:22:24.926976849 +0000
++++ mozilla/mail/locales/en-US/chrome/messenger/AccountManager.dtd	2008-08-29 18:23:24.678958318 +0000
+@@ -20,6 +20,6 @@
+      panel content to fit. 1em = the width of the letter 'm' in the selected font.
+      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
+      this window for en-US. -->
+-<!ENTITY accountManager.size "width: 55em; height: 50em;"> 
+-<!ENTITY macAccountManager.size "width: 60em; height: 50em;">
++<!ENTITY accountManager.size "width: 55em; height: 37em;"> 
++<!ENTITY macAccountManager.size "width: 60em; height: 37em;">
+ <!ENTITY accountTree.width   "width: 17em;">
+Index: mozilla/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
+===================================================================
+--- mozilla/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd	2008-08-29 18:23:50.854921389 +0000
++++ mozilla/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd	2008-08-29 18:24:02.334919254 +0000
+@@ -19,6 +19,6 @@
+      panel content to fit. 1em = the width of the letter 'm' in the selected font.
+      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
+      this window for en-US. -->
+-<!ENTITY accountManager.size "width: 55em; height: 50em;">
+-<!ENTITY macAccountManager.size "width: 60em; height: 50em;">
++<!ENTITY accountManager.size "width: 55em; height: 37em;">
++<!ENTITY macAccountManager.size "width: 60em; height: 37em;">
+ <!ENTITY accountTree.width   "width: 17em;">
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/reply-to-list-support
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/reply-to-list-support
@@ -0,0 +1,275 @@
+---
+ mail/base/content/mailCommands.js               |    1 
+ mailnews/base/resources/content/mailCommands.js |    1 
+ mailnews/compose/public/nsIMsgComposeParams.idl |    1 
+ mailnews/compose/src/nsMsgCompose.cpp           |   40 ++++++++++++++++++++++--
+ mailnews/mime/public/nsMailHeaders.h            |    1 
+ 5 files changed, 41 insertions(+), 3 deletions(-)
+
+Index: mozilla/mail/base/content/mailCommands.js
+===================================================================
+--- mozilla.orig/mail/base/content/mailCommands.js	2007-03-09 21:16:44.000000000 +0000
++++ mozilla/mail/base/content/mailCommands.js	2007-05-02 16:10:04.000000000 +0000
+@@ -272,16 +272,17 @@
+         : customIdentity;                         
+ 
+       var messageID = hdr.messageId;
+       var messageIDScheme = messageID ? messageID.split(":")[0] : "";
+       if (messageIDScheme && (messageIDScheme == 'http' || messageIDScheme == 'https') &&  "openComposeWindowForRSSArticle" in this)
+         openComposeWindowForRSSArticle(messageID, hdr, type);
+       else if (type == msgComposeType.Reply ||
+                type == msgComposeType.ReplyAll ||
++               type == msgComposeType.ReplyToList ||
+                type == msgComposeType.ForwardInline ||
+                type == msgComposeType.ReplyToGroup ||
+                type == msgComposeType.ReplyToSender ||
+                type == msgComposeType.ReplyToSenderAndGroup ||
+                type == msgComposeType.Template ||
+                type == msgComposeType.Draft)
+       {
+         msgComposeService.OpenComposeWindow(null, messageUri, type, format, identity, msgWindow);
+Index: mozilla/mailnews/base/resources/content/mailCommands.js
+===================================================================
+--- mozilla.orig/mailnews/base/resources/content/mailCommands.js	2006-06-25 08:56:04.000000000 +0000
++++ mozilla/mailnews/base/resources/content/mailCommands.js	2007-05-02 16:10:04.000000000 +0000
+@@ -265,16 +265,17 @@
+           var tmpIdentity = getIdentityForServer(server, hintForIdentity);
+           if (tmpIdentity && hintForIdentity.search(tmpIdentity.email) >= 0)
+             identity = tmpIdentity;
+         }
+       }
+ 
+       if (type == msgComposeType.Reply ||
+         type == msgComposeType.ReplyAll ||
++        type == msgComposeType.ReplyToList ||
+         type == msgComposeType.ForwardInline ||
+         type == msgComposeType.ReplyToGroup ||
+         type == msgComposeType.ReplyToSender ||
+         type == msgComposeType.ReplyToSenderAndGroup ||
+         type == msgComposeType.Template ||
+         type == msgComposeType.Draft)
+       {
+         msgComposeService.OpenComposeWindow(null, messageUri, type, format, identity, msgWindow);
+Index: mozilla/mailnews/compose/public/nsIMsgComposeParams.idl
+===================================================================
+--- mozilla.orig/mailnews/compose/public/nsIMsgComposeParams.idl	2005-10-04 03:10:45.000000000 +0000
++++ mozilla/mailnews/compose/public/nsIMsgComposeParams.idl	2007-05-02 16:10:04.000000000 +0000
+@@ -54,16 +54,17 @@
+     const long NewsPost                 = 5;
+     const long ReplyToSender            = 6;
+     const long ReplyToGroup             = 7;
+     const long ReplyToSenderAndGroup    = 8;
+     const long Draft                    = 9;
+     const long Template                 = 10;
+     const long MailToUrl                = 11;
+     const long ReplyWithTemplate        = 12;
++    const long ReplyToList              = 13;
+ };
+ 
+ 
+ typedef long MSG_ComposeFormat;
+ 
+ [scriptable, uuid(a28325e8-7531-11d3-8f1c-006008948010)]
+ interface nsIMsgCompFormat {
+     const long Default                  = 0;
+Index: mozilla/mailnews/compose/src/nsMsgCompose.cpp
+===================================================================
+--- mozilla.orig/mailnews/compose/src/nsMsgCompose.cpp	2007-03-05 18:25:41.000000000 +0000
++++ mozilla/mailnews/compose/src/nsMsgCompose.cpp	2007-05-02 16:29:56.000000000 +0000
+@@ -1857,16 +1857,17 @@
+         subject.Assign(Substring(start, wasStart));
+       }
+ 
+       switch (type)
+       {
+         default: break;
+         case nsIMsgCompType::Reply :
+         case nsIMsgCompType::ReplyAll:
++        case nsIMsgCompType::ReplyToList:
+         case nsIMsgCompType::ReplyToGroup:
+         case nsIMsgCompType::ReplyToSender:
+         case nsIMsgCompType::ReplyToSenderAndGroup:
+           {
+             if (!isFirstPass)       // safeguard, just in case...
+             {
+               PR_Free(uriList);
+               return rv;
+@@ -2301,34 +2302,40 @@
+   {
+     MSG_ComposeType type;
+     compose->GetType(&type);
+ 
+     // Assign cite information if available...
+     if (!mCiteReference.IsEmpty())
+       compose->SetCiteReference(mCiteReference);
+ 
+-    if (mHeaders && (type == nsIMsgCompType::Reply || type == nsIMsgCompType::ReplyAll || type == nsIMsgCompType::ReplyToSender ||
+-                     type == nsIMsgCompType::ReplyToGroup || type == nsIMsgCompType::ReplyToSenderAndGroup) && mQuoteOriginal)
++    if (mHeaders && (type == nsIMsgCompType::Reply ||
++                     type == nsIMsgCompType::ReplyAll ||
++                     type == nsIMsgCompType::ReplyToList ||
++                     type == nsIMsgCompType::ReplyToSender ||
++                     type == nsIMsgCompType::ReplyToGroup ||
++                     type == nsIMsgCompType::ReplyToSenderAndGroup) &&
++        mQuoteOriginal)
+     {
+       nsCOMPtr<nsIMsgCompFields> compFields;
+       compose->GetCompFields(getter_AddRefs(compFields));
+       if (compFields)
+       {
+         aCharset.AssignLiteral("UTF-8");
+         nsAutoString recipient;
+         nsAutoString cc;
+         nsAutoString bcc;
+         nsAutoString replyTo;
+         nsAutoString mailReplyTo;
+         nsAutoString mailFollowupTo;
+         nsAutoString newgroups;
+         nsAutoString followUpTo;
+         nsAutoString messageId;
+         nsAutoString references;
++        nsAutoString listPost;
+         nsXPIDLCString outCString;
+         PRBool needToRemoveDup = PR_FALSE;
+         if (!mMimeConverter)
+         {
+           mMimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID, &rv);
+           NS_ENSURE_SUCCESS(rv, rv);
+         }
+         nsXPIDLCString charset;
+@@ -2372,16 +2379,39 @@
+             if (recipient.Length() > 0 && cc.Length() > 0)
+               recipient.AppendLiteral(", ");
+             recipient += cc;
+             compFields->SetCc(recipient);
+           }
+ 
+           needToRemoveDup = PR_TRUE;
+         }
++
++        mHeaders->ExtractHeader(HEADER_LIST_POST, PR_TRUE, getter_Copies(outCString));
++        if (!outCString.IsEmpty())
++          mMimeConverter->DecodeMimeHeader(outCString, listPost, charset);
++
++        if (type == nsIMsgCompType::ReplyToList && ! listPost.IsEmpty())
++        {
++          nsString::const_iterator mailtoStart, mailtoEnd;
++          listPost.BeginReading(mailtoStart);
++          listPost.EndReading(mailtoEnd);
++          nsAutoString mailtoText(NS_LITERAL_STRING("<mailto:"));
++          PRBool mailtoFound = FindInReadable(mailtoText, mailtoStart, mailtoEnd);
++          
++          // Strip off the leading "<mailto:" and trailing ">"
++          if (mailtoFound && listPost.Equals(mailtoStart.get()) &&
++              listPost.RFindChar('>') == listPost.Length() - 1)
++          {
++            listPost.Cut(0, mailtoText.Length());
++            listPost.Cut(listPost.Length() - 1, 1);
++
++            compFields->SetTo(listPost);
++          }
++        }
+               
+         mHeaders->ExtractHeader(HEADER_REPLY_TO, PR_FALSE, getter_Copies(outCString));
+         if (outCString)
+         {
+           mMimeConverter->DecodeMimeHeader(outCString, replyTo, charset);
+         }
+ 
+         mHeaders->ExtractHeader(HEADER_MAIL_REPLY_TO, PR_TRUE, getter_Copies(outCString));
+@@ -2409,17 +2439,18 @@
+         }
+ 
+         mHeaders->ExtractHeader(HEADER_REFERENCES, PR_FALSE, getter_Copies(outCString));
+         if (outCString)
+         {
+           mMimeConverter->DecodeMimeHeader(outCString, references, charset);
+         }
+ 
+-        if (! ((type == nsIMsgCompType::ReplyAll) && ! mailFollowupTo.IsEmpty()))
++        if (! ((type == nsIMsgCompType::ReplyAll) && ! mailFollowupTo.IsEmpty()) && 
++            ! ((type == nsIMsgCompType::ReplyToList) && ! listPost.IsEmpty()))
+         {
+           if (! mailReplyTo.IsEmpty())
+           { // handle Mail-Reply-To (http://cr.yp.to/proto/replyto.html)
+             compFields->SetTo(mailReplyTo);
+             needToRemoveDup = PR_TRUE;
+           }
+           else if (! replyTo.IsEmpty())
+           { // default behaviour for messages without Mail-Reply-To
+@@ -2916,16 +2947,17 @@
+ }
+ 
+ NS_IMETHODIMP nsMsgCompose::RememberQueuedDisposition()
+ {
+   // need to find the msg hdr in the saved folder and then set a property on 
+   // the header that we then look at when we actually send the message.
+   if (mType == nsIMsgCompType::Reply || 
+     mType == nsIMsgCompType::ReplyAll ||
++    mType == nsIMsgCompType::ReplyToList ||
+     mType == nsIMsgCompType::ReplyToGroup ||
+     mType == nsIMsgCompType::ReplyToSender ||
+     mType == nsIMsgCompType::ReplyToSenderAndGroup ||
+     mType == nsIMsgCompType::ForwardAsAttachment ||              
+     mType == nsIMsgCompType::ForwardInline)
+   {
+     if (!mOriginalMsgURI.IsEmpty())
+     {
+@@ -2954,16 +2986,17 @@
+ 
+ nsresult nsMsgCompose::ProcessReplyFlags()
+ {
+   nsresult rv;
+   // check to see if we were doing a reply or a forward, if we were, set the answered field flag on the message folder
+   // for this URI.
+   if (mType == nsIMsgCompType::Reply || 
+       mType == nsIMsgCompType::ReplyAll ||
++      mType == nsIMsgCompType::ReplyToList ||
+       mType == nsIMsgCompType::ReplyToGroup ||
+       mType == nsIMsgCompType::ReplyToSender ||
+       mType == nsIMsgCompType::ReplyToSenderAndGroup ||
+       mType == nsIMsgCompType::ForwardAsAttachment ||              
+       mType == nsIMsgCompType::ForwardInline ||
+       mDraftDisposition != nsIMsgFolder::nsMsgDispositionState_None)
+   {
+     if (!mOriginalMsgURI.IsEmpty())
+@@ -3886,16 +3919,17 @@
+   /* Some time we want to add a signature and sometime we wont. Let's figure that now...*/
+   PRBool addSignature;
+   switch (mType)
+   {
+     case nsIMsgCompType::New :
+     case nsIMsgCompType::MailToUrl :    /* same as New */
+     case nsIMsgCompType::Reply :        /* should not happen! but just in case */
+     case nsIMsgCompType::ReplyAll :       /* should not happen! but just in case */
++    case nsIMsgCompType::ReplyToList :    /* should not happen! but just in case */
+     case nsIMsgCompType::ForwardAsAttachment :  /* should not happen! but just in case */
+     case nsIMsgCompType::ForwardInline :
+     case nsIMsgCompType::NewsPost :
+     case nsIMsgCompType::ReplyToGroup :
+     case nsIMsgCompType::ReplyToSender : 
+     case nsIMsgCompType::ReplyToSenderAndGroup :
+       addSignature = PR_TRUE;
+       break;
+Index: mozilla/mailnews/mime/public/nsMailHeaders.h
+===================================================================
+--- mozilla.orig/mailnews/mime/public/nsMailHeaders.h	2006-06-18 15:12:47.000000000 +0000
++++ mozilla/mailnews/mime/public/nsMailHeaders.h	2007-05-02 16:10:04.000000000 +0000
+@@ -60,16 +60,17 @@
+ #define HEADER_CONTENT_TYPE					        "Content-Type"
+ #define HEADER_DATE							            "Date"
+ #define HEADER_DISTRIBUTION					        "Distribution"
+ #define HEADER_FCC							            "FCC"
+ #define HEADER_FOLLOWUP_TO					        "Followup-To"
+ #define HEADER_FROM							            "From"
+ #define HEADER_STATUS							            "Status"
+ #define HEADER_LINES						            "Lines"
++#define HEADER_LIST_POST                    "List-Post"
+ #define HEADER_MAIL_FOLLOWUP_TO				      "Mail-Followup-To"
+ #define HEADER_MAIL_REPLY_TO				       "Mail-Reply-To"
+ #define HEADER_MESSAGE_ID					          "Message-ID"
+ #define HEADER_MIME_VERSION					        "MIME-Version"
+ #define HEADER_NEWSGROUPS					          "Newsgroups"
+ #define HEADER_ORGANIZATION					        "Organization"
+ #define HEADER_REFERENCES				          	"References"
+ #define HEADER_REPLY_TO				          		"Reply-To"
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/bz335810-pango-cursor-up-down-fix
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/bz335810-pango-cursor-up-down-fix
@@ -0,0 +1,61 @@
+---
+ gfx/src/gtk/nsFontMetricsPango.cpp |   15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
+===================================================================
+--- mozilla.orig/gfx/src/gtk/nsFontMetricsPango.cpp	2006-09-26 06:42:55.000000000 +0000
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2007-04-17 08:45:04.000000000 +0000
+@@ -946,17 +946,16 @@
+ }
+ 
+ PRInt32
+ nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength,
+                                 nsPoint aPt)
+ {
+     int trailing = 0;
+     int inx = 0;
+-    gboolean found = FALSE;
+     const gchar *curChar;
+     PRInt32 retval = 0;
+ 
+     float f = mDeviceContext->AppUnitsToDevUnits();
+     
+     PangoLayout *layout = pango_layout_new(mPangoContext);
+     PRUint32 localX = (PRUint32)(aPt.x * PANGO_SCALE * f);
+     PRUint32 localY = (PRUint32)(aPt.y * PANGO_SCALE * f);
+@@ -972,32 +971,22 @@
+         retval = -1;
+         goto loser;
+     }
+ 
+     // Set up the pango layout
+     pango_layout_set_text(layout, text, strlen(text));
+     FixupSpaceWidths(layout, text);
+     
+-    found = pango_layout_xy_to_index(layout, localX, localY,
+-                                     &inx, &trailing);
++    pango_layout_xy_to_index(layout, localX, localY,
++                             &inx, &trailing);
+ 
+     // Convert the index back to the utf-16 index
+     curChar = text;
+ 
+-    // Jump to the end if it's not found.
+-    if (!found) {
+-        if (inx == 0)
+-            retval = 0;
+-        else if (trailing)
+-            retval = aLength;
+-
+-        goto loser;
+-    }
+-
+     for (PRUint32 curOffset=0; curOffset < aLength;
+          curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {
+ 
+         // Check for a match before checking for a surrogate pair
+         if (curChar - text == inx) {
+             retval = curOffset;
+             break;
+         }
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/patches/bz344818_att264996_detect_xrender
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/patches/bz344818_att264996_detect_xrender
@@ -0,0 +1,169 @@
+---
+ config/autoconf.mk.in                     |    4 ++++
+ configure.in                              |   17 +++++++++++++++++
+ content/canvas/src/Makefile.in            |    2 +-
+ layout/build/Makefile.in                  |   11 +++++++++++
+ layout/svg/renderer/src/cairo/Makefile.in |    5 +++++
+ 5 files changed, 38 insertions(+), 1 deletion(-)
+
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in
++++ mozilla/config/autoconf.mk.in
+@@ -206,27 +206,31 @@
+ MOZ_SVG = @MOZ_SVG@
+ MOZ_SVG_FOREIGNOBJECT = @MOZ_SVG_FOREIGNOBJECT@
+ MOZ_SVG_RENDERER_GDIPLUS = @MOZ_SVG_RENDERER_GDIPLUS@
+ MOZ_SVG_RENDERER_LIBART = @MOZ_SVG_RENDERER_LIBART@
+ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDERER_CAIRO@
+ MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
+ MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
+ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@
++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@
+ TX_EXE = @TX_EXE@
+ 
+ # Mac's don't like / in a #include, so we include the libart
+ # headers locally if we're using the external library
+ ifdef MOZ_LIBART_CFLAGS
+ ifndef MOZ_SVG_RENDERER_LIBART
+ MOZ_LIBART_CFLAGS := $(MOZ_LIBART_CFLAGS)/libart_lgpl
+ endif
+ endif
+ MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@
+ MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@
++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@
++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@
+ 
+ MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@
+ MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
+ MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@
+ 
+ MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@
+ MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@
+ 
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in
++++ mozilla/configure.in
+@@ -6810,22 +6810,39 @@
+            if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
+                MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS -lgdi32"
+            fi
+        fi
+    else
+       PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
+       MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
+       MOZ_CAIRO_LIBS=$CAIRO_LIBS
++
++      if test "$MOZ_X11"; then
++          if test "$MOZ_SVG_RENDERER_CAIRO"; then
++              PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:)
++              MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS
++              MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
++          fi
++          if test "$MOZ_ENABLE_CANVAS"; then
++              PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:)
++              MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS
++              MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS"
++          fi
++      fi
+    fi
+ fi
+ 
+ AC_SUBST(MOZ_TREE_CAIRO)
+ AC_SUBST(MOZ_CAIRO_CFLAGS)
+ AC_SUBST(MOZ_CAIRO_LIBS)
++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS)
++AC_SUBST(MOZ_CAIRO_XLIB_LIBS)
++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS)
++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS)
+ 
+ dnl ========================================================
+ dnl disable xul
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [  --disable-xul           Disable XUL],
+     MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+Index: mozilla/content/canvas/src/Makefile.in
+===================================================================
+--- mozilla.orig/content/canvas/src/Makefile.in
++++ mozilla/content/canvas/src/Makefile.in
+@@ -89,17 +89,17 @@
+ CPPSRCS		+= nsCanvasRenderingContext2D.cpp
+ endif
+ 
+ # we don't want the shared lib, but we want to force the creation of a static lib.
+ FORCE_STATIC_LIB = 1
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
++CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS)
+ 
+ ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT)))
+ # needed for nsDrawingSurfaceMac.h
+ CXXFLAGS += -I$(topsrcdir)/gfx/src/mac
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT), os2)
+ # needed for nsDrawingSurfaceOS2.h
+Index: mozilla/layout/build/Makefile.in
+===================================================================
+--- mozilla.orig/layout/build/Makefile.in
++++ mozilla/layout/build/Makefile.in
+@@ -229,16 +229,27 @@
+ 		    $(NULL)
+ endif
+ 
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_X11
++ifdef MOZ_SVG_RENDERER_CAIRO
++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \
++		    $(NULL)
++endif
++ifdef MOZ_ENABLE_CANVAS
++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \
++		    $(NULL)
++endif
++endif
++
+ ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += \
+ 	$(TK_LIBS) \
+ 	$(NULL)
+ endif
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+Index: mozilla/layout/svg/renderer/src/cairo/Makefile.in
+===================================================================
+--- mozilla.orig/layout/svg/renderer/src/cairo/Makefile.in
++++ mozilla/layout/svg/renderer/src/cairo/Makefile.in
+@@ -90,16 +90,21 @@
+ 
+ CFLAGS		+= $(MOZ_CAIRO_CFLAGS)
+ CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS)
+ 
+ LOCAL_INCLUDES  = \
+                 -I$(topsrcdir)/gfx/src \
+                 $(NULL)
+ 
++ifdef MOZ_X11
++CFLAGS		+= $(MOZ_CAIRO_XLIB_CFLAGS)
++CXXFLAGS	+= $(MOZ_CAIRO_XLIB_CFLAGS)
++endif
++
+ ifdef MOZ_ENABLE_GTK
+ LOCAL_INCLUDES +=  -I$(topsrcdir)/gfx/src/gtk
+ CFLAGS         += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ CXXFLAGS       += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ endif
+ 
+ ifdef MOZ_ENABLE_GTK2
+ LOCAL_INCLUDES +=  -I$(topsrcdir)/gfx/src/gtk
--- thunderbird-2.0.0.23+build1+nobinonly.orig/debian/cdbs-rules/debhelper.mk
+++ thunderbird-2.0.0.23+build1+nobinonly/debian/cdbs-rules/debhelper.mk
@@ -0,0 +1,239 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Uses Debhelper to implement the binary package building stage
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+####
+# General variables implemented by this rule file:
+#
+# DEB_INSTALL_DIRS_ALL
+#   Subdirectories to create in installation staging directory for every package
+# DEB_INSTALL_DIRS_<package>
+#   Like the above, but for a particular package <package>.
+# DEB_INSTALL_DOCS_ALL
+#   Files which should go in /usr/share/doc/<package> for every package
+# DEB_INSTALL_DOCS_<package>
+#   Files which should go in /usr/share/doc/<package> for package
+# DEB_INSTALL_CHANGELOGS_ALL
+#   File which should be interpreted as upstream changelog
+# DEB_COMPRESS_EXCLUDE
+#   Regular expressions matching files which should not be compressed.
+# DEB_FIXPERMS_EXCLUDE
+#   Regular expressions matching files which should not have their permissions changed.
+# DEB_CLEAN_EXCLUDE
+#   Regular expressions matching files which should not be cleaned.
+# DEB_DH_ALWAYS_EXCLUDE
+#   Force builddeb to exclude files.  See the DH_ALWAYS_EXCLUDE section
+#   in debhelper(7) for more details.
+# DEB_SHLIBDEPS_LIBRARY_package
+#   The name of the current library package
+# DEB_SHLIBDEPS_INCLUDE
+#   A space-separated list of library paths to search for dependency info
+# DEB_SHLIBDEPS_INCLUDE_package
+#   Like the above, but for a particular package.
+# DEB_PERL_INCLUDE
+#   A space-separated list of paths to search for perl modules
+# DEB_PERL_INCLUDE_package
+#   Like the above, but for a particular package.
+# DEB_UPDATE_RCD_PARAMS
+#   Arguments to pass to update-rc.d in init scripts
+####
+# Special variables used by this rule file:
+#
+# DEB_DH_MAKESHLIBS_ARGS_ALL
+#   Arguments passed directly to dh_makeshlibs, for all packages
+# DEB_DH_MAKESHLIBS_ARGS_<package>
+#   Arguments passed directly to dh_makeshlibs, for a particular package <package>
+# DEB_DH_MAKESHLIBS_ARGS
+#   Completely override argument passing to dh_makeshlibs. 
+# DEB_DH_SHLIBDEPS_ARGS_ALL
+#   Arguments passed directly to dh_shlibdeps, for all packages
+# DEB_DH_SHLIBDEPS_ARGS_<package>
+#   Arguments passed directly to dh_shlibdeps, for a particular package <package>
+# DEB_DH_SHLIBDEPS_ARGS
+#   Completely override argument passing to dh_shlibdeps.
+# DEB_DH_PERL_ARGS
+#   Completely override argument passing to dh_perl.
+####
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_debhelper
+_cdbs_rules_debhelper = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+DH_COMPAT ?= $(shell cat debian/compat 2>/dev/null)
+ifeq (,$(DH_COMPAT))
+DH_COMPAT = 5
+endif
+
+ifeq ($(DH_COMPAT),4)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.0)
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5)
+endif
+
+ifeq ($(DEB_VERBOSE_ALL), yes)
+DH_VERBOSE = 1
+endif
+
+is_debug_package=$(if $(patsubst %-dbg,,$(cdbs_curpkg)),,yes)
+
+DEB_INSTALL_DIRS_ALL =
+DEB_INSTALL_CHANGELOGS_ALL = $(if $(DEB_ISNATIVE),,$(shell for f in ChangeLog Changelog Changes CHANGES changelog; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; break; fi; done))
+DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f -a ! -d $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done))
+
+cdbs_add_dashx = $(foreach i,$(1),$(patsubst %,-X %,$(i)))
+cdbs_strip_quotes = $(subst ',,$(subst ",,$(1)))
+# hello emacs '
+
+DEB_DH_MAKESHLIBS_ARGS = $(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg))
+DEB_DH_SHLIBDEPS_ARGS = $(if $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg)),-L $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg))) $(if $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg))$(DEB_SHLIBDEPS_INCLUDE),-l $(shell echo $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg)):$(DEB_SHLIBDEPS_INCLUDE) | perl -pe 's/ /:/g;')) $(DEB_DH_SHLIBDEPS_ARGS_ALL) $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+
+DEB_DH_BUILDDEB_ENV = $(if $(DEB_DH_ALWAYS_EXCLUDE),DH_ALWAYS_EXCLUDE=$(DEB_DH_ALWAYS_EXCLUDE),)
+DEB_DH_PERL_ARGS = $(if $(DEB_PERL_INCLUDE_$(cdbs_curpkg))$(DEB_PERL_INCLUDE),$(shell echo $(DEB_PERL_INCLUDE_$(cdbs_curpkg)) $(DEB_PERL_INCLUDE)))
+
+ifneq ($(words $(DEB_DBG_PACKAGES)),0)
+ifeq ($(words $(DEB_DBG_PACKAGES)),1)
+DEB_DBG_PACKAGE_ALL = $(if $(strip $(foreach x,$(DEB_PACKAGES),$(DEB_DBG_PACKAGE_$(x)))),,$(DEB_DBG_PACKAGES))
+else
+ifeq (yes,$(if $(findstring no,$(foreach x,$(DEB_DBG_PACKAGES),$(if $(filter $(x:-dbg=),$(DEB_PACKAGES)),yes,no))),no,yes))
+define cdbs_deb_dbg_package_assign
+DEB_DBG_PACKAGE_$(1:-dbg=) = $(1)
+endef
+$(foreach x,$(DEB_DBG_PACKAGES),$(eval $(call cdbs_deb_dbg_package_assign,$(value x))))
+endif
+endif
+cdbs_dbg_package = $(if $(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_ALL))
+cdbs_dbg_package_option = $(if $(cdbs_dbg_package),$(shell if [ "$(DH_COMPAT)" -eq 5 ]; then echo "--dbg-package=$(strip $(cdbs_dbg_package))"; fi))
+DEB_DH_STRIP_ARGS = $(cdbs_dbg_package_option)
+endif
+
+pre-build:: debian/compat
+
+debian/compat:
+	$(if $(DEB_DH_COMPAT_DISABLE),,echo $(DH_COMPAT) >$@)
+
+clean::
+	dh_clean $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE))
+
+common-install-prehook-arch common-install-prehook-indep:: common-install-prehook-impl
+common-install-prehook-impl::
+	dh_clean -k $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE))
+	dh_installdirs -A $(DEB_INSTALL_DIRS_ALL)
+
+$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
+	dh_installdirs -p$(cdbs_curpkg) $(DEB_INSTALL_DIRS_$(cdbs_curpkg))
+
+# Create .debs or .udebs as we see fit
+$(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/% : binary-makedeb/%
+
+####
+# General Debian package creation rules.
+####
+
+# This rule is called once for each package.  It does the work
+# of installing to debian/<packagename>; this includes running
+# dh_install to split the source from debian/tmp, as well as installing
+# ChangeLogs and the like.
+$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
+	dh_installdocs -p$(cdbs_curpkg) $(DEB_INSTALL_DOCS_ALL) $(DEB_INSTALL_DOCS_$(cdbs_curpkg)) 
+	dh_installexamples -p$(cdbs_curpkg) $(DEB_INSTALL_EXAMPLES_$(cdbs_curpkg))
+	dh_installman -p$(cdbs_curpkg) $(DEB_INSTALL_MANPAGES_$(cdbs_curpkg)) 
+	dh_installinfo -p$(cdbs_curpkg) $(DEB_INSTALL_INFO_$(cdbs_curpkg)) 
+	dh_installmenu -p$(cdbs_curpkg) $(DEB_DH_INSTALL_MENU_ARGS)
+	dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALL_CRON_ARGS)
+	dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS))",$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))")) $(DEB_DH_INSTALLINIT_ARGS) 
+	dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS)
+	dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(DEB_DH_INSTALLEMACSEN_ARGS)
+	dh_installcatalogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCATALOGS_ARGS)
+	dh_installpam -p$(cdbs_curpkg) $(DEB_DH_INSTALLPAM_ARGS)
+	dh_installlogrotate -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGROTATE_ARGS)
+	dh_installlogcheck -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGCHECK_ARGS)
+	dh_installmime -p$(cdbs_curpkg) $(DEB_DH_INSTALLMIME_ARGS)
+	dh_installchangelogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCHANGELOGS_ARGS) $(DEB_INSTALL_CHANGELOGS_ALL) $(DEB_INSTALL_CHANGELOGS_$(cdbs_curpkg))
+	$(if $(wildcard /usr/bin/dh_installudev),dh_installudev -p$(cdbs_curpkg) $(DEB_DH_INSTALLUDEV_ARGS))
+	dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(DEB_DH_INSTALL_ARGS) $(DEB_DH_INSTALL_ARGS_$(cdbs_curpkg))
+	dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg))
+
+# This rule is called after all packages have been installed, and their
+# post-install hooks have been run.
+common-binary-post-install-arch:: $(patsubst %,binary-post-install/%,$(DEB_ARCH_PACKAGES))
+common-binary-post-install-indep:: $(patsubst %,binary-post-install/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called once for each package; it's a general hook
+# to do things like remove files, etc.
+$(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%: binary-install/%
+
+# This rule is called after installation and the post-install hooks,
+# to strip files.
+$(patsubst %,binary-strip/%,$(DEB_ARCH_PACKAGES)) :: binary-strip/%: common-binary-post-install-arch binary-strip-IMPL/%
+$(patsubst %,binary-strip/%,$(DEB_INDEP_PACKAGES)) :: binary-strip/%: common-binary-post-install-indep binary-strip-IMPL/%
+$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-strip-IMPL/%: 
+	$(if $(is_debug_package),,dh_strip -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_STRIP_EXCLUDE)) $(DEB_DH_STRIP_ARGS))
+
+# This rule is called right before generating debs {post,pre}{inst,rm} and controls, deps, are calculated
+# for each package, but after the binary-fixup hooks have been run.
+# (necessary for dh_shlibdeps to work on our own dh_makeshlibs'ed libs)
+common-binary-fixup-arch:: $(patsubst %,binary-fixup/%,$(DEB_ARCH_PACKAGES))
+common-binary-fixup-indep:: $(patsubst %,binary-fixup/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called after stripping; it compresses, fixes permissions,
+# and sets up shared library information.
+$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
+	dh_compress -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_COMPRESS_EXCLUDE)) $(DEB_DH_COMPRESS_ARGS)
+	dh_fixperms -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_FIXPERMS_EXCLUDE)) $(DEB_DH_FIXPERMS_ARGS)
+	$(if $(is_debug_package),,dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS))
+
+# This rule is called right before building the binary .deb packages
+# for each package, but after the binary-predeb hooks have been run.
+common-binary-predeb-arch:: $(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES))
+common-binary-predeb-indep:: $(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called right before a packages' .deb file is made.
+# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc. 
+$(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) :: binary-predeb/%: common-binary-fixup-arch binary-predeb-IMPL/%
+$(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES)) :: binary-predeb/%: common-binary-fixup-indep binary-predeb-IMPL/%
+$(patsubst %,binary-predeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-predeb-IMPL/%:
+	dh_installdeb -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEB_ARGS)
+	dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS)
+	dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS)
+
+# This rule is called to create a package.  Generally it's not going to be
+# useful to hook things onto this rule.
+$(patsubst %,binary-makedeb/%,$(DEB_ARCH_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-arch binary-makedeb-IMPL/%
+$(patsubst %,binary-makedeb/%,$(DEB_INDEP_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-indep binary-makedeb-IMPL/%
+$(patsubst %,binary-makedeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-makedeb-IMPL/% : 
+	dh_gencontrol -p$(cdbs_curpkg) $(DEB_DH_GENCONTROL_ARGS)
+	dh_md5sums -p$(cdbs_curpkg) $(DEB_DH_MD5SUMS_ARGS)
+	$(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) $(DEB_DH_BUILDDEB_ARGS)
+
+## Deprecated
+common-binary-post-install:: common-binary-post-install-arch common-binary-post-install-indep
+common-binary-predeb:: common-binary-predeb-arch common-binary-predeb-indep
+
+## Deprecated special handling of .udebs
+$(patsubst %,binary/%,$(DEB_UDEB_PACKAGES)) :: binary/% : binary-makeudeb/%
+$(patsubst %,binary-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-install-udeb/%:
+common-binary-post-install-udeb:: $(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES))
+$(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-post-install-udeb/%: binary-install-udeb/%
+$(patsubst %,binary-makeudeb/%,$(DEB_UDEB_PACKAGES)) :: binary-makeudeb/% : common-binary-post-install-udeb
+
+endif
