diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 306dd5b..0ec3618 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Jun 12 11:53:55 CDT 2007 - maw@suse.de + +- Merge chagnges from the build service (thanks, Wolfgang) +- Now use l10n-%{version}.tar.bz2 instead of l10n.tar.bz2 as + before. + +------------------------------------------------------------------- +Thu Apr 19 07:15:36 CEST 2007 - wr@rosenauer.org + +- update to final version 2.0.0.0 + (http://www.mozilla.com/en-US/thunderbird/2.0.0.0/releasenotes/) +- update enigmail to 0.95.0 + +------------------------------------------------------------------- +Wed Apr 18 14:16:44 CEST 2007 - mfabian@suse.de + +- add Japanese to the languages which get PANGO enabled in the + start script to support the Japanese combining characters + U+3099 U+309A (see bugzilla #262718 comment #29). + +------------------------------------------------------------------- +Thu Apr 12 16:35:43 CEST 2007 - wr@rosenauer.org + +- update to 2.0.0.0rc1 +- enabled translations package + +------------------------------------------------------------------- +Fri Mar 30 11:35:01 CEST 2007 - wr@rosenauer.org + +- update to snapshot 2.0.0.0pre-20070329 +- security update enigmail 0.94.3 + (Bugtraq #22758) + +------------------------------------------------------------------- +Fri Mar 30 10:35:03 CEST 2007 - meissner@suse.de + +- require unzip + +------------------------------------------------------------------- +Tue Mar 13 08:36:31 CET 2007 - wr@rosenauer.org + +- update to snapshot 2.0pre-20060312 +- removed implicit NSS version dependency + +------------------------------------------------------------------- +Thu Feb 15 19:47:56 CET 2007 - wr@rosenauer.org + +- update to snapshot 2.0beta2-20060214 +- fixed build on SLES9 + +------------------------------------------------------------------- +Mon Feb 5 18:56:14 CET 2007 - wr@rosenauer.org + +- fixed check in add-plugins.sh (#242237) + ------------------------------------------------------------------- Tue Jun 5 18:20:13 CEST 2007 - maw@suse.de diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index b362701..43d5cd1 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 1.5.0.12) +# spec file for package MozillaThunderbird (Version 2.0.0.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: MozillaThunderbird BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 1.5.0.12 +Version: 2.0.0.0 Release: 1 Summary: The Stand-Alone Mozilla Mail Component URL: http://www.mozilla.org/products/thunderbird/ @@ -22,19 +22,19 @@ Source: thunderbird-%{version}-source.tar.bz2 Source1: MozillaThunderbird.desktop Source2: add-plugins.sh.in Source3: mozilla.sh.in -Source4: l10n.tar.bz2 +Source4: l10n-%{version}.tar.bz2 Source5: mailredirect-0.7.4.xpi Source6: suse-default-prefs.js -Source9: enigmail-0.94.2.tar.gz +Source9: enigmail-0.95.0.tar.gz Source11: enigmail.manifest -Patch1: pango-cairo.patch +Patch1: replytolist.patch Patch2: thunderbird-appname.patch Patch3: visibility.patch Patch4: locale.patch Patch5: abuild.patch Patch6: nspr-prdtoa.patch Patch7: enig-shared.patch -Patch8: digest-mail.patch +Patch8: gcc-undefined-ops.patch Patch9: thunderbird-no-update.patch Patch10: mips-buildfix.diff Patch11: lightning.patch @@ -42,21 +42,11 @@ Patch12: misc.dif Patch13: nss-opt.patch Patch14: html-compose.patch Patch15: system-extensions.patch -Patch16: xul-picker.patch -Patch17: remote.patch -Patch18: system-nss.patch -Patch19: system-nspr.patch -#Patch21: ppc64.patch +Patch16: list-replyto-clobber.patch Patch22: cjk-postscript-fonts.dif -Patch24: multi-replyto.patch Patch25: postscript.patch Patch26: cups-paper.patch -Patch27: print-properties.patch -Patch28: replytolist.patch -Patch29: list-replyto-clobber.patch -Patch30: undefined-ops.patch -# bnc 232305 -Patch31: thunderbird-1.5.0.8-uninitalized-vars-232305.patch +Patch27: thunderbird-1.5.0.8-uninitalized-vars-232305.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %if %suse_version > 1000 @@ -142,7 +132,7 @@ cd $RPM_BUILD_DIR/mozilla %patch5 %patch6 %patch8 -%patch9 +###%patch9 %patch10 #%patch11 %patch12 @@ -150,32 +140,36 @@ cd $RPM_BUILD_DIR/mozilla %patch14 %patch15 %patch16 -#%patch17 # temporary disabled -%if %has_system_nss -%patch18 -%endif -%if %has_system_nspr -%patch19 -%endif -#%patch21 +### #%patch17 # temporary disabled +### %if %has_system_nss +### %patch18 +### %endif +### %if %has_system_nspr +### %patch19 +### %endif +### %patch21 %patch22 -%patch24 +### %patch24 %patch25 %patch26 -%patch27 -%patch28 -%patch29 -%patch30 -%patch31 -p0 +### %patch27 +### %patch28 +### %patch29 +### %patch30 +### %patch31 -p0 +%patch27 -p0 %build export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 -export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing" %if %suse_version > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif +%ifarch ppc64 +export CFLAGS="$CFLAGS -mminimal-toc" +%endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig cat << EOF > $MOZCONFIG @@ -191,7 +185,6 @@ ac_add_options --includedir=%{_includedir} ac_add_options --enable-optimize="$CFLAGS" ac_add_options --with-system-jpeg ac_add_options --with-system-png -ac_add_options --with-system-mng ac_add_options --with-system-zlib #ac_add_options --enable-extensions=default,lightning ac_add_options --enable-default-toolkit=gtk2 @@ -241,14 +234,21 @@ cp -rf $RPM_BUILD_DIR/mozilla/dist/thunderbird/* $RPM_BUILD_ROOT%{progdir} # build additional locales %if %localize echo %defattr\(-,root,root\) > %{_tmppath}/translations.list -for locale in $(cat mail/locales/all-locales); do - make -C mail/locales libs-$locale - cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ - $RPM_BUILD_ROOT%{progdir}/chrome - cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ - $RPM_BUILD_ROOT%{progdir}/chrome - echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list - echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list +#for locale in $(cat mail/locales/all-locales); do +for locale in $(awk '{ print $1; }' mail/locales/shipped-locales); do + case $locale in + ja-JP-mac) + # broken locales, do not work + ;; + *) + make -C mail/locales libs-$locale + cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ + $RPM_BUILD_ROOT%{progdir}/chrome + cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ + $RPM_BUILD_ROOT%{progdir}/chrome + echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list + echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list + esac done %endif # overwrite the mozilla start-script and link it to /usr/bin @@ -313,17 +313,17 @@ unzip %{SOURCE5} -d $_redir_dir mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/thunderbird.xpm %if %suse_version > 820 -%suse_update_desktop_file %{name} Network Email GTK +%suse_update_desktop_file %{name} Application Network Email GTK %endif -%if %has_system_nspr && !%has_system_nss +%if !%has_system_nss # modify provides and requires lists cat << EOF > %{my_provides} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so" | %{__find_provides} +grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|libfreebl3.so" | %{__find_provides} EOF chmod 755 %{my_provides} %define __find_provides %{my_provides} cat << EOF > %{my_requires} -grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|thunderbird-bin" | %{__find_requires} +grep -vE "libnss3.so|libnssckbi.so|libsmime3.so|libsoftokn3.so|libssl3.so|libpipnss.so|libfreebl3.so|thunderbird-bin" | %{__find_requires} EOF chmod 755 %{my_requires} %define __find_requires %{my_requires} @@ -353,7 +353,7 @@ exit 0 %preun if [ "$1" = "0" ]; then # deinstallation - rm -f %{progdir}/components/myspell/* + rm -f %{progdir}/dictionaries/* fi exit 0 @@ -378,8 +378,10 @@ exit 0 %{progdir}/libsoftokn3.chk %{progdir}/libsoftokn3.so %{progdir}/libssl3.so +%{progdir}/libfreebl3.* %endif # +%{progdir}/dependentlibs.list %{progdir}/LICENSE.txt %{progdir}/README.txt %{progdir}/libldap50.so @@ -389,6 +391,7 @@ exit 0 %{progdir}/libxpcom_compat.so %{progdir}/libxpcom.so %{progdir}/libxpistub.so +%{progdir}/license.html %{progdir}/mozilla-xremote-client %{progdir}/run-mozilla.sh %{progdir}/thunderbird @@ -397,6 +400,7 @@ exit 0 %{progdir}/updater.ini %{progdir}/xpicleanup %dir %{progdir}/components +%{progdir}/components/FeedProcessor.js %{progdir}/components/accessibility-atk.xpt %{progdir}/components/accessibility.xpt %{progdir}/components/addrbook.xpt @@ -427,6 +431,8 @@ exit 0 %{progdir}/components/dom_html.xpt %{progdir}/components/dom_loadsave.xpt %{progdir}/components/dom_range.xpt +%{progdir}/components/dom_sidebar.xpt +%{progdir}/components/dom_storage.xpt %{progdir}/components/dom_stylesheets.xpt %{progdir}/components/dom_traversal.xpt %{progdir}/components/dom_views.xpt @@ -434,12 +440,13 @@ exit 0 %{progdir}/components/dom_xpath.xpt %{progdir}/components/dom.xpt %{progdir}/components/dom_xul.xpt -%{progdir}/components/downloadmanager.xpt %{progdir}/components/downloads.xpt %{progdir}/components/editor.xpt %{progdir}/components/embed_base.xpt %{progdir}/components/extensions.xpt %{progdir}/components/exthandler.xpt +%{progdir}/components/fastfind.xpt +%{progdir}/components/feeds.xpt %{progdir}/components/filepicker.xpt %{progdir}/components/find.xpt %{progdir}/components/gfx.xpt @@ -449,6 +456,7 @@ exit 0 %{progdir}/components/imglib2.xpt %{progdir}/components/impComm4xMail.xpt %{progdir}/components/import.xpt +%{progdir}/components/inspector.xpt %{progdir}/components/intl.xpt %{progdir}/components/jar.xpt %{progdir}/components/jsconsole.xpt @@ -484,7 +492,6 @@ exit 0 %{progdir}/components/msgnews.xpt %{progdir}/components/msgsearch.xpt %{progdir}/components/msgsmime.xpt -%{progdir}/components/myspell/ %{progdir}/components/necko_about.xpt %{progdir}/components/necko_cache.xpt %{progdir}/components/necko_cookie.xpt @@ -503,9 +510,9 @@ exit 0 %{progdir}/components/nsCloseAllWindows.js %{progdir}/components/nsComposerCmdLineHandler.js %{progdir}/components/nsDefaultCLH.js -%{progdir}/components/nsDownloadProgressListener.js %{progdir}/components/nsExtensionManager.js %{progdir}/components/nsFilePicker.js +%{progdir}/components/nsPhishingProtectionApplication.js %{progdir}/components/nsHelperAppDlg.js %{progdir}/components/nsInterfaceInfoToIDL.js %{progdir}/components/nsLDAPPrefsService.js @@ -513,6 +520,11 @@ exit 0 %{progdir}/components/nsUpdateService.js %{progdir}/components/nsProgressDialog.js %{progdir}/components/nsProxyAutoConfig.js +%{progdir}/components/nsURLFormatter.js +%{progdir}/components/nsUrlClassifierLib.js +%{progdir}/components/nsUrlClassifierListManager.js +%{progdir}/components/nsUrlClassifierTable.js +%{progdir}/components/url-classifier.xpt %{progdir}/components/offlineStartup.js %{progdir}/components/pipboot.xpt %{progdir}/components/pipnss.xpt @@ -523,11 +535,14 @@ exit 0 %{progdir}/components/progressDlg.xpt %{progdir}/components/proxyObjInst.xpt %{progdir}/components/rdf.xpt +%{progdir}/components/saxparser.xpt +%{progdir}/components/nsSetDefaultMail.js +%{progdir}/components/shellservice.xpt %{progdir}/components/shistory.xpt -%{progdir}/components/sidebar.xpt %{progdir}/components/signonviewer.xpt %{progdir}/components/smime-service.js %{progdir}/components/spellchecker.xpt +%{progdir}/components/storage.xpt %{progdir}/components/toolkitprofile.xpt %{progdir}/components/toolkitremote.xpt %{progdir}/components/txmgr.xpt @@ -536,6 +551,7 @@ exit 0 %{progdir}/components/unicharutil.xpt %{progdir}/components/update.xpt %{progdir}/components/uriloader.xpt +%{progdir}/components/urlformatter.xpt %{progdir}/components/wallet.xpt %{progdir}/components/walleteditor.xpt %{progdir}/components/walletpreview.xpt @@ -546,7 +562,7 @@ exit 0 %{progdir}/components/widget.xpt %{progdir}/components/windowds.xpt %{progdir}/components/windowwatcher.xpt -%{progdir}/components/xmlextras.xpt +%{progdir}/components/xpautocomplete.xpt %{progdir}/components/xpcom_base.xpt %{progdir}/components/xpcom_components.xpt %{progdir}/components/xpcom_ds.xpt @@ -565,15 +581,16 @@ exit 0 %{progdir}/chrome/en-US.* %{progdir}/chrome/messenger.* %{progdir}/chrome/newsblog.* -%{progdir}/chrome/offline.* %{progdir}/chrome/pippki.* %{progdir}/chrome/toolkit.* %{progdir}/chrome/US.jar %{progdir}/chrome/icons/ +%{progdir}/dictionaries/ %{progdir}/defaults/ %{progdir}/greprefs/ %{progdir}/extensions/ %{progdir}/init.d/ +%{progdir}/isp/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/thunderbird.xpm %{_bindir}/%{progname} @@ -584,15 +601,43 @@ exit 0 %endif %changelog +* Tue Jun 12 2007 - maw@suse.de +- Merge chagnges from the build service (thanks, Wolfgang) +- Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2 as + before. * Tue Jun 05 2007 - maw@suse.de - Security update to version 1.5.0.12 (#271197). * Tue Jun 05 2007 - sbrabec@suse.cz - Removed invalid desktop category "Application" (#254654). +* Thu Apr 19 2007 - wr@rosenauer.org +- update to final version 2.0.0.0 + (http://www.mozilla.com/en-US/thunderbird/2.0.0.0/releasenotes/) +- update enigmail to 0.95.0 +* Wed Apr 18 2007 - mfabian@suse.de +- add Japanese to the languages which get PANGO enabled in the + start script to support the Japanese combining characters + U+3099 U+309A (see bugzilla #262718 comment #29). +* Thu Apr 12 2007 - wr@rosenauer.org +- update to 2.0.0.0rc1 +- enabled translations package +* Fri Mar 30 2007 - wr@rosenauer.org +- update to snapshot 2.0.0.0pre-20070329 +- security update enigmail 0.94.3 + (Bugtraq #22758) * Fri Mar 30 2007 - meissner@suse.de - require unzip +- require unzip +* Tue Mar 13 2007 - wr@rosenauer.org +- update to snapshot 2.0pre-20060312 +- removed implicit NSS version dependency * Thu Mar 08 2007 - meissner@suse.de - Upgraded to 1.5.0.10 security release. - Upgraded to enigmail 0.94.2. +* Thu Feb 15 2007 - wr@rosenauer.org +- update to snapshot 2.0beta2-20060214 +- fixed build on SLES9 +* Mon Feb 05 2007 - wr@rosenauer.org +- fixed check in add-plugins.sh (#242237) * Tue Jan 30 2007 - maw@suse.de - Add thunderbird-1.5.0.8-uninitalized-vars-232305.patch (#232305). * Thu Jan 18 2007 - maw@suse.de diff --git a/abuild.patch b/abuild.patch index 5a46592..52500c0 100644 --- a/abuild.patch +++ b/abuild.patch @@ -7,7 +7,6 @@ References: Program is using uninitialized variables. Note the difference between "is used" and "may be used". Please investigate and fix. Problematic file(s) and their linenumbers: - certificate.c: 541 nsUnicodeToJamoTTF.cpp: 855 nsObjectFrame.cpp: 1933 ### @@ -23,8 +22,10 @@ Problematic file(s) and their linenumbers: nsFrame.cpp: 3536 ### ---- gfx/src/gtk/nsFontMetricsUtils.cpp.old 2005-03-24 07:27:33.000000000 +0100 -+++ gfx/src/gtk/nsFontMetricsUtils.cpp 2005-03-24 07:28:26.000000000 +0100 +Index: gfx/src/gtk/nsFontMetricsUtils.cpp +=================================================================== +--- gfx/src/gtk/nsFontMetricsUtils.cpp.orig ++++ gfx/src/gtk/nsFontMetricsUtils.cpp @@ -75,6 +75,7 @@ NS_FontMetricsGetHints(void) #ifdef MOZ_ENABLE_COREXFONTS return nsFontMetricsGTK::GetHints(); @@ -40,18 +41,36 @@ Problematic file(s) and their linenumbers: + return 1; } - #ifdef MOZ_ENABLE_XFT + #if defined(MOZ_ENABLE_XFT) && defined(MOZ_ENABLE_COREXFONTS) +Index: intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp +=================================================================== +--- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp.orig ++++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp +@@ -842,6 +842,7 @@ PRInt16 JamoSrchReplace (const JamoNormM + { + const JamoNormMap *match; + JamoNormMap key; ++ key.liga = 0; + + // cluster array is made up of PRUint8's to save memory + // and we have to subtract aOffset from the input before looking it up. +Index: layout/generic/nsObjectFrame.cpp +=================================================================== +--- layout/generic/nsObjectFrame.cpp.orig ++++ layout/generic/nsObjectFrame.cpp +@@ -1846,6 +1846,7 @@ nsObjectFrame::Paint(nsPresContext* + nsPoint origin; + float t2p; + window.window = nsnull; ++ window.ws_info = nsnull; + + // prepare embedded mode printing struct + nsPluginPrint npprint; Index: docshell/base/nsWebShell.cpp =================================================================== -RCS file: /cvsroot/mozilla/docshell/base/nsWebShell.cpp,v -retrieving revision 1.656.2.1 -diff -u -p -6 -r1.656.2.1 nsWebShell.cpp ---- docshell/base/nsWebShell.cpp 16 Sep 2005 19:11:52 -0000 1.656.2.1 -+++ docshell/base/nsWebShell.cpp 22 Sep 2005 06:30:30 -0000 -@@ -556,12 +556,13 @@ nsWebShell::OnLinkClickSync(nsIContent * - // XXX TODO Should be similar to the HTML IMG ALT attribute handling - // in NS 4.x - default: +--- docshell/base/nsWebShell.cpp.orig ++++ docshell/base/nsWebShell.cpp +@@ -557,6 +557,7 @@ nsWebShell::OnLinkClickSync(nsIContent * NS_ABORT_IF_FALSE(0,"unexpected link verb"); return NS_ERROR_UNEXPECTED; } @@ -59,6 +78,29 @@ diff -u -p -6 -r1.656.2.1 nsWebShell.cpp } NS_IMETHODIMP - nsWebShell::OnOverLink(nsIContent* aContent, - nsIURI* aURI, - const PRUnichar* aTargetSpec) +Index: layout/generic/nsFrame.cpp +=================================================================== +--- layout/generic/nsFrame.cpp.orig ++++ layout/generic/nsFrame.cpp +@@ -3569,7 +3569,7 @@ nsFrame::PeekOffsetParagraph(nsPresConte + #ifdef DEBUG_paragraph + printf("Selecting paragraph\n"); + #endif +- nsIFrame* blockFrame; ++ nsIFrame* blockFrame = NULL; + nsCOMPtr iter (getter_AddRefs(GetBlockFrameAndLineIter(this, &blockFrame))); + if (!blockFrame || !iter) + return NS_ERROR_UNEXPECTED; +Index: mailnews/local/src/nsMailboxService.cpp +=================================================================== +--- mailnews/local/src/nsMailboxService.cpp.orig ++++ mailnews/local/src/nsMailboxService.cpp +@@ -228,7 +228,7 @@ nsresult nsMailboxService::FetchMessage( + + // this happens with forward inline of message/rfc822 attachment + // opened in a stand-alone msg window. +- PRInt32 typeIndex = typeIndex = uriString.Find("&type=application/x-message-display"); ++ PRInt32 typeIndex = uriString.Find("&type=application/x-message-display"); + if (typeIndex != kNotFound) + { + uriString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); diff --git a/digest-mail.patch b/digest-mail.patch deleted file mode 100644 index 2ea1f22..0000000 --- a/digest-mail.patch +++ /dev/null @@ -1,885 +0,0 @@ -Index: mailnews/base/src/nsMessenger.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/base/src/nsMessenger.cpp,v -retrieving revision 1.326 -diff -u -w -p -8 -r1.326 nsMessenger.cpp ---- base/src/nsMessenger.cpp 26 Sep 2005 01:38:19 -0000 1.326 -+++ mailnews/base/src/nsMessenger.cpp 21 Oct 2005 15:51:26 -0000 -@@ -612,16 +612,17 @@ nsMessenger::LoadURL(nsIDOMWindowInterna - NS_ConvertASCIItoUTF16 uriString(aURL); - // Cleanup the empty spaces that might be on each end. - uriString.Trim(" "); - // Eliminate embedded newlines, which single-line text fields now allow: - uriString.StripChars("\r\n"); - NS_ENSURE_TRUE(!uriString.IsEmpty(), NS_ERROR_FAILURE); - - PRBool loadingFromFile = PR_FALSE; -+ PRBool getDummyMsgHdr = PR_FALSE; - PRInt64 fileSize; - - if (StringBeginsWith(uriString, NS_LITERAL_STRING("file:"))) - { - - nsCOMPtr fileUri; - rv = NS_NewURI(getter_AddRefs(fileUri), uriString); - NS_ENSURE_SUCCESS(rv, rv); -@@ -629,41 +630,48 @@ nsMessenger::LoadURL(nsIDOMWindowInterna - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr file; - rv = fileUrl->GetFile(getter_AddRefs(file)); - NS_ENSURE_SUCCESS(rv, rv); - file->GetFileSize(&fileSize); - uriString.ReplaceSubstring(NS_LITERAL_STRING("file:"), NS_LITERAL_STRING("mailbox:")); - uriString.Append(NS_LITERAL_STRING("&number=0")); - loadingFromFile = PR_TRUE; -+ getDummyMsgHdr = PR_TRUE; - } -+ else if (FindInReadable(NS_LITERAL_STRING("type=application/x-message-display"), uriString)) -+ getDummyMsgHdr = PR_TRUE; - - nsCOMPtr uri; - rv = NS_NewURI(getter_AddRefs(uri), uriString); - NS_ENSURE_SUCCESS(rv, rv); - - NS_ENSURE_TRUE(mDocShell, NS_ERROR_FAILURE); - nsCOMPtr msgurl = do_QueryInterface(uri); - if (msgurl) - { - msgurl->SetMsgWindow(mMsgWindow); -+ if (loadingFromFile || getDummyMsgHdr) -+ { - if (loadingFromFile) - { - nsCOMPtr mailboxUrl = do_QueryInterface(msgurl, &rv); - mailboxUrl->SetMessageSize((PRUint32) fileSize); -+ } -+ if (getDummyMsgHdr) -+ { - nsCOMPtr headerSink; - // need to tell the header sink to capture some headers to create a fake db header - // so we can do reply to a .eml file or a rfc822 msg attachment. - mMsgWindow->GetMsgHeaderSink(getter_AddRefs(headerSink)); - if (headerSink) - { - nsCOMPtr dummyHeader; - headerSink->GetDummyMsgHeader(getter_AddRefs(dummyHeader)); -- if (dummyHeader) -- { -+ if (dummyHeader && loadingFromFile) - dummyHeader->SetMessageSize((PRUint32) fileSize); - } - } - } - } - - nsCOMPtr loadInfo; - rv = mDocShell->CreateLoadInfo(getter_AddRefs(loadInfo)); -@@ -1386,17 +1394,17 @@ nsMessenger::MessageServiceFromURI(const - NS_IMETHODIMP - nsMessenger::MsgHdrFromURI(const char *aUri, nsIMsgDBHdr **aMsgHdr) - { - NS_ENSURE_ARG_POINTER(aUri); - NS_ENSURE_ARG_POINTER(aMsgHdr); - nsCOMPtr msgService; - nsresult rv; - -- if (!strncmp(aUri, "file:", 5)) -+ if (!strncmp(aUri, "file:", 5) || PL_strstr(aUri, "type=application/x-message-display")) - { - nsCOMPtr headerSink; - mMsgWindow->GetMsgHeaderSink(getter_AddRefs(headerSink)); - if (headerSink) - { - rv = headerSink->GetDummyMsgHeader(aMsgHdr); - // Is there a way to check if they're asking for the hdr currently - // displayed in a stand-alone msg window from a .eml file? -Index: base/src/nsMsgCopyService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgCopyService.cpp,v -retrieving revision 1.51 -diff -u -w -p -8 -r1.51 nsMsgCopyService.cpp ---- base/src/nsMsgCopyService.cpp 8 Aug 2005 20:36:39 -0000 1.51 -+++ mailnews/base/src/nsMsgCopyService.cpp 21 Oct 2005 15:51:27 -0000 -@@ -549,23 +549,20 @@ nsMsgCopyService::CopyFileMessage(nsIFil - PRUint32 aMsgFlags, - nsIMsgCopyServiceListener* listener, - nsIMsgWindow* window) - { - nsresult rv = NS_ERROR_NULL_POINTER; - nsCopyRequest* copyRequest; - nsCopySource* copySource = nsnull; - nsCOMPtr fileSupport; -- nsCOMPtr txnMgr; - - NS_ENSURE_ARG_POINTER(fileSpec); - NS_ENSURE_ARG_POINTER(dstFolder); - -- if (window) -- window->GetTransactionManager(getter_AddRefs(txnMgr)); - copyRequest = new nsCopyRequest(); - if (!copyRequest) return rv; - fileSupport = do_QueryInterface(fileSpec, &rv); - if (NS_FAILED(rv)) goto done; - - rv = copyRequest->Init(nsCopyFileMessageType, fileSupport, dstFolder, - isDraft, aMsgFlags, listener, window, PR_FALSE); - if (NS_FAILED(rv)) goto done; -Index: base/src/nsMsgDBView.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgDBView.cpp,v -retrieving revision 1.226 -diff -u -w -p -8 -r1.226 nsMsgDBView.cpp ---- base/src/nsMsgDBView.cpp 20 Oct 2005 16:03:26 -0000 1.226 -+++ mailnews/base/src/nsMsgDBView.cpp 21 Oct 2005 15:51:35 -0000 -@@ -974,17 +974,18 @@ NS_IMETHODIMP nsMsgDBView::ReloadMessage - { - if (m_currentlyDisplayedMsgUri.IsEmpty()) - return NS_ERROR_FAILURE; - - if (mSuppressMsgDisplay) - return NS_OK; - - nsCAutoString forceAllParts(m_currentlyDisplayedMsgUri); -- forceAllParts.AppendLiteral("?fetchCompleteMessage=true"); -+ forceAllParts += (forceAllParts.FindChar('?') == kNotFound) ? "?" : "&"; -+ forceAllParts.AppendLiteral("fetchCompleteMessage=true"); - return mMessengerInstance->OpenURL(forceAllParts.get()); - } - - NS_IMETHODIMP nsMsgDBView::ReloadMessage() - { - if (m_currentlyDisplayedMsgUri.IsEmpty()) - return NS_ERROR_FAILURE; - -Index: compose/src/nsMsgAttachmentHandler.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp,v -retrieving revision 1.117 -diff -u -w -p -8 -r1.117 nsMsgAttachmentHandler.cpp ---- compose/src/nsMsgAttachmentHandler.cpp 21 Apr 2005 18:48:36 -0000 1.117 -+++ mailnews/compose/src/nsMsgAttachmentHandler.cpp 21 Oct 2005 15:51:47 -0000 -@@ -555,17 +555,18 @@ nsMsgAttachmentHandler::SnarfMsgAttachme - goto done; - } - - rv = fetcher->Initialize(localFile, mOutFile, FetcherURLDoneCallback, this); - rv = GetMessageServiceFromURI(m_uri, getter_AddRefs(messageService)); - if (NS_SUCCEEDED(rv) && messageService) - { - nsCAutoString uri(m_uri); -- uri.Append("?fetchCompleteMessage=true"); -+ uri += (uri.FindChar('?') == kNotFound) ? "?" : "&"; -+ uri.Append("fetchCompleteMessage=true"); - nsCOMPtr strListener; - fetcher->QueryInterface(NS_GET_IID(nsIStreamListener), getter_AddRefs(strListener)); - - // initialize a new stream converter, that uses the strListener as its input - // obtain the input stream listener from the new converter, - // and pass the converter's input stream listener to DisplayMessage - - m_mime_parser = do_CreateInstance(NS_MAILNEWS_MIME_STREAM_CONVERTER_CONTRACTID, &rv); -Index: compose/src/nsMsgCompose.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompose.cpp,v -retrieving revision 1.471 -diff -u -w -p -8 -r1.471 nsMsgCompose.cpp ---- compose/src/nsMsgCompose.cpp 18 Oct 2005 16:29:37 -0000 1.471 -+++ mailnews/compose/src/nsMsgCompose.cpp 21 Oct 2005 15:51:54 -0000 -@@ -1468,19 +1468,31 @@ nsresult nsMsgCompose::CreateMessage(con - // strip out ?type=application/x-message-display because it confuses libmime - PRInt32 typeIndex = msgUri.Find("?type=application/x-message-display"); - if (typeIndex != kNotFound) - { - msgUri.Cut(typeIndex, sizeof("?type=application/x-message-display") - 1); - // we also need to replace the next '&' with '?' - if (msgUri.CharAt(typeIndex) == '&') - msgUri.SetCharAt('?', typeIndex); -+ originalMsgURI = msgUri.get(); -+ } - } -+ else // check if we're dealing with a displayed message/rfc822 attachment -+ { -+ PRInt32 typeIndex = typeIndex = msgUri.Find("&type=application/x-message-display"); -+ if (typeIndex != kNotFound) -+ { -+ msgUri.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); -+ // nsURLFetcher will check for "realtype=message/rfc822" and will set the -+ // content type to message/rfc822 in the forwarded message. -+ msgUri.Append("&realtype=message/rfc822"); - originalMsgURI = msgUri.get(); - } -+ } - if (compFields) - { - NS_IF_RELEASE(m_compFields); - m_compFields = NS_REINTERPRET_CAST(nsMsgCompFields*, compFields); - NS_ADDREF(m_compFields); - } - else - { -Index: compose/src/nsMsgComposeService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgComposeService.cpp,v -retrieving revision 1.113 -diff -u -w -p -8 -r1.113 nsMsgComposeService.cpp ---- compose/src/nsMsgComposeService.cpp 3 Oct 2005 23:51:05 -0000 1.113 -+++ mailnews/compose/src/nsMsgComposeService.cpp 21 Oct 2005 15:51:56 -0000 -@@ -414,17 +414,19 @@ nsMsgComposeService::OpenComposeWindow(c - */ - if (type == nsIMsgCompType::ForwardInline || type == nsIMsgCompType::Draft || type == nsIMsgCompType::Template - || type == nsIMsgCompType::ReplyWithTemplate) - { - nsCOMPtr pMsgDraft (do_CreateInstance(NS_MSGDRAFT_CONTRACTID, &rv)); - if (NS_SUCCEEDED(rv) && pMsgDraft) - { - nsCAutoString uriToOpen(originalMsgURI); -- uriToOpen.Append("?fetchCompleteMessage=true"); -+ -+ uriToOpen += (uriToOpen.FindChar('?') == kNotFound) ? "?" : "&"; -+ uriToOpen.Append("fetchCompleteMessage=true"); - - switch(type) - { - case nsIMsgCompType::ForwardInline: - rv = pMsgDraft->OpenDraftMsg(uriToOpen.get(), originalMsgURI, identity, PR_TRUE, aMsgWindow); - break; - case nsIMsgCompType::Draft: - rv = pMsgDraft->OpenDraftMsg(uriToOpen.get(), nsnull, identity, PR_FALSE, aMsgWindow); -@@ -470,22 +472,22 @@ nsMsgComposeService::OpenComposeWindow(c - esc_FileBaseName|esc_Forced|esc_AlwaysCopy, - unescapedName); - pMsgCompFields->SetNewsgroups(NS_ConvertUTF8toUTF16(unescapedName)); - pMsgCompFields->SetNewshost(host.get()); - } - else - { - pMsgComposeParams->SetOriginalMsgURI(originalMsgURI); -- if (PL_strstr(originalMsgURI, "?type=application/x-message-display")) -+ if (PL_strstr(originalMsgURI, "type=application/x-message-display")) - { - nsCOMPtr msgHdr; - if (strncmp(originalMsgURI, "file:", 5)) - rv = GetMsgDBHdrFromURI(originalMsgURI, getter_AddRefs(msgHdr)); -- else if (aMsgWindow) -+ if (aMsgWindow && !msgHdr) - { - nsCOMPtr headerSink; - rv = aMsgWindow->GetMsgHeaderSink(getter_AddRefs(headerSink)); - if (headerSink) - rv = headerSink->GetDummyMsgHeader(getter_AddRefs(msgHdr)); - } - pMsgComposeParams->SetOrigMsgHdr(msgHdr); - } -Index: compose/src/nsMsgCreate.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCreate.cpp,v -retrieving revision 1.60 -diff -u -w -p -8 -r1.60 nsMsgCreate.cpp ---- compose/src/nsMsgCreate.cpp 16 Sep 2005 15:18:33 -0000 1.60 -+++ mailnews/compose/src/nsMsgCreate.cpp 21 Oct 2005 15:51:57 -0000 -@@ -144,19 +144,19 @@ nsMsgDraft::ProcessDraftOrTemplateOperat - printf("Unable to get the nsIStreamListener interface from libmime\n"); - #endif - return NS_ERROR_UNEXPECTED; - } - - nsCOMPtr aURL; - nsCAutoString uriString(msgURI); - PRBool fileUrl = StringBeginsWith(uriString, NS_LITERAL_CSTRING("file:")); -+ PRBool forwardedMessage = PL_strstr(msgURI, "&type=application/x-message-display") != nsnull; - -- -- if (fileUrl) -+ if (fileUrl || forwardedMessage) - rv = NS_NewURI(getter_AddRefs(aURL), msgURI); - else - rv = mMessageService->GetUrlForUri(mURI, getter_AddRefs(aURL), aMsgWindow); - if (aURL) - aURL->SetSpec(nsDependentCString(mURI)); - - // if we are forwarding a message and that message used a charset over ride - // then use that over ride charset instead of the charset specified in the message -Index: compose/src/nsMsgQuote.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgQuote.cpp,v -retrieving revision 1.71 -diff -u -w -p -8 -r1.71 nsMsgQuote.cpp ---- compose/src/nsMsgQuote.cpp 16 Sep 2005 15:18:33 -0000 1.71 -+++ mailnews/compose/src/nsMsgQuote.cpp 21 Oct 2005 15:51:58 -0000 -@@ -170,19 +170,19 @@ nsMsgQuote::QuoteMessage(const char *msg - if (!msgURI) - return NS_ERROR_INVALID_ARG; - - mQuoteHeaders = quoteHeaders; - mStreamListener = aQuoteMsgStreamListener; - - nsCAutoString msgUri(msgURI); - PRBool fileUrl = !strncmp(msgURI, "file:", 5); -- -+ PRBool forwardedMessage = PL_strstr(msgURI, "&realtype=message/rfc822") != nsnull; - nsCOMPtr aURL; -- if (fileUrl) -+ if (fileUrl || forwardedMessage) - rv = NS_NewURI(getter_AddRefs(aURL), msgURI); - else - { - nsCOMPtr msgService; - rv = GetMessageServiceFromURI(msgURI, getter_AddRefs(msgService)); - if (NS_FAILED(rv)) return rv; - rv = msgService->GetUrlForUri(msgURI, getter_AddRefs(aURL), nsnull); - } -Index: compose/src/nsURLFetcher.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsURLFetcher.cpp,v -retrieving revision 1.72 -diff -u -w -p -8 -r1.72 nsURLFetcher.cpp ---- compose/src/nsURLFetcher.cpp 13 Jun 2005 18:10:20 -0000 1.72 -+++ mailnews/compose/src/nsURLFetcher.cpp 21 Oct 2005 15:51:58 -0000 -@@ -484,26 +484,33 @@ NS_IMETHODIMP nsURLFetcherStreamConsumer - { - if (!mURLFetcher) - return NS_ERROR_FAILURE; - - // Check the content type! - nsCAutoString contentType; - nsCAutoString charset; - -- nsCOMPtr aChannel = do_QueryInterface(aRequest); -- if(!aChannel) return NS_ERROR_FAILURE; -+ nsCOMPtr channel = do_QueryInterface(aRequest); -+ if(!channel) return NS_ERROR_FAILURE; - -- if (NS_SUCCEEDED(aChannel->GetContentType(contentType)) && -+ if (NS_SUCCEEDED(channel->GetContentType(contentType)) && - !contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) - { -+ nsCAutoString uriSpec; -+ nsCOMPtr channelURI; -+ channel->GetURI(getter_AddRefs(channelURI)); -+ channelURI->GetSpec(uriSpec); -+ if (FindInReadable(NS_LITERAL_CSTRING("&realtype=message/rfc822"), uriSpec)) -+ mURLFetcher->mContentType = MESSAGE_RFC822; -+ else - mURLFetcher->mContentType = contentType; - } - -- if (NS_SUCCEEDED(aChannel->GetContentCharset(charset)) && !charset.IsEmpty()) -+ if (NS_SUCCEEDED(channel->GetContentCharset(charset)) && !charset.IsEmpty()) - { - mURLFetcher->mCharset = charset; - } - - return NS_OK; - } - - /** nsIStreamListener methods **/ -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapService.cpp,v -retrieving revision 1.309 -diff -u -w -p -8 -r1.309 nsImapService.cpp ---- imap/src/nsImapService.cpp 22 Mar 2005 18:25:33 -0000 1.309 -+++ mailnews/imap/src/nsImapService.cpp 21 Oct 2005 15:52:23 -0000 -@@ -95,16 +95,17 @@ - #include "nsIDOMWindowInternal.h" - #include "nsIMessengerWindowService.h" - #include "nsIWindowMediator.h" - #include "nsIPrompt.h" - #include "nsIWindowWatcher.h" - #include "nsImapProtocol.h" - #include "nsIMsgMailSession.h" - #include "nsIStreamConverterService.h" -+#include "nsNetUtil.h" - #include "nsInt64.h" - - #define PREF_MAIL_ROOT_IMAP "mail.root.imap" // old - for backward compatibility only - #define PREF_MAIL_ROOT_IMAP_REL "mail.root.imap-rel" - - static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); - static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID); - static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); -@@ -308,16 +309,20 @@ nsImapService::LiteSelectFolder(nsIEvent - - return rv; - } - - NS_IMETHODIMP nsImapService::GetUrlForUri(const char *aMessageURI, nsIURI **aURL, nsIMsgWindow *aMsgWindow) - { - nsresult rv = NS_OK; - -+ if (PL_strstr(aMessageURI, "&type=application/x-message-display")) -+ return NS_NewURI(aURL, aMessageURI); -+ -+ - nsCOMPtr folder; - nsXPIDLCString msgKey; - rv = DecomposeImapURI(aMessageURI, getter_AddRefs(folder), getter_Copies(msgKey)); - if (NS_SUCCEEDED(rv)) - { - nsCOMPtr imapUrl; - nsCAutoString urlSpec; - PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder); -@@ -477,17 +482,47 @@ NS_IMETHODIMP nsImapService::DisplayMess - nsIURI ** aURL) - { - nsresult rv = NS_OK; - nsCOMPtr folder; - nsXPIDLCString msgKey; - nsXPIDLCString mimePart; - nsCAutoString folderURI; - nsMsgKey key; -+ nsCAutoString messageURI(aMessageURI); - -+ PRInt32 typeIndex = messageURI.Find("&type=application/x-message-display"); -+ if (typeIndex != kNotFound) -+ { -+ // This happens with forward inline of a message/rfc822 attachment opened in -+ // a standalone msg window. -+ // So, just cut to the chase and call AsyncOpen on a channel. -+ nsCOMPtr uri; -+ messageURI.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); -+ rv = NS_NewURI(getter_AddRefs(uri), messageURI.get()); -+ NS_ENSURE_SUCCESS(rv, rv); -+ if (aURL) -+ NS_IF_ADDREF(*aURL = uri); -+ nsCOMPtr aStreamListener = do_QueryInterface(aDisplayConsumer, &rv); -+ if (NS_SUCCEEDED(rv) && aStreamListener) -+ { -+ nsCOMPtr aChannel; -+ nsCOMPtr aLoadGroup; -+ nsCOMPtr mailnewsUrl = do_QueryInterface(uri, &rv); -+ if (NS_SUCCEEDED(rv) && mailnewsUrl) -+ mailnewsUrl->GetLoadGroup(getter_AddRefs(aLoadGroup)); -+ -+ rv = NewChannel(uri, getter_AddRefs(aChannel)); -+ if (NS_FAILED(rv)) return rv; -+ -+ nsCOMPtr aCtxt = do_QueryInterface(uri); -+ // now try to open the channel passing in our display consumer as the listener -+ return aChannel->AsyncOpen(aStreamListener, aCtxt); -+ } -+ } - rv = DecomposeImapURI(aMessageURI, getter_AddRefs(folder), getter_Copies(msgKey)); - if (msgKey.IsEmpty()) - return NS_MSG_MESSAGE_NOT_FOUND; - rv = nsParseImapMessageURI(aMessageURI, folderURI, &key, getter_Copies(mimePart)); - if (NS_SUCCEEDED(rv)) - { - nsCOMPtr imapMessageSink(do_QueryInterface(folder, &rv)); - if (NS_SUCCEEDED(rv)) -Index: local/src/nsMailboxProtocol.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsMailboxProtocol.cpp,v -retrieving revision 1.122 -diff -u -w -p -8 -r1.122 nsMailboxProtocol.cpp ---- local/src/nsMailboxProtocol.cpp 1 Jun 2005 19:04:20 -0000 1.122 -+++ mailnews/local/src/nsMailboxProtocol.cpp 21 Oct 2005 15:52:26 -0000 -@@ -456,16 +456,18 @@ nsresult nsMailboxProtocol::LoadUrl(nsIU - m_runningUrl = do_QueryInterface(aURL); - if (m_runningUrl) - { - // find out from the url what action we are supposed to perform... - rv = m_runningUrl->GetMailboxAction(&m_mailboxAction); - - PRBool convertData = PR_FALSE; - -+ // need to check if we're fetching an rfc822 part in order to -+ // quote a message. - if (m_mailboxAction == nsIMailboxUrl::ActionFetchMessage) - { - nsCOMPtr msgUrl = do_QueryInterface(m_runningUrl, &rv); - NS_ENSURE_SUCCESS(rv,rv); - - nsCAutoString queryStr; - rv = msgUrl->GetQuery(queryStr); - NS_ENSURE_SUCCESS(rv,rv); -Index: local/src/nsMailboxService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsMailboxService.cpp,v -retrieving revision 1.116 -diff -u -w -p -8 -r1.116 nsMailboxService.cpp ---- local/src/nsMailboxService.cpp 16 Sep 2005 15:19:09 -0000 1.116 -+++ mailnews/local/src/nsMailboxService.cpp 21 Oct 2005 15:52:27 -0000 -@@ -177,16 +177,19 @@ nsresult nsMailboxService::FetchMessage( - nsIURI ** aURL) - { - nsresult rv = NS_OK; - nsCOMPtr mailboxurl; - - nsMailboxAction actionToUse = mailboxAction; - - nsCOMPtr url; -+ -+ nsCAutoString uriString(aMessageURI); -+ - if (!strncmp(aMessageURI, "file:", 5)) - { - PRInt64 fileSize; - nsCOMPtr fileUri; - rv = NS_NewURI(getter_AddRefs(fileUri), aMessageURI); - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr fileUrl = do_QueryInterface(fileUri, &rv); - NS_ENSURE_SUCCESS(rv, rv); -@@ -216,16 +219,27 @@ nsresult nsMailboxService::FetchMessage( - headerSink->GetDummyMsgHeader(getter_AddRefs(dummyHeader)); - if (dummyHeader) - dummyHeader->SetMessageSize((PRUint32) fileSize); - } - } - } - else - { -+ -+ // this happens with forward inline of message/rfc822 attachment -+ // opened in a stand-alone msg window. -+ PRInt32 typeIndex = typeIndex = uriString.Find("&type=application/x-message-display"); -+ if (typeIndex != kNotFound) -+ { -+ uriString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); -+ rv = NS_NewURI(getter_AddRefs(url), uriString.get()); -+ mailboxurl = do_QueryInterface(url); -+ } -+ else - rv = PrepareMessageUrl(aMessageURI, aUrlListener, actionToUse , getter_AddRefs(mailboxurl), aMsgWindow); - - if (NS_SUCCEEDED(rv)) - { - url = do_QueryInterface(mailboxurl); - nsCOMPtr msgUrl (do_QueryInterface(url)); - msgUrl->SetMsgWindow(aMsgWindow); - nsCOMPtr i18nurl (do_QueryInterface(msgUrl)); -@@ -313,27 +327,16 @@ NS_IMETHODIMP nsMailboxService::OpenAtta - const char *aUrl, - const char *aMessageUri, - nsISupports *aDisplayConsumer, - nsIMsgWindow *aMsgWindow, - nsIUrlListener *aUrlListener) - { - nsCOMPtr URL; - nsCAutoString urlString(aUrl); -- // strip out ?type=application/x-message-display because it confuses libmime -- -- PRInt32 typeIndex = urlString.Find("?type=application/x-message-display"); -- if (typeIndex != kNotFound) -- { -- urlString.Cut(typeIndex, sizeof("?type=application/x-message-display") - 1); -- // we also need to replace the next '&' with '?' -- PRInt32 firstPartIndex = urlString.FindChar('&'); -- if (firstPartIndex != kNotFound) -- urlString.SetCharAt('?', firstPartIndex); -- } - urlString += "&type="; - urlString += aContentType; - urlString += "&filename="; - urlString += aFileName; - CreateStartupUrl(urlString.get(), getter_AddRefs(URL)); - nsresult rv; - // try to run the url in the docshell... - nsCOMPtr docShell(do_QueryInterface(aDisplayConsumer, &rv)); -@@ -384,17 +387,18 @@ nsMailboxService::SaveMessageToDisk(cons - if (aURL) - mailboxurl->QueryInterface(NS_GET_IID(nsIURI), (void **) aURL); - - return rv; - } - - NS_IMETHODIMP nsMailboxService::GetUrlForUri(const char *aMessageURI, nsIURI **aURL, nsIMsgWindow *aMsgWindow) - { -- if (!strncmp(aMessageURI, "file:", 5)) -+ if (!strncmp(aMessageURI, "file:", 5) || PL_strstr(aMessageURI, "type=application/x-message-display") -+ || !strncmp(aMessageURI, "mailbox:", 8)) - return NS_NewURI(aURL, aMessageURI); - - nsresult rv = NS_OK; - nsCOMPtr mailboxurl; - rv = PrepareMessageUrl(aMessageURI, nsnull, nsIMailboxUrl::ActionFetchMessage, getter_AddRefs(mailboxurl), aMsgWindow); - if (NS_SUCCEEDED(rv) && mailboxurl) - rv = mailboxurl->QueryInterface(NS_GET_IID(nsIURI), (void **) aURL); - return rv; -Index: local/src/nsPop3Sink.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Sink.cpp,v -retrieving revision 1.127 -diff -u -w -p -8 -r1.127 nsPop3Sink.cpp ---- local/src/nsPop3Sink.cpp 7 Aug 2005 15:43:53 -0000 1.127 -+++ mailnews/local/src/nsPop3Sink.cpp 21 Oct 2005 15:52:28 -0000 -@@ -803,17 +803,16 @@ nsPop3Sink::IncorporateComplete(nsIMsgWi - m_outFileStream->flush(); - m_outFileStream->close(); - m_newMailParser->FinishHeader(); - // need to re-open the inbox file stream. - if (!m_tmpDownloadFileSpec.Exists()) - return HandleTempDownloadFailed(aMsgWindow); - - m_outFileStream->Open(m_tmpDownloadFileSpec, (PR_RDWR | PR_CREATE_FILE)); -- - m_newMailParser->ApplyFilters(&moved, aMsgWindow, 0); - if (!moved) - { - if (m_outFileStream->is_open()) - { - nsFileSpec destFolderSpec; - - nsCOMPtr path; -Index: mime/src/mimedrft.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/mime/src/mimedrft.cpp,v -retrieving revision 1.142 -diff -u -w -p -8 -r1.142 mimedrft.cpp ---- mime/src/mimedrft.cpp 20 Jul 2005 11:49:43 -0000 1.142 -+++ mailnews/mime/src/mimedrft.cpp 21 Oct 2005 15:52:38 -0000 -@@ -2077,16 +2077,20 @@ mime_bridge_create_draft_stream( - goto FAIL; - - rv = msgService->GetUrlForUri(turl.get(), getter_AddRefs(aURL), nsnull); - if (NS_FAILED(rv)) - goto FAIL; - - if (NS_SUCCEEDED(aURL->GetSpec(urlString))) - { -+ PRInt32 typeIndex = urlString.Find("&type=application/x-message-display"); -+ if (typeIndex != kNotFound) -+ urlString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); -+ - mdd->url_name = ToNewCString(urlString); - if (!(mdd->url_name)) - goto FAIL; - } - - newPluginObj2->GetForwardInline(&mdd->forwardInline); - newPluginObj2->GetIdentity(getter_AddRefs(mdd->identity)); - newPluginObj2->GetOriginalMsgURI(&mdd->originalMsgURI); -Index: mime/src/mimei.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/mime/src/mimei.cpp,v -retrieving revision 1.77 -diff -u -w -p -8 -r1.77 mimei.cpp ---- mime/src/mimei.cpp 13 Jun 2005 18:34:05 -0000 1.77 -+++ mailnews/mime/src/mimei.cpp 21 Oct 2005 15:52:41 -0000 -@@ -1367,16 +1367,26 @@ mime_set_url_part(const char *url, const - const char *part_begin = 0; - const char *part_end = 0; - PRBool got_q = PR_FALSE; - const char *s; - char *result; - - if (!url || !part) return 0; - -+ nsCAutoString urlString(url); -+ PRInt32 typeIndex = urlString.Find("?type=application/x-message-display"); -+ if (typeIndex != kNotFound) -+ { -+ urlString.Cut(typeIndex, sizeof("?type=application/x-message-display") - 1); -+ if (urlString.CharAt(typeIndex) == '&') -+ urlString.SetCharAt('?', typeIndex); -+ url = urlString.get(); -+ } -+ - for (s = url; *s; s++) - { - if (*s == '?') - { - got_q = PR_TRUE; - if (!nsCRT::strncasecmp(s, "?part=", 6)) - part_begin = (s += 6); - } -@@ -1665,34 +1675,32 @@ mime_parse_url_options(const char *url, - options->headers = MimeHeadersMicro; - else if (end > value && !nsCRT::strncasecmp ("cite", value, end - value)) - options->headers = MimeHeadersCitation; - else if (end > value && !nsCRT::strncasecmp ("citation", value, end-value)) - options->headers = MimeHeadersCitation; - else - options->headers = default_headers; - } -- else if (!nsCRT::strncasecmp ("part", q, name_end - q)) -+ else if (!nsCRT::strncasecmp ("part", q, name_end - q) && -+ options->format_out != nsMimeOutput::nsMimeMessageBodyQuoting) - { - PR_FREEIF (options->part_to_load); - if (end > value) - { - options->part_to_load = (char *) PR_MALLOC(end - value + 1); - if (!options->part_to_load) - return MIME_OUT_OF_MEMORY; - memcpy(options->part_to_load, value, end-value); - options->part_to_load[end-value] = 0; - } - } - else if (!nsCRT::strncasecmp ("rot13", q, name_end - q)) - { -- if (end <= value || !nsCRT::strncasecmp ("true", value, end - value)) -- options->rot13_p = PR_TRUE; -- else -- options->rot13_p = PR_FALSE; -+ options->rot13_p = end <= value || !nsCRT::strncasecmp ("true", value, end - value); - } - - q = end; - if (*q) - q++; - } - - -@@ -1751,16 +1759,17 @@ mime_parse_url_options(const char *url, - and leaves them incompatible for: - - = the first part of a top-level multipart - = all elements deeper than the outermost part - - Life s#$%s when you don't properly think out things that end up turning - into de-facto standards... - */ -+ - if (options->part_to_load && - !PL_strchr(options->part_to_load, '.')) /* doesn't contain a dot */ - { - if (!nsCRT::strcmp(options->part_to_load, "0")) /* 0 */ - { - PR_Free(options->part_to_load); - options->part_to_load = nsCRT::strdup("1"); - if (!options->part_to_load) -@@ -1774,17 +1783,16 @@ mime_parse_url_options(const char *url, - if (!s) return MIME_OUT_OF_MEMORY; - PL_strcpy(s, prefix); - PL_strcat(s, options->part_to_load); - PR_Free(options->part_to_load); - options->part_to_load = s; - } - } - -- - return 0; - } - - - /* Some output-generation utility functions... - */ - - int -@@ -1949,16 +1957,28 @@ MimeObject_output_init(MimeObject *obj, - - char * - mime_get_base_url(const char *url) - { - if (!url) - return nsnull; - - const char *s = strrchr(url, '?'); -+ if (s && !strncmp(s, "?type=application/x-message-display", sizeof("?type=application/x-message-display") - 1)) -+ { -+ const char *nextTerm = strchr(s, '&'); -+ s = (nextTerm) ? nextTerm : s + strlen(s) - 1; -+ } -+ // we need to keep the ?number part of the url, or we won't know -+ // which local message the part belongs to. -+ if (s && *s && *(s+1) && !strncmp(s + 1, "number=", sizeof("number=") - 1)) -+ { -+ const char *nextTerm = strchr(++s, '&'); -+ s = (nextTerm) ? nextTerm : s + strlen(s) - 1; -+ } - char *result = (char *) PR_MALLOC(strlen(url) + 1); - NS_ASSERTION(result, "out of memory"); - if (!result) - return nsnull; - - memcpy(result, url, s - url); - result[s - url] = 0; - return result; -Index: mime/src/nsStreamConverter.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/mime/src/nsStreamConverter.cpp,v -retrieving revision 1.128 -diff -u -w -p -8 -r1.128 nsStreamConverter.cpp ---- mime/src/nsStreamConverter.cpp 16 Aug 2005 14:23:00 -0000 1.128 -+++ mailnews/mime/src/nsStreamConverter.cpp 21 Oct 2005 15:52:42 -0000 -@@ -403,17 +403,17 @@ nsStreamConverter::DetermineOutputFormat - // Don't muck with this data! - *aNewType = nsMimeOutput::nsMimeMessageRaw; - return NS_OK; - } - } - - // is this is a part that should just come out raw - const char *part = FindQueryElementData(queryPart, "part="); -- if (part) -+ if (part && !mToType.Equals("application/vnd.mozilla.xul+xml")) - { - // default for parts - mOutputFormat = "raw"; - *aNewType = nsMimeOutput::nsMimeMessageRaw; - - // if we are being asked to fetch a part....it should have a - // content type appended to it...if it does, we want to remember - // that as mOutputFormat -@@ -1096,16 +1096,19 @@ NS_IMETHODIMP nsStreamConverter::AsyncCo - SetMimeHeadersListener(quoteListener, nsMimeOutput::nsMimeMessageQuoting); - rv = aMsgQuote->GetQuoteChannel(getter_AddRefs(aChannel)); - } - else - { - aChannel = do_QueryInterface(aCtxt, &rv); - } - -+ mFromType = aFromType; -+ mToType = aToType; -+ - NS_ASSERTION(aChannel && NS_SUCCEEDED(rv), "mailnews mime converter has to have the channel passed in..."); - if (NS_FAILED(rv)) return rv; - - nsCOMPtr aUri; - aChannel->GetURI(getter_AddRefs(aUri)); - return Init(aUri, aListener, aChannel); - } - -Index: mime/src/nsStreamConverter.h -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/mime/src/nsStreamConverter.h,v -retrieving revision 1.25 -diff -u -w -p -8 -r1.25 nsStreamConverter.h ---- mime/src/nsStreamConverter.h 1 Jun 2004 17:22:01 -0000 1.25 -+++ mailnews/mime/src/nsStreamConverter.h 21 Oct 2005 15:52:42 -0000 -@@ -102,16 +102,18 @@ private: - nsCString mOverrideFormat; // this is a possible override for emitter creation - PRBool mWrapperOutput; // Should we output the frame split message display - - nsCOMPtr mMimeStreamConverterListener; - PRBool mForwardInline; - nsCOMPtr mIdentity; - nsCString mOriginalMsgURI; - -+ nsCString mFromType; -+ nsCString mToType; - #ifdef DEBUG_mscott - PRTime mConvertContentTime; - #endif - nsIRequest * mPendingRequest; // used when we need to delay to fire onStartRequest - nsISupports * mPendingContext; // used when we need to delay to fire onStartRequest - }; - - #endif /* nsStreamConverter_h_ */ -Index: mailWindowOverlay.js -=================================================================== -RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.js,v -retrieving revision 1.103 -diff -u -w -p -8 -r1.103 mailWindowOverlay.js ---- mailWindowOverlay.js 12 Oct 2005 21:32:51 -0000 1.103 -+++ mail/base/content/mailWindowOverlay.js 27 Oct 2005 16:46:58 -0000 -@@ -2391,17 +2391,17 @@ function HandleMDNResponse(aUrl) - if (IsNewsMessage(msgURI)) - return; - - // if the message is marked as junk, do NOT attempt to process a return receipt - // in order to better protect the user - if (SelectedMessagesAreJunk()) - return; - -- var msgHdr = messenger.messageServiceFromURI(msgURI).messageURIToMsgHdr(msgURI); -+ var msgHdr = messenger.msgHdrFromURI(msgURI); - var mimeHdr; - - try { - mimeHdr = aUrl.mimeHeaders; - } catch (ex) { - return; - } - diff --git a/enigmail-0.94.2.tar.gz b/enigmail-0.94.2.tar.gz deleted file mode 100644 index f90d44c..0000000 --- a/enigmail-0.94.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2263ec2c9bf3317472f33bed46b9cb6f91d64a766314167678125b4f3b6376b8 -size 514823 diff --git a/enigmail-0.95.0.tar.gz b/enigmail-0.95.0.tar.gz new file mode 100644 index 0000000..7a6b1d7 --- /dev/null +++ b/enigmail-0.95.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc869191953c3d0797f89223a0ad5e8accc009266f1d2ec3adb2f5814ff33b50 +size 568958 diff --git a/undefined-ops.patch b/gcc-undefined-ops.patch similarity index 63% rename from undefined-ops.patch rename to gcc-undefined-ops.patch index 17c617b..4bc7884 100644 --- a/undefined-ops.patch +++ b/gcc-undefined-ops.patch @@ -1,6 +1,6 @@ ---- ./layout/base/nsCSSRendering.cpp 2005-12-27 13:52:01.000000000 +0100 -+++ ./layout/base/nsCSSRendering.cpp.new 2007-01-18 23:40:30.741771000 +0100 -@@ -979,14 +979,14 @@ +--- layout/base/nsCSSRendering.cpp.orig 2006-10-25 23:59:19.000000000 +0200 ++++ layout/base/nsCSSRendering.cpp 2006-10-26 00:00:04.000000000 +0200 +@@ -1000,14 +1000,14 @@ FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height-adjust,isInvert); FillOrInvertRect(aContext,dashRect.x,(borderOutside.YMost()-(dashRect.height-adjust)),dashRect.width, dashRect.height-adjust,isInvert); currRect.y += (dashRect.height-adjust); @@ -17,7 +17,7 @@ } if( temp > ywidth) -@@ -1045,14 +1045,14 @@ +@@ -1066,14 +1066,14 @@ FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width-adjust)),dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); currRect.x += (dashRect.width-adjust); @@ -34,43 +34,42 @@ } ---- ./layout/xul/base/src/nsBox.cpp 2006-01-07 21:27:40.000000000 +0100 -+++ ./layout/xul/base/src/nsBox.cpp.new 2007-01-18 23:43:58.695609000 +0100 +--- layout/xul/base/src/nsBox.cpp.orig 2006-10-26 00:00:26.000000000 +0200 ++++ layout/xul/base/src/nsBox.cpp 2006-10-26 00:01:30.000000000 +0200 @@ -863,7 +863,7 @@ while (box) { nsRect* overflowArea = box->GetOverflowAreaProperty(); nsRect bounds = overflowArea ? *overflowArea + box->GetPosition() : - bounds = box->GetRect(); -+ box->GetRect(); ++ box->GetRect(); rect.UnionRect(rect, bounds); box->GetNextBox(&box); ---- ./mailnews/compose/src/nsMsgCompose.cpp 2007-01-19 00:53:23.575133000 +0100 -+++ ./mailnews/compose/src/nsMsgCompose.cpp.new 2007-01-19 00:55:33.114466000 +0100 -@@ -1476,7 +1476,7 @@ - } - else // check if we're dealing with a displayed message/rfc822 attachment - { -- PRInt32 typeIndex = typeIndex = msgUri.Find("&type=application/x-message-display"); -+ PRInt32 typeIndex = msgUri.Find("&type=application/x-message-display"); - if (typeIndex != kNotFound) - { - msgUri.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); ---- ./intl/unicharutil/src/nsEntityConverter.cpp 2005-04-02 20:44:00.000000000 +0200 -+++ ./intl/unicharutil/src/nsEntityConverter.cpp.new 2007-01-19 00:14:59.413600000 +0100 -@@ -236,7 +236,9 @@ +--- intl/unicharutil/src/nsEntityConverter.cpp.orig 2005-04-02 20:44:00.000000000 +0200 ++++ intl/unicharutil/src/nsEntityConverter.cpp 2006-10-26 00:07:24.000000000 +0200 +@@ -236,7 +236,8 @@ if (IS_HIGH_SURROGATE(inString[i]) && i + 2 < len && IS_LOW_SURROGATE(inString[i + 1])) { - key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10); -+ // key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10); + key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[i + 1]), 10); + ++i; } else { key.AppendInt(inString[i],10); ---- ./netwerk/cache/src/nsDiskCacheMap.h 2006-02-22 04:23:13.000000000 +0100 -+++ ./netwerk/cache/src/nsDiskCacheMap.h.new 2007-01-19 00:16:52.302599000 +0100 +--- content/events/src/nsEventStateManager.cpp.orig 2006-08-06 00:19:17.000000000 +0200 ++++ content/events/src/nsEventStateManager.cpp 2006-10-26 00:11:16.000000000 +0200 +@@ -4301,7 +4301,7 @@ + do_QueryInterface(GetDocumentOuterWindow(mDocument)); + if (newWindow) { + nsIFocusController *newFocusController = +- newFocusController = newWindow->GetRootFocusController(); ++ newWindow->GetRootFocusController(); + nsCOMPtr oldWindow = + do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument)); + if (oldWindow) { +--- netwerk/cache/src/nsDiskCacheMap.h.orig 2006-02-04 23:01:22.000000000 +0100 ++++ netwerk/cache/src/nsDiskCacheMap.h 2006-10-26 00:15:09.000000000 +0200 @@ -168,7 +168,7 @@ // set blockCount @@ -89,25 +88,3 @@ mMetaLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; mMetaLocation |= eLocationInitializedMask; ---- ./mailnews/local/src/nsMailboxService.cpp 2007-01-19 00:53:23.280426000 +0100 -+++ ./mailnews/local/src/nsMailboxService.cpp.new 2007-01-19 00:56:19.625909000 +0100 -@@ -228,7 +228,7 @@ - - // this happens with forward inline of message/rfc822 attachment - // opened in a stand-alone msg window. -- PRInt32 typeIndex = typeIndex = uriString.Find("&type=application/x-message-display"); -+ PRInt32 typeIndex = uriString.Find("&type=application/x-message-display"); - if (typeIndex != kNotFound) - { - uriString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); ---- ./content/events/src/nsEventStateManager.cpp 2006-08-21 19:49:44.000000000 +0200 -+++ ./content/events/src/nsEventStateManager.cpp.new 2007-01-19 00:31:01.921129000 +0100 -@@ -4162,7 +4162,7 @@ - do_QueryInterface(GetDocumentOuterWindow(mDocument)); - if (newWindow) { - nsIFocusController *newFocusController = -- newFocusController = newWindow->GetRootFocusController(); -+ newWindow->GetRootFocusController(); - nsCOMPtr oldWindow = - do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument)); - if (oldWindow) { diff --git a/html-compose.patch b/html-compose.patch index 07c1e02..ae0c2a5 100644 --- a/html-compose.patch +++ b/html-compose.patch @@ -1,11 +1,11 @@ Index: mail/base/content/mailWindowOverlay.js =================================================================== RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.js,v -retrieving revision 1.95.2.7 -diff -u -p -6 -r1.95.2.7 mailWindowOverlay.js ---- mail/base/content/mailWindowOverlay.js 12 Oct 2005 21:31:50 -0000 1.95.2.7 -+++ mail/base/content/mailWindowOverlay.js 29 Dec 2005 19:28:21 -0000 -@@ -903,12 +903,19 @@ function MsgNewMessage(event) +retrieving revision 1.95.2.55 +diff -u -p -6 -r1.95.2.55 mailWindowOverlay.js +--- mail/base/content/mailWindowOverlay.js 12 Feb 2007 21:07:34 -0000 1.95.2.55 ++++ mail/base/content/mailWindowOverlay.js 15 Feb 2007 19:46:05 -0000 +@@ -1064,12 +1064,19 @@ function MsgNewMessage(event) if (event && event.shiftKey) ComposeMessage(msgComposeType.New, msgComposeFormat.OppositeOfDefault, loadedFolder, messageArray); else @@ -28,16 +28,16 @@ diff -u -p -6 -r1.95.2.7 mailWindowOverlay.js Index: mail/base/content/mailWindowOverlay.xul =================================================================== RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.xul,v -retrieving revision 1.116.2.8 -diff -u -p -6 -r1.116.2.8 mailWindowOverlay.xul ---- mail/base/content/mailWindowOverlay.xul 24 Oct 2005 04:01:20 -0000 1.116.2.8 -+++ mail/base/content/mailWindowOverlay.xul 29 Dec 2005 19:34:25 -0000 -@@ -1399,12 +1399,15 @@ +retrieving revision 1.116.2.72 +diff -u -p -6 -r1.116.2.72 mailWindowOverlay.xul +--- mail/base/content/mailWindowOverlay.xul 10 Feb 2007 22:56:29 -0000 1.116.2.72 ++++ mail/base/content/mailWindowOverlay.xul 15 Feb 2007 19:46:55 -0000 +@@ -1511,12 +1511,15 @@ + + command="cmd_reply"/> GetCharacterSet(getter_Copies(charset)); -+ -+ nsCOMPtr prefBranch (do_GetService(NS_PREFSERVICE_CONTRACTID)); -+ if (prefBranch) + ++ nsCOMPtr prefBranch (do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (prefBranch) + prefBranch->GetBoolPref("mailnews.clobber_list_reply", &clobberListReply); + -+ 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)); -+ if (outCString) -+ mMimeConverter->DecodeMimeHeader(outCString, mailReplyTo, charset); ++ mHeaders->ExtractHeader(HEADER_REPLY_TO, PR_FALSE, getter_Copies(outCString)); ++ if (outCString) ++ mMimeConverter->DecodeMimeHeader(outCString, replyTo, charset); + -+ if (clobberListReply) { -+ /* the 'Al fix'. Try to fake up Mail-Reply-To: and Mail-Followup-To: headers if -+ * we don't have any, and if it looks like it came via a mailing list. -+ * -+ * Currently only supports List-Post header. -+ */ -+ -+ mHeaders->ExtractHeader(HEADER_MAIL_FOLLOWUP_TO, PR_TRUE, getter_Copies(outCString)); -+ if (outCString) -+ mMimeConverter->DecodeMimeHeader(outCString, mailFollowupTo, charset); -+ -+ if (mailFollowupTo.IsEmpty()) { -+ nsAutoString mailingList; -+ -+ mHeaders->ExtractHeader(HEADER_LIST_POST, PR_TRUE, getter_Copies(outCString)); -+ if (outCString) ++ mHeaders->ExtractHeader(HEADER_MAIL_REPLY_TO, PR_TRUE, getter_Copies(outCString)); ++ if (outCString) ++ mMimeConverter->DecodeMimeHeader(outCString, mailReplyTo, charset); ++ ++ if (clobberListReply) { ++ /* the 'Al fix'. Try to fake up Mail-Reply-To: and ++ * Mail-Followup-To: headers if we don't have any, and if it looks ++ * like it came via a mailing list. ++ * ++ * Currently only supports List-Post header. ++ */ ++ ++ mHeaders->ExtractHeader(HEADER_MAIL_FOLLOWUP_TO, PR_TRUE, getter_Copies(outCString)); ++ if (outCString) ++ mMimeConverter->DecodeMimeHeader(outCString, mailFollowupTo, charset); ++ ++ if (mailFollowupTo.IsEmpty()) { ++ nsAutoString mailingList; ++ ++ mHeaders->ExtractHeader(HEADER_LIST_POST, PR_TRUE, getter_Copies(outCString)); ++ if (outCString) + { + mMimeConverter->DecodeMimeHeader(outCString, mailingList, charset); -+ /* s//$1/; */ -+ if (StringBeginsWith(mailingList, NS_LITERAL_STRING(""))) { -+ -+ mailingList = Substring(mailingList, 8, mailingList.Length() - 9); -+ } -+ } -+ -+ mailFollowupTo = mailingList; -+ } -+ -+ if (mailReplyTo.IsEmpty()) { -+ nsAutoString from; -+ nsAutoString xReplyTo; -+ -+ mHeaders->ExtractHeader(HEADER_FROM, PR_FALSE, getter_Copies(outCString)); -+ if (outCString) -+ { ++ /* s//$1/; */ ++ if (StringBeginsWith(mailingList, NS_LITERAL_STRING(""))) { ++ ++ mailingList = Substring(mailingList, 8, mailingList.Length() - 9); ++ } ++ } ++ ++ mailFollowupTo = mailingList; ++ } ++ ++ if (mailReplyTo.IsEmpty()) { ++ nsAutoString from; ++ nsAutoString xReplyTo; ++ ++ mHeaders->ExtractHeader(HEADER_FROM, PR_FALSE, getter_Copies(outCString)); ++ if (outCString) + mMimeConverter->DecodeMimeHeader(outCString, from, charset); -+ } -+ -+ mHeaders->ExtractHeader(HEADER_X_REPLY_TO, PR_FALSE, getter_Copies(outCString)); -+ if (outCString) -+ { ++ ++ mHeaders->ExtractHeader(HEADER_X_REPLY_TO, PR_FALSE, getter_Copies(outCString)); ++ if (outCString) + mMimeConverter->DecodeMimeHeader(outCString, xReplyTo, charset); -+ } -+ -+ if (replyTo == mailFollowupTo) { -+ if (!xReplyTo.IsEmpty()) { -+ mailReplyTo = xReplyTo; -+ } -+ else { -+ mailReplyTo = from; -+ } -+ } -+ else { -+ mailReplyTo = replyTo; -+ } -+ } -+ } - ++ ++ if (replyTo == mailFollowupTo) { ++ if (!xReplyTo.IsEmpty()) ++ mailReplyTo = xReplyTo; ++ else ++ mailReplyTo = from; ++ } ++ } ++ } ++ ++ if (type == nsIMsgCompType::ReplyAll) { -@@ -2129,11 +2201,13 @@ NS_IMETHODIMP QuotingOutputStreamListene - { - mMimeConverter->DecodeMimeHeader(outCString, cc, charset); + mHeaders->ExtractHeader(HEADER_TO, PR_TRUE, getter_Copies(outCString)); +@@ -2252,10 +2317,10 @@ NS_IMETHODIMP QuotingOutputStreamListene + compFields->SetBcc(bcc); } -- + - mHeaders->ExtractHeader(HEADER_MAIL_FOLLOWUP_TO, PR_TRUE, getter_Copies(outCString)); - if (outCString) - { - mMimeConverter->DecodeMimeHeader(outCString, mailFollowupTo, charset); -+ + if (!clobberListReply) { // else we've already looked this up earlier + mHeaders->ExtractHeader(HEADER_MAIL_FOLLOWUP_TO, PR_TRUE, getter_Copies(outCString)); + if (outCString) -+ { -+ mMimeConverter->DecodeMimeHeader(outCString, mailFollowupTo, charset); -+ } ++ mMimeConverter->DecodeMimeHeader(outCString, mailFollowupTo, charset); } - + if (! mailFollowupTo.IsEmpty()) -@@ -2174,18 +2248,6 @@ NS_IMETHODIMP QuotingOutputStreamListene +@@ -2296,18 +2361,6 @@ NS_IMETHODIMP QuotingOutputStreamListene } } - + - 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)); - if (outCString) - { - mMimeConverter->DecodeMimeHeader(outCString, mailReplyTo, charset); - } -- +- mHeaders->ExtractHeader(HEADER_NEWSGROUPS, PR_FALSE, getter_Copies(outCString)); if (outCString) { diff --git a/multi-replyto.patch b/multi-replyto.patch deleted file mode 100644 index 3b19703..0000000 --- a/multi-replyto.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: mail/base/content/msgHdrViewOverlay.js -=================================================================== -RCS file: /cvsroot/mozilla/mail/base/content/msgHdrViewOverlay.js,v -retrieving revision 1.56.2.4.2.1 -diff -u -r1.56.2.4.2.1 msgHdrViewOverlay.js ---- mail/base/content/msgHdrViewOverlay.js 6 Jan 2006 00:55:18 -0000 1.56.2.4.2.1 -+++ mail/base/content/msgHdrViewOverlay.js 4 Mar 2006 20:25:42 -0000 -@@ -128,7 +128,7 @@ - var gExpandedHeaderList = [ {name:"subject"}, - {name:"from", outputFunction:OutputEmailAddresses}, - {name:"sender", outputFunction:OutputEmailAddresses}, -- {name:"reply-to", outputFunction:OutputEmailAddresses}, -+ {name:"reply-to", useToggle:true, outputFunction:OutputEmailAddresses}, - {name:"date"}, - {name:"to", useToggle:true, outputFunction:OutputEmailAddresses}, - {name:"cc", useToggle:true, outputFunction:OutputEmailAddresses}, -Index: mail/base/content/msgHdrViewOverlay.xul -=================================================================== -RCS file: /cvsroot/mozilla/mail/base/content/msgHdrViewOverlay.xul,v -retrieving revision 1.14 -diff -u -r1.14 msgHdrViewOverlay.xul ---- mail/base/content/msgHdrViewOverlay.xul 2 Aug 2005 22:31:24 -0000 1.14 -+++ mail/base/content/msgHdrViewOverlay.xul 4 Mar 2006 20:26:37 -0000 -@@ -147,7 +147,7 @@ - - - -- -+ - - - diff --git a/pango-cairo.patch b/pango-cairo.patch deleted file mode 100644 index 2ad339a..0000000 --- a/pango-cairo.patch +++ /dev/null @@ -1,5556 +0,0 @@ -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.363.2.1 -diff -u -p -6 -r3.363.2.1 autoconf.mk.in ---- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 -+++ config/autoconf.mk.in 27 Aug 2005 19:57:29 -0000 -@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@ - MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ - MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ - - MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@ - MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ - MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ -+MOZ_PANGOCAIRO = @MOZ_PANGOCAIRO@ - - MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@ - - MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ - MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@ - -Index: gfx/src/gtk/mozilla-decoder.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v -retrieving revision 1.3 -diff -u -p -6 -r1.3 mozilla-decoder.cpp ---- gfx/src/gtk/mozilla-decoder.cpp 7 Nov 2004 23:59:23 -0000 1.3 -+++ gfx/src/gtk/mozilla-decoder.cpp 27 Aug 2005 19:57:49 -0000 -@@ -37,13 +37,17 @@ - * ***** END LICENSE BLOCK ***** */ - - #define PANGO_ENABLE_BACKEND - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" -+#ifdef MOZ_PANGOCAIRO -+#include -+#else - #include -+#endif - #include - #include - #include - - #include "nsString.h" - #include "nsIPersistentProperties2.h" -@@ -205,13 +209,17 @@ mozilla_decoders_init(void) - } - else { - printf("unknown suffix used for mapping\n"); - } - } - -+#ifdef MOZ_PANGOCAIRO -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), -+#else - pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+#endif - mozilla_find_decoder, - NULL, - NULL); - - initialized = PR_TRUE; - -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1503.2.6 -diff -u -p -6 -r1.1503.2.6 configure.in ---- configure.in 25 Aug 2005 19:05:34 -0000 1.1503.2.6 -+++ configure.in 29 Aug 2005 08:03:32 -0000 -@@ -3707,14 +3707,14 @@ gtk) - ;; - - gtk2) - MOZ_ENABLE_GTK2=1 - MOZ_ENABLE_XREMOTE=1 - MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} -- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' -- TK_LIBS='$(MOZ_GTK2_LIBS)' -+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' -+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' - AC_DEFINE(MOZ_WIDGET_GTK2) - ;; - - xlib) - MOZ_ENABLE_XLIB=1 - if test "$_HAVE_FREETYPE2"; then -@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_ - fi - - if test "$MOZ_ENABLE_XFT" - then - AC_DEFINE(MOZ_ENABLE_XFT) - PKG_CHECK_MODULES(MOZ_XFT, xft) -- PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox) - fi - - AC_SUBST(MOZ_ENABLE_XFT) - AC_SUBST(MOZ_XFT_CFLAGS) - AC_SUBST(MOZ_XFT_LIBS) -+AC_SUBST(MOZ_PANGO_CFLAGS) -+AC_SUBST(MOZ_PANGO_LIBS) - - dnl ======================================================== - dnl = pango font rendering - dnl ======================================================== - MOZ_ARG_ENABLE_BOOL(pango, - [ --enable-pango Enable Pango font rendering support], - MOZ_ENABLE_PANGO=1, - MOZ_ENABLE_PANGO=) - - if test "$MOZ_ENABLE_PANGO" - then - AC_DEFINE(MOZ_ENABLE_PANGO) -- PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0) -+ PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0, -+ [ -+ MOZ_PANGOCAIRO=1 -+ AC_DEFINE(MOZ_PANGOCAIRO) -+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" -+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" -+ ], -+ [:]) - - AC_SUBST(MOZ_ENABLE_PANGO) -+ AC_SUBST(MOZ_PANGOCAIRO) - AC_SUBST(MOZ_PANGO_CFLAGS) - AC_SUBST(MOZ_PANGO_LIBS) - fi - - dnl ======================================================== - dnl = x11 core font support (default and ability to enable depend on toolkit) -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1492.2.17.2.9 -diff -u -r1.1492.2.17.2.9 configure ---- configure 16 Jun 2006 20:04:20 -0000 1.1492.2.17.2.9 -+++ configure 27 Jul 2006 04:47:37 -0000 -@@ -1042,7 +1042,7 @@ - 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 -@@ -1878,57 +1878,6 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext < --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - - case "$build:$target" in - powerpc-apple-darwin8*:i?86-apple-darwin*) -@@ -1942,7 +1891,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1946: checking for $ac_word" >&5 -+echo "configure:1895: 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 -@@ -1977,7 +1926,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1981: checking for $ac_word" >&5 -+echo "configure:1930: 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 -@@ -2012,7 +1961,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2016: checking for $ac_word" >&5 -+echo "configure:1965: 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 -@@ -2053,7 +2002,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2057: checking for $ac_word" >&5 -+echo "configure:2006: 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 -@@ -2088,7 +2037,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2092: checking for $ac_word" >&5 -+echo "configure:2041: 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 -@@ -2123,7 +2072,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2127: checking for $ac_word" >&5 -+echo "configure:2076: 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 -@@ -2161,7 +2110,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2165: checking for $ac_word" >&5 -+echo "configure:2114: 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 -@@ -2191,7 +2140,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2195: checking for $ac_word" >&5 -+echo "configure:2144: 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 -@@ -2242,7 +2191,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2246: checking for $ac_word" >&5 -+echo "configure:2195: 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 -@@ -2274,7 +2223,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2278: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2227: 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. -@@ -2285,12 +2234,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2289 "configure" -+#line 2238 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2243: \"$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 -@@ -2316,12 +2265,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2320: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2269: 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:2325: checking whether we are using GNU C" >&5 -+echo "configure:2274: 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 -@@ -2330,7 +2279,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2334: \"$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:2283: \"$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 -@@ -2349,7 +2298,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2353: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2302: 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 -@@ -2385,7 +2334,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2389: checking for $ac_word" >&5 -+echo "configure:2338: 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 -@@ -2417,7 +2366,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2421: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:2370: 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. -@@ -2428,12 +2377,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2432 "configure" -+#line 2381 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2386: \"$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 -@@ -2459,12 +2408,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2463: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2412: 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:2468: checking whether we are using GNU C++" >&5 -+echo "configure:2417: 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 -@@ -2473,7 +2422,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2477: \"$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:2426: \"$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 -@@ -2492,7 +2441,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:2496: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:2445: 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 -@@ -2523,61 +2472,10 @@ - fi - fi - --for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat > conftest.$ac_ext < --$ac_declaration --int main() { --exit (42); --; return 0; } --EOF --if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- continue --fi --rm -f conftest* -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* --done --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- -- - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2581: checking for $ac_word" >&5 -+echo "configure:2479: 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 -@@ -2609,7 +2507,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2613: checking for $ac_word" >&5 -+echo "configure:2511: 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 -@@ -2650,7 +2548,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2654: checking for $ac_word" >&5 -+echo "configure:2552: 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 -@@ -2685,7 +2583,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2689: checking for $ac_word" >&5 -+echo "configure:2587: 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 -@@ -2720,7 +2618,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2724: checking for $ac_word" >&5 -+echo "configure:2622: 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 -@@ -2755,7 +2653,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2759: checking for $ac_word" >&5 -+echo "configure:2657: 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 -@@ -2844,7 +2742,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2848: checking for $ac_word" >&5 -+echo "configure:2746: 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 -@@ -2886,14 +2784,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2911,14 +2809,14 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - int main() { - unsigned *test = new unsigned(42); - ; return 0; } - EOF --if { (eval echo configure:2922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -2974,7 +2872,7 @@ - _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` - # Add flags if necessary - echo $ac_n "checking for midl flags""... $ac_c" 1>&6 --echo "configure:2978: checking for midl flags" >&5 -+echo "configure:2876: 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 -@@ -2996,9 +2894,9 @@ - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` - _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` - echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 --echo "configure:3000: checking for w32api version >= $W32API_VERSION" >&5 -+echo "configure:2898: checking for w32api version >= $W32API_VERSION" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -3010,7 +2908,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - res=yes - else -@@ -3026,7 +2924,7 @@ - fi - # Check windres version - echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 --echo "configure:3030: checking for windres version >= $WINDRES_VERSION" >&5 -+echo "configure:2928: 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 }'` -@@ -3053,7 +2951,7 @@ - SKIP_COMPILER_CHECKS=1 - SKIP_LIBRARY_CHECKS=1 - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3057: checking how to run the C preprocessor" >&5 -+echo "configure:2955: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3068,13 +2966,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2976: \"$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 - : -@@ -3085,13 +2983,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2993: \"$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 - : -@@ -3102,13 +3000,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3010: \"$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 - : -@@ -3136,17 +3034,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3140: checking for $ac_hdr" >&5 -+echo "configure:3038: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3177,10 +3075,10 @@ - if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then - if test "x$CC" != xcc; then - echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 --echo "configure:3181: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:3079: 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:3184: checking whether cc understands -c and -o together" >&5 -+echo "configure:3082: 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]/_/'`" -@@ -3192,16 +3090,16 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' --if { (eval echo configure:3196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:3094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3095: \"$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:3202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3100: \"$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:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:3102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:3103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; - then - # cc works too. - : -@@ -3237,7 +3135,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:3241: checking how to run the C preprocessor" >&5 -+echo "configure:3139: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3252,13 +3150,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3160: \"$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 - : -@@ -3269,13 +3167,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3177: \"$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 - : -@@ -3286,13 +3184,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3194: \"$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 - : -@@ -3317,7 +3215,7 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:3321: checking how to run the C++ preprocessor" >&5 -+echo "configure:3219: 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 -@@ -3330,12 +3228,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3237: \"$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 - : -@@ -3382,7 +3280,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3386: checking for a BSD compatible install" >&5 -+echo "configure:3284: 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 -@@ -3435,7 +3333,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3439: checking whether ln -s works" >&5 -+echo "configure:3337: 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 -@@ -3460,7 +3358,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3464: checking for $ac_word" >&5 -+echo "configure:3362: 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 -@@ -3500,7 +3398,7 @@ - fi - - echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 --echo "configure:3504: checking for minimum required perl version >= $PERL_VERSION" >&5 -+echo "configure:3402: 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 -@@ -3510,7 +3408,7 @@ - fi - - echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 --echo "configure:3514: checking for full perl installation" >&5 -+echo "configure:3412: 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 -@@ -3523,7 +3421,7 @@ - # Extract the first word of "doxygen", so it can be a program name with args. - set dummy doxygen; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3527: checking for $ac_word" >&5 -+echo "configure:3425: 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 -@@ -3559,7 +3457,7 @@ - # Extract the first word of "whoami", so it can be a program name with args. - set dummy whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3563: checking for $ac_word" >&5 -+echo "configure:3461: 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 -@@ -3595,7 +3493,7 @@ - # Extract the first word of "autoconf", so it can be a program name with args. - set dummy autoconf; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3599: checking for $ac_word" >&5 -+echo "configure:3497: 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 -@@ -3631,7 +3529,7 @@ - # Extract the first word of "unzip", so it can be a program name with args. - set dummy unzip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3635: checking for $ac_word" >&5 -+echo "configure:3533: 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 -@@ -3669,7 +3567,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3673: checking for $ac_word" >&5 -+echo "configure:3571: 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 -@@ -3710,7 +3608,7 @@ - # Extract the first word of "makedepend", so it can be a program name with args. - set dummy makedepend; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3714: checking for $ac_word" >&5 -+echo "configure:3612: 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 -@@ -3745,7 +3643,7 @@ - # Extract the first word of "xargs", so it can be a program name with args. - set dummy xargs; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3749: checking for $ac_word" >&5 -+echo "configure:3647: 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 -@@ -3808,7 +3706,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3812: checking for $ac_word" >&5 -+echo "configure:3710: 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 -@@ -3858,7 +3756,7 @@ - # Extract the first word of "sdp", so it can be a program name with args. - set dummy sdp; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3862: checking for $ac_word" >&5 -+echo "configure:3760: 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 -@@ -3954,7 +3852,7 @@ - fi - - echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 --echo "configure:3958: checking for valid compiler/Mac OS X SDK combination" >&5 -+echo "configure:3856: 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' -@@ -3963,7 +3861,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - int main() { return 0; } -@@ -3971,7 +3869,7 @@ - result=yes - ; return 0; } - EOF --if { (eval echo configure:3975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result=no - else -@@ -3996,7 +3894,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4000: checking for $ac_word" >&5 -+echo "configure:3898: 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 -@@ -4039,7 +3937,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4043: checking for $ac_word" >&5 -+echo "configure:3941: 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 -@@ -4107,7 +4005,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:4111: checking for X" >&5 -+echo "configure:4009: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -4169,12 +4067,12 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4076: \"$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* -@@ -4243,14 +4141,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4152: \"$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. -@@ -4356,17 +4254,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:4360: checking whether -R must be followed by a space" >&5 -+echo "configure:4258: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -4382,14 +4280,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -4421,7 +4319,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:4425: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:4323: 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 -@@ -4429,7 +4327,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4345: \"$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 -@@ -4465,7 +4363,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:4469: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:4367: 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 -@@ -4473,7 +4371,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4389: \"$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 -@@ -4516,12 +4414,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:4520: checking for gethostbyname" >&5 -+echo "configure:4418: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4449: \"$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 -@@ -4568,7 +4466,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:4572: checking for gethostbyname in -lnsl" >&5 -+echo "configure:4470: 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 -@@ -4576,7 +4474,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4492: \"$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 -@@ -4620,12 +4518,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:4624: checking for connect" >&5 -+echo "configure:4522: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4553: \"$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 -@@ -4672,7 +4570,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:4676: checking for connect in -lsocket" >&5 -+echo "configure:4574: 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 -@@ -4680,7 +4578,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure: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 -@@ -4718,12 +4616,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:4722: checking for remove" >&5 -+echo "configure:4620: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4651: \"$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 -@@ -4770,7 +4668,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:4774: checking for remove in -lposix" >&5 -+echo "configure:4672: 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 -@@ -4778,7 +4676,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4694: \"$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 -@@ -4816,12 +4714,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:4820: checking for shmat" >&5 -+echo "configure:4718: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4749: \"$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 -@@ -4868,7 +4766,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:4872: checking for shmat in -lipc" >&5 -+echo "configure:4770: 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 -@@ -4876,7 +4774,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4792: \"$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 -@@ -4923,7 +4821,7 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:4927: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:4825: 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 -@@ -4931,7 +4829,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4847: \"$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 -@@ -5373,7 +5271,7 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:5377: checking whether ld has archive extraction flags" >&5 -+echo "configure:5275: 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 -@@ -5390,14 +5288,14 @@ - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5299: \"$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 -@@ -5432,17 +5330,17 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:5436: checking for 64-bit OS" >&5 -+echo "configure:5334: checking for 64-bit OS" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -5601,9 +5499,9 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 --echo "configure:5605: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 -+echo "configure:5503: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -5650,17 +5548,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5654: checking for $ac_hdr" >&5 -+echo "configure:5552: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5562: \"$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* -@@ -5702,7 +5600,7 @@ - LIBS="$LIBS -lbe" - if test "$COMPILE_ENVIRONMENT"; then - echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 --echo "configure:5706: checking for main in -lbind" >&5 -+echo "configure:5604: 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 -@@ -5710,14 +5608,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5619: \"$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 -@@ -5738,7 +5636,7 @@ - fi - - echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 --echo "configure:5742: checking for main in -lzeta" >&5 -+echo "configure:5640: 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 -@@ -5746,14 +5644,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lzeta $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5655: \"$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 -@@ -5814,18 +5712,18 @@ - MACOSX=1 - - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:5818: checking for -dead_strip option to ld" >&5 -+echo "configure:5716: checking for -dead_strip option to ld" >&5 - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-dead_strip" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -6664,7 +6562,7 @@ - CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 --echo "configure:6668: checking for Forte compiler version >= WS6U2" >&5 -+echo "configure:6566: 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. -@@ -6674,7 +6572,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -6812,7 +6710,7 @@ - ;; - *-darwin*) - echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 --echo "configure:6816: checking for -exported_symbols_list option to ld" >&5 -+echo "configure:6714: checking for -exported_symbols_list option to ld" >&5 - if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6852,12 +6750,12 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:6856: checking for ANSI C header files" >&5 -+echo "configure:6754: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -6865,7 +6763,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6767: \"$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* -@@ -6882,7 +6780,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -6900,7 +6798,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -6921,7 +6819,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -6932,7 +6830,7 @@ - exit (0); } - - EOF --if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -6956,12 +6854,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:6960: checking for working const" >&5 -+echo "configure:6858: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -7031,12 +6929,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:7035: checking for mode_t" >&5 -+echo "configure:6933: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -7064,12 +6962,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7068: checking for off_t" >&5 -+echo "configure:6966: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -7097,12 +6995,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7101: checking for pid_t" >&5 -+echo "configure:6999: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -7130,12 +7028,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7134: checking for size_t" >&5 -+echo "configure:7032: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -7163,12 +7061,12 @@ - fi - - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:7167: checking for st_blksize in struct stat" >&5 -+echo "configure:7065: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7176,7 +7074,7 @@ - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:7180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -7197,12 +7095,12 @@ - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:7201: checking for siginfo_t" >&5 -+echo "configure:7099: 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 < -@@ -7210,7 +7108,7 @@ - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -7244,12 +7142,12 @@ - fi - - echo $ac_n "checking for int16_t""... $ac_c" 1>&6 --echo "configure:7248: checking for int16_t" >&5 -+echo "configure:7146: checking for int16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7257,7 +7155,7 @@ - int16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int16_t=true - else -@@ -7279,12 +7177,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:7283: checking for int32_t" >&5 -+echo "configure:7181: checking for int32_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7292,7 +7190,7 @@ - int32_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int32_t=true - else -@@ -7314,12 +7212,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64_t""... $ac_c" 1>&6 --echo "configure:7318: checking for int64_t" >&5 -+echo "configure:7216: checking for int64_t" >&5 - if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7327,7 +7225,7 @@ - int64_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64_t=true - else -@@ -7349,12 +7247,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for int64""... $ac_c" 1>&6 --echo "configure:7353: checking for int64" >&5 -+echo "configure:7251: checking for int64" >&5 - if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7362,7 +7260,7 @@ - int64 foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_int64=true - else -@@ -7384,12 +7282,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:7388: checking for uint" >&5 -+echo "configure:7286: checking for uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7397,7 +7295,7 @@ - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -7419,12 +7317,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:7423: checking for uint_t" >&5 -+echo "configure:7321: checking for uint_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7432,7 +7330,7 @@ - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -7454,12 +7352,12 @@ - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7458: checking for uint16_t" >&5 -+echo "configure:7356: checking for uint16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7467,7 +7365,7 @@ - uint16_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint16_t=true - else -@@ -7498,12 +7396,12 @@ - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:7502: checking for uname.domainname" >&5 -+echo "configure:7400: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -7511,7 +7409,7 @@ - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:7515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -7535,12 +7433,12 @@ - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:7539: checking for uname.__domainname" >&5 -+echo "configure:7437: checking for uname.__domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -7548,7 +7446,7 @@ - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:7552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -7581,7 +7479,7 @@ - - - echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 --echo "configure:7585: checking for usable wchar_t (2 bytes, unsigned)" >&5 -+echo "configure:7483: checking for usable wchar_t (2 bytes, unsigned)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7589,14 +7487,14 @@ - ac_cv_have_usable_wchar="maybe" - else - cat > conftest.$ac_ext < - int main () { - return (sizeof(wchar_t) != 2) || - (wchar_t)-1 < (wchar_t) 0 ; } - EOF --if { (eval echo configure:7600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_have_usable_wchar="yes" - else -@@ -7631,7 +7529,7 @@ - CXXFLAGS="$CXXFLAGS -fshort-wchar" - - echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 --echo "configure:7635: checking for compiler -fshort-wchar option" >&5 -+echo "configure:7533: checking for compiler -fshort-wchar option" >&5 - if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7639,14 +7537,17 @@ - ac_cv_have_usable_wchar_option="maybe" - else - cat > conftest.$ac_ext < - int main () { - return (sizeof(wchar_t) != 2) || - (wchar_t)-1 < (wchar_t) 0 ; } - EOF --if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_have_usable_wchar_option="yes" - else -@@ -7682,7 +7583,7 @@ - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:7686: checking for visibility(hidden) attribute" >&5 -+echo "configure:7587: 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 -@@ -7706,7 +7607,7 @@ - EOF - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:7710: checking for visibility pragma support" >&5 -+echo "configure:7611: 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 -@@ -7748,12 +7649,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:7752: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:7653: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include <$ac_hdr> -@@ -7761,7 +7662,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:7765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -7786,7 +7687,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:7790: checking for opendir in -ldir" >&5 -+echo "configure:7691: 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 -@@ -7794,7 +7695,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7710: \"$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 -@@ -7827,7 +7728,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:7831: checking for opendir in -lx" >&5 -+echo "configure:7732: 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 -@@ -7835,7 +7736,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7751: \"$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 -@@ -7878,17 +7779,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7882: checking for $ac_hdr" >&5 -+echo "configure:7783: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7793: \"$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* -@@ -7918,17 +7819,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7922: checking for $ac_hdr" >&5 -+echo "configure:7823: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7833: \"$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* -@@ -7958,17 +7859,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7962: checking for $ac_hdr" >&5 -+echo "configure:7863: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7873: \"$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* -@@ -7998,17 +7899,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8002: checking for $ac_hdr" >&5 -+echo "configure:7903: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7913: \"$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* -@@ -8038,17 +7939,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8042: checking for $ac_hdr" >&5 -+echo "configure:7943: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7953: \"$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* -@@ -8079,17 +7980,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8083: checking for $ac_hdr" >&5 -+echo "configure:7984: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7994: \"$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* -@@ -8120,17 +8021,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8124: checking for $ac_hdr" >&5 -+echo "configure:8025: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8035: \"$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* -@@ -8167,17 +8068,17 @@ - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:8171: checking for new" >&5 -+echo "configure:8072: checking for new" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8082: \"$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* -@@ -8218,17 +8119,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:8222: checking for $ac_hdr" >&5 -+echo "configure:8123: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8133: \"$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* -@@ -8262,7 +8163,7 @@ - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:8266: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:8167: 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 -@@ -8270,7 +8171,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8186: \"$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 -@@ -8311,7 +8212,7 @@ - ;; - esac - echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 --echo "configure:8315: checking for atan in -lm" >&5 -+echo "configure:8216: 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 -@@ -8319,7 +8220,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8235: \"$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 -@@ -8364,7 +8265,7 @@ - ;; - *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:8368: checking for dlopen in -ldl" >&5 -+echo "configure:8269: 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 -@@ -8372,7 +8273,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8288: \"$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 -@@ -8400,17 +8301,17 @@ - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:8404: checking for dlfcn.h" >&5 -+echo "configure:8305: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8315: \"$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* -@@ -8446,7 +8347,7 @@ - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:8450: checking for demangle in -lC_r" >&5 -+echo "configure:8351: 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 -@@ -8454,7 +8355,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC_r $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8370: \"$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 -@@ -8495,7 +8396,7 @@ - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:8499: checking for demangle in -lC" >&5 -+echo "configure:8400: 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 -@@ -8503,7 +8404,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lC $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8419: \"$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 -@@ -8545,7 +8446,7 @@ - esac - fi - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:8549: checking for socket in -lsocket" >&5 -+echo "configure:8450: 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 -@@ -8553,7 +8454,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8469: \"$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 -@@ -8609,7 +8510,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 --echo "configure:8613: checking for XDrawLines in -lX11" >&5 -+echo "configure:8514: 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 -@@ -8617,7 +8518,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8533: \"$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 -@@ -8650,7 +8551,7 @@ - fi - - echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:8654: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:8555: 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 -@@ -8658,7 +8559,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8574: \"$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 -@@ -8693,7 +8594,7 @@ - - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:8697: checking for XtFree in -lXt" >&5 -+echo "configure:8598: 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 -@@ -8701,7 +8602,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8617: \"$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 -@@ -8733,7 +8634,7 @@ - - unset ac_cv_lib_Xt_XtFree - echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 --echo "configure:8737: checking for IceFlush in -lICE" >&5 -+echo "configure:8638: 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 -@@ -8741,7 +8642,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lICE $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8657: \"$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 -@@ -8773,7 +8674,7 @@ - fi - - echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 --echo "configure:8777: checking for SmcCloseConnection in -lSM" >&5 -+echo "configure:8678: 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 -@@ -8781,7 +8682,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lSM $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8697: \"$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 -@@ -8813,7 +8714,7 @@ - fi - - echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 --echo "configure:8817: checking for XtFree in -lXt" >&5 -+echo "configure:8718: 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 -@@ -8821,7 +8722,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8737: \"$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 -@@ -8866,7 +8767,7 @@ - esac - - echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 --echo "configure:8870: checking for XineramaIsActive in -lXinerama" >&5 -+echo "configure:8771: 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 -@@ -8874,7 +8775,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8790: \"$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 -@@ -8907,17 +8808,17 @@ - - ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 --echo "configure:8911: checking for X11/extensions/Xinerama.h" >&5 -+echo "configure:8812: checking for X11/extensions/Xinerama.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8822: \"$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* -@@ -8940,7 +8841,7 @@ - - - echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 --echo "configure:8944: checking for XShmCreateImage in -lXext" >&5 -+echo "configure:8845: 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 -@@ -8948,7 +8849,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8981,17 +8882,17 @@ - - ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 --echo "configure:8985: checking for X11/extensions/XShm.h" >&5 -+echo "configure:8886: checking for X11/extensions/XShm.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8896: \"$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* -@@ -9021,7 +8922,7 @@ - fi - - echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 --echo "configure:9025: checking for XieFloGeometry in -lXIE" >&5 -+echo "configure:8926: 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 -@@ -9029,7 +8930,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8945: \"$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 -@@ -9062,17 +8963,17 @@ - - ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 --echo "configure:9066: checking for X11/extensions/XIElib.h" >&5 -+echo "configure:8967: checking for X11/extensions/XIElib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8977: \"$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* -@@ -9146,7 +9047,7 @@ - # Extract the first word of "freetype-config", so it can be a program name with args. - set dummy freetype-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:9150: checking for $ac_word" >&5 -+echo "configure:9051: 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 -@@ -9182,7 +9083,7 @@ - - min_ft_version=6.1.0 - echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 --echo "configure:9186: checking for FreeType - version >= $min_ft_version" >&5 -+echo "configure:9087: checking for FreeType - version >= $min_ft_version" >&5 - no_ft="" - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes -@@ -9230,7 +9131,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -9256,7 +9157,7 @@ - } - - EOF --if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -9308,7 +9209,7 @@ - - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:9312: checking for pthread_create in -lpthreads" >&5 -+echo "configure:9213: checking for pthread_create in -lpthreads" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9330,7 +9231,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:9334: checking for pthread_create in -lpthread" >&5 -+echo "configure:9235: checking for pthread_create in -lpthread" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9352,7 +9253,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:9356: checking for pthread_create in -lc_r" >&5 -+echo "configure:9257: checking for pthread_create in -lc_r" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9374,7 +9275,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:9378: checking for pthread_create in -lc" >&5 -+echo "configure:9279: checking for pthread_create in -lc" >&5 - echo " - #include - void *foo(void *v) { int a = 1; } -@@ -9430,7 +9331,7 @@ - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:9434: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:9335: 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 -@@ -9453,7 +9354,7 @@ - ac_cv_have_dash_pthreads=no - if test "$ac_cv_have_dash_pthread" = "no"; then - echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 --echo "configure:9457: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:9358: 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 -@@ -9575,7 +9476,7 @@ - - - echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 --echo "configure:9579: checking whether mmap() sees write()s" >&5 -+echo "configure:9480: checking whether mmap() sees write()s" >&5 - - - mmap_test_prog=' -@@ -9614,11 +9515,11 @@ - result="yes" - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -9643,13 +9544,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:9647: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:9548: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext < - Autoconf TIOCGETP -@@ -9667,7 +9568,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext < - Autoconf TCGETA -@@ -9689,7 +9590,7 @@ - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:9693: checking for 8-bit clean memcmp" >&5 -+echo "configure:9594: 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 -@@ -9697,7 +9598,7 @@ - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9612: \"$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 -@@ -9727,12 +9628,12 @@ - for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9731: checking for $ac_func" >&5 -+echo "configure:9632: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9660: \"$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 -@@ -9782,12 +9683,12 @@ - for ac_func in flockfile getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9786: checking for $ac_func" >&5 -+echo "configure:9687: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9715: \"$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 -@@ -9839,12 +9740,12 @@ - for ac_func in localtime_r strtok_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9843: checking for $ac_func" >&5 -+echo "configure:9744: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9772: \"$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 -@@ -9903,19 +9804,19 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:9907: checking for wcrtomb" >&5 -+echo "configure:9808: checking for wcrtomb" >&5 - if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - mbstate_t ps={0};wcrtomb(0,'f',&ps); - ; return 0; } - EOF --if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -9935,19 +9836,19 @@ - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:9939: checking for mbrtowc" >&5 -+echo "configure:9840: checking for mbrtowc" >&5 - if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - mbstate_t ps={0};mbrtowc(0,0,0,&ps); - ; return 0; } - EOF --if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -9976,12 +9877,12 @@ - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:9980: checking for res_ninit()" >&5 -+echo "configure:9881: checking for res_ninit()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9898: \"$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 -@@ -10023,12 +9924,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:10027: checking for gnu_get_libc_version()" >&5 -+echo "configure:9928: checking for gnu_get_libc_version()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9944: \"$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 -@@ -10068,7 +9969,7 @@ - *) - - echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 --echo "configure:10072: checking for iconv in -lc" >&5 -+echo "configure:9973: 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 -@@ -10076,7 +9977,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9995: \"$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 -@@ -10109,7 +10010,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:10113: checking for iconv in -liconv" >&5 -+echo "configure:10014: 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 -@@ -10117,7 +10018,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10036: \"$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 -@@ -10150,7 +10051,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 --echo "configure:10154: checking for libiconv in -liconv" >&5 -+echo "configure:10055: 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 -@@ -10158,7 +10059,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10077: \"$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 -@@ -10199,12 +10100,12 @@ - _SAVE_LIBS=$LIBS - LIBS="$LIBS $_ICONV_LIBS" - echo $ac_n "checking for iconv()""... $ac_c" 1>&6 --echo "configure:10203: checking for iconv()" >&5 -+echo "configure:10104: 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 < -@@ -10218,7 +10119,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_iconv=yes - else -@@ -10242,12 +10143,12 @@ - LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" - LIBICONV="$_ICONV_LIBS" - echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 --echo "configure:10246: checking for iconv() with const input" >&5 -+echo "configure:10147: 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 < -@@ -10262,7 +10163,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:10266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_const_iconv=yes - else -@@ -10291,19 +10192,19 @@ - - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 --echo "configure:10295: checking for nl_langinfo and CODESET" >&5 -+echo "configure:10196: checking for nl_langinfo and CODESET" >&5 - if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - char* cs = nl_langinfo(CODESET); - ; return 0; } - EOF --if { (eval echo configure:10307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes - else -@@ -10335,7 +10236,7 @@ - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:10339: checking for an implementation of va_copy()" >&5 -+echo "configure:10240: 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 -@@ -10345,7 +10246,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10359,7 +10260,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10264: \"$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 -@@ -10376,7 +10277,7 @@ - - echo "$ac_t""$ac_cv_va_copy" 1>&6 - echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 --echo "configure:10380: checking for an implementation of __va_copy()" >&5 -+echo "configure:10281: 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 -@@ -10386,7 +10287,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10400,7 +10301,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10305: \"$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 -@@ -10417,7 +10318,7 @@ - - echo "$ac_t""$ac_cv___va_copy" 1>&6 - echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 --echo "configure:10421: checking whether va_lists can be copied by value" >&5 -+echo "configure:10322: 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 -@@ -10427,7 +10328,7 @@ - - else - cat > conftest.$ac_ext < -@@ -10441,7 +10342,7 @@ - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:10445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10346: \"$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 -@@ -10540,7 +10441,7 @@ - if test "$GNU_CXX"; then - - echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 --echo "configure:10544: checking for C++ exceptions flag" >&5 -+echo "configure:10445: 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 -@@ -10575,12 +10476,12 @@ - HAVE_GCC3_ABI= - if test "$GNU_CC"; then - echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 --echo "configure:10579: checking for gcc 3.0 ABI" >&5 -+echo "configure:10480: checking for gcc 3.0 ABI" >&5 - if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_three_abi="yes" - else -@@ -10617,12 +10518,12 @@ - - - echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 --echo "configure:10621: checking for C++ \"explicit\" keyword" >&5 -+echo "configure:10522: checking for C++ \"explicit\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_explicit=yes - else -@@ -10653,12 +10554,12 @@ - fi - - echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 --echo "configure:10657: checking for C++ \"typename\" keyword" >&5 -+echo "configure:10558: checking for C++ \"typename\" keyword" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_typename=yes - else -@@ -10698,12 +10599,12 @@ - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:10702: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:10603: checking for modern C++ template specialization syntax support" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < struct X { int a; }; - class Y {}; -@@ -10713,7 +10614,7 @@ - X y_x; - ; return 0; } - EOF --if { (eval echo configure:10717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -10735,12 +10636,12 @@ - - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:10739: checking whether partial template specialization works" >&5 -+echo "configure:10640: checking whether partial template specialization works" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < class Foo {}; - template class Foo {}; -@@ -10748,7 +10649,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:10752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -10769,12 +10670,12 @@ - fi - - echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 --echo "configure:10773: checking whether operators must be re-defined for templates derived from templates" >&5 -+echo "configure:10674: checking whether operators must be re-defined for templates derived from templates" >&5 - if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < class Base { }; - template -@@ -10786,7 +10687,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:10790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_derived_template_operators=no - else -@@ -10808,12 +10709,12 @@ - - - echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 --echo "configure:10812: checking whether we need to cast a derived template to pass as its base class" >&5 -+echo "configure:10713: checking whether we need to cast a derived template to pass as its base class" >&5 - if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < class Base { }; - template class Derived : public Base { }; -@@ -10822,7 +10723,7 @@ - Derived bar; return foo(bar); - ; return 0; } - EOF --if { (eval echo configure:10826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_need_cpp_template_cast_to_base=no - else -@@ -10843,12 +10744,12 @@ - fi - - echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 --echo "configure:10847: checking whether the compiler can resolve const ambiguities for templates" >&5 -+echo "configure:10748: checking whether the compiler can resolve const ambiguities for templates" >&5 - if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < class ptrClass { -@@ -10869,7 +10770,7 @@ - a(&i); - ; return 0; } - EOF --if { (eval echo configure:10873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_can_resolve_const_ambiguity=yes - else -@@ -10891,12 +10792,12 @@ - - - echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 --echo "configure:10895: checking whether the C++ \"using\" keyword can change access" >&5 -+echo "configure:10796: checking whether the C++ \"using\" keyword can change access" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_access_changing_using2=no - else -@@ -10943,12 +10844,12 @@ - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:10947: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:10848: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -10985,19 +10886,19 @@ - fi - - echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 --echo "configure:10989: checking for \"std::\" namespace" >&5 -+echo "configure:10890: checking for \"std::\" namespace" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - return std::min(0, 1); - ; return 0; } - EOF --if { (eval echo configure:11001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_namespace_std=yes - else -@@ -11018,12 +10919,12 @@ - fi - - echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 --echo "configure:11022: checking whether standard template operator!=() is ambiguous" >&5 -+echo "configure:10923: checking whether standard template operator!=() is ambiguous" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - struct T1 {}; -@@ -11033,7 +10934,7 @@ - T1 a,b; return a != b; - ; return 0; } - EOF --if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_unambiguous_std_notequal=unambiguous - else -@@ -11055,12 +10956,12 @@ - - - echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 --echo "configure:11059: checking for C++ reinterpret_cast" >&5 -+echo "configure:10960: checking for C++ reinterpret_cast" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <(z); - ; return 0; } - EOF --if { (eval echo configure:11072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_reinterpret_cast=yes - else -@@ -11089,7 +10990,7 @@ - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11093: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:10994: 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 -@@ -11097,8 +10998,11 @@ - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <(suby)))); - } - EOF --if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11021: \"$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 -@@ -11137,19 +11041,19 @@ - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11141: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11045: checking whether C++ requires implementation of unused virtual methods" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11057: \"$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 -@@ -11172,12 +11076,12 @@ - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11176: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11080: checking for trouble comparing to zero near std::operator!=()" >&5 - if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - template class Foo {}; -@@ -11188,7 +11092,7 @@ - Foo f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -11220,19 +11124,19 @@ - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:11224: checking for LC_MESSAGES" >&5 -+echo "configure:11128: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int category = LC_MESSAGES; - ; return 0; } - EOF --if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -11313,7 +11217,7 @@ - # Extract the first word of "nspr-config", so it can be a program name with args. - set dummy nspr-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:11317: checking for $ac_word" >&5 -+echo "configure:11221: 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 -@@ -11348,7 +11252,7 @@ - - min_nspr_version=4.0.0 - echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 --echo "configure:11352: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 -+echo "configure:11256: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" = "no"; then -@@ -11418,7 +11322,7 @@ - SYSTEM_JPEG= - else - echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 --echo "configure:11422: checking for jpeg_destroy_compress in -ljpeg" >&5 -+echo "configure:11326: 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 -@@ -11426,7 +11330,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ljpeg $JPEG_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11345: \"$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 -@@ -11466,7 +11370,7 @@ - SYSTEM_JPEG= - else - cat > conftest.$ac_ext < - #include -@@ -11480,7 +11384,7 @@ - } - - EOF --if { (eval echo configure:11484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_JPEG=1 - else -@@ -11521,7 +11425,7 @@ - SYSTEM_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:11525: checking for gzread in -lz" >&5 -+echo "configure:11429: 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 -@@ -11529,7 +11433,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lz $ZLIB_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11448: \"$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 -@@ -11568,7 +11472,7 @@ - SYSTEM_ZLIB= - else - cat > conftest.$ac_ext < -@@ -11589,7 +11493,7 @@ - } - - EOF --if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_ZLIB=1 - else -@@ -11632,7 +11536,7 @@ - SYSTEM_PNG= - else - echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:11636: checking for png_get_valid in -lpng" >&5 -+echo "configure:11540: 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 -@@ -11640,7 +11544,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $PNG_LIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11559: \"$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 -@@ -11679,7 +11583,7 @@ - SYSTEM_PNG= - else - cat > conftest.$ac_ext < - #include -@@ -11693,7 +11597,7 @@ - } - - EOF --if { (eval echo configure:11697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - SYSTEM_PNG=1 - else -@@ -11812,8 +11716,8 @@ - MOZ_ENABLE_GTK2=1 - MOZ_ENABLE_XREMOTE=1 - MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-} -- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' -- TK_LIBS='$(MOZ_GTK2_LIBS)' -+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)' -+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)' - cat >> confdefs.h <<\EOF - #define MOZ_WIDGET_GTK2 1 - EOF -@@ -11962,7 +11866,7 @@ - # Extract the first word of "gtk-config", so it can be a program name with args. - set dummy gtk-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:11966: checking for $ac_word" >&5 -+echo "configure:11870: 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 -@@ -11997,7 +11901,7 @@ - - min_gtk_version=$GTK_VERSION - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 --echo "configure:12001: checking for GTK - version >= $min_gtk_version" >&5 -+echo "configure:11905: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes -@@ -12020,7 +11924,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -12098,7 +12002,7 @@ - } - - EOF --if { (eval echo configure:12102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:12006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -12133,7 +12037,7 @@ - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat > conftest.$ac_ext < -@@ -12143,7 +12047,7 @@ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:12147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12051: \"$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" -@@ -12195,7 +12099,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12199: checking for $ac_word" >&5 -+echo "configure:12103: 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 -@@ -12239,19 +12143,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 --echo "configure:12243: checking for gtk+-2.0 >= 1.3.7" >&5 -+echo "configure:12147: 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:12250: checking MOZ_GTK2_CFLAGS" >&5 -+echo "configure:12154: 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:12255: checking MOZ_GTK2_LIBS" >&5 -+echo "configure:12159: 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\"`" -@@ -12316,7 +12220,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12320: checking for $ac_word" >&5 -+echo "configure:12224: 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 -@@ -12368,7 +12272,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 --echo "configure:12372: checking for main in -lqt" >&5 -+echo "configure:12276: 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 -@@ -12376,14 +12280,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lqt $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12291: \"$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 -@@ -12402,7 +12306,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 --echo "configure:12406: checking for main in -lqt-mt" >&5 -+echo "configure:12310: 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 -@@ -12410,14 +12314,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-lqt-mt $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12325: \"$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 -@@ -12453,9 +12357,9 @@ - LIBS="$LIBS $QT_LIBS" - - echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 --echo "configure:12457: checking Qt - version >= $QT_VERSION" >&5 -+echo "configure:12361: checking Qt - version >= $QT_VERSION" >&5 - cat > conftest.$ac_ext < - int main() { -@@ -12466,7 +12370,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:12470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -12982,7 +12886,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12986: checking for $ac_word" >&5 -+echo "configure:12890: 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 -@@ -13026,19 +12930,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for xft""... $ac_c" 1>&6 --echo "configure:13030: checking for xft" >&5 -+echo "configure:12934: 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:13037: checking MOZ_XFT_CFLAGS" >&5 -+echo "configure:12941: 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:13042: checking MOZ_XFT_LIBS" >&5 -+echo "configure:12946: 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\"`" -@@ -13073,7 +12977,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13077: checking for $ac_word" >&5 -+echo "configure:12981: 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 -@@ -13116,31 +13020,31 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 --echo "configure:13121: checking for pango >= 1.1.0" >&5 -+ echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6 -+echo "configure:13025: checking for pangoxft >= 1.1.0 pangox" >&5 - -- if $PKG_CONFIG --exists "pango >= 1.1.0" ; then -+ if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - -- echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 --echo "configure:13128: checking _PANGOCHK_CFLAGS" >&5 -- _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` -- echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 -+ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -+echo "configure:13032: checking MOZ_PANGO_CFLAGS" >&5 -+ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"` -+ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - -- echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 --echo "configure:13133: checking _PANGOCHK_LIBS" >&5 -+ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -+echo "configure:13037: checking MOZ_PANGO_LIBS" >&5 - ## don't use --libs since that can do evil things like add - ## -Wl,--export-dynamic -- _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" -- echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 -+ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`" -+ echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 - else -- _PANGOCHK_CFLAGS="" -- _PANGOCHK_LIBS="" -+ MOZ_PANGO_CFLAGS="" -+ MOZ_PANGO_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"` -- echo $_PANGOCHK_PKG_ERRORS -+ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"` -+ echo $MOZ_PANGO_PKG_ERRORS - fi - - -@@ -13154,7 +13058,7 @@ - if test $succeeded = yes; then - : - else -- { echo "configure: error: Library requirements (pango >= 1.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -+ { echo "configure: error: Library requirements (pangoxft >= 1.1.0 pangox) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } - fi - - fi -@@ -13163,6 +13067,8 @@ - - - -+ -+ - # Check whether --enable-pango or --disable-pango was given. - if test "${enable_pango+set}" = set; then - enableval="$enable_pango" -@@ -13189,7 +13095,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13193: checking for $ac_word" >&5 -+echo "configure:13099: 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 -@@ -13232,30 +13138,30 @@ - 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:13237: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 -+ echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6 -+echo "configure:13143: checking for pangoxft >= 1.6.0" >&5 - -- if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then -+ if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 --echo "configure:13244: checking MOZ_PANGO_CFLAGS" >&5 -- MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` -+echo "configure:13150: checking MOZ_PANGO_CFLAGS" >&5 -+ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` - echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 --echo "configure:13249: checking MOZ_PANGO_LIBS" >&5 -+echo "configure:13155: 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\"`" -+ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 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 - ## do set a variable so people can do so. -- MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.6.0 pangoft2 >= 1.6.0"` -+ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.6.0"` - echo $MOZ_PANGO_PKG_ERRORS - fi - -@@ -13270,13 +13176,113 @@ - if test $succeeded = yes; then - : - else -- { echo "configure: error: Library requirements (pango >= 1.6.0 pangoft2 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -+ { echo "configure: error: Library requirements (pangoxft >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -+ fi -+ -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:13190: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac -+fi -+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+if test -n "$PKG_CONFIG"; then -+ echo "$ac_t""$PKG_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for pangocairo >= 1.10.0""... $ac_c" 1>&6 -+echo "configure:13234: checking for pangocairo >= 1.10.0" >&5 -+ -+ if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then -+ echo "$ac_t""yes" 1>&6 -+ succeeded=yes -+ -+ echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6 -+echo "configure:13241: checking PANGOCAIRO_CHK_CFLAGS" >&5 -+ PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"` -+ echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6 -+ -+ echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6 -+echo "configure:13246: checking PANGOCAIRO_CHK_LIBS" >&5 -+ ## don't use --libs since that can do evil things like add -+ ## -Wl,--export-dynamic -+ PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`" -+ echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6 -+ else -+ PANGOCAIRO_CHK_CFLAGS="" -+ PANGOCAIRO_CHK_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"` -+ -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ -+ MOZ_PANGOCAIRO=1 -+ cat >> confdefs.h <<\EOF -+#define MOZ_PANGOCAIRO 1 -+EOF -+ -+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS" -+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS" -+ -+ else -+ : - fi - - - - - -+ - fi - - if test "$MOZ_X11" -@@ -13313,7 +13319,7 @@ - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$XLDFLAGS $LDFLAGS" - echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 --echo "configure:13317: checking for XpGetPrinterList in -lXp" >&5 -+echo "configure:13323: 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 -@@ -13321,7 +13327,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:13342: \"$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 -@@ -13405,7 +13411,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13409: checking for $ac_word" >&5 -+echo "configure:13415: 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 -@@ -13449,19 +13455,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 --echo "configure:13453: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 -+echo "configure:13459: 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:13460: checking MOZ_GNOMEVFS_CFLAGS" >&5 -+echo "configure:13466: 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:13465: checking MOZ_GNOMEVFS_LIBS" >&5 -+echo "configure:13471: 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\"`" -@@ -13511,7 +13517,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13515: checking for $ac_word" >&5 -+echo "configure:13521: 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 -@@ -13555,19 +13561,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 --echo "configure:13559: checking for gconf-2.0 >= $GCONF_VERSION" >&5 -+echo "configure:13565: 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:13566: checking MOZ_GCONF_CFLAGS" >&5 -+echo "configure:13572: 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:13571: checking MOZ_GCONF_LIBS" >&5 -+echo "configure:13577: 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\"`" -@@ -13613,7 +13619,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13617: checking for $ac_word" >&5 -+echo "configure:13623: 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 -@@ -13657,19 +13663,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 --echo "configure:13661: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 -+echo "configure:13667: 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:13668: checking MOZ_LIBGNOME_CFLAGS" >&5 -+echo "configure:13674: 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:13673: checking MOZ_LIBGNOME_LIBS" >&5 -+echo "configure:13679: 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\"`" -@@ -13746,7 +13752,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13750: checking for $ac_word" >&5 -+echo "configure:13756: 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 -@@ -13790,19 +13796,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 --echo "configure:13794: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 -+echo "configure:13800: 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:13801: checking MOZ_GNOMEUI_CFLAGS" >&5 -+echo "configure:13807: 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:13806: checking MOZ_GNOMEUI_LIBS" >&5 -+echo "configure:13812: 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\"`" -@@ -14222,7 +14228,7 @@ - # Extract the first word of "javac", so it can be a program name with args. - set dummy javac; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14226: checking for $ac_word" >&5 -+echo "configure:14232: 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 -@@ -14258,7 +14264,7 @@ - # Extract the first word of "jar", so it can be a program name with args. - set dummy jar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:14262: checking for $ac_word" >&5 -+echo "configure:14268: 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 -@@ -14479,7 +14485,7 @@ - gdiplus) - MOZ_SVG_RENDERER_GDIPLUS=1 - echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 --echo "configure:14483: checking for Gdiplus.h" >&5 -+echo "configure:14489: checking for Gdiplus.h" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -14489,7 +14495,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext < - #include -@@ -14498,7 +14504,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:14502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -14598,13 +14604,13 @@ - msvc*|mks*|cygwin*|mingw*|wince*) - if test -n "$MOZ_UPDATER"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:14602: checking for iconv" >&5 -+echo "configure:14608: 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:14608: checking for $ac_word" >&5 -+echo "configure:14614: 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 -@@ -14870,18 +14876,18 @@ - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:14874: checking for valid debug flags" >&5 -+echo "configure:14880: checking for valid debug flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:14885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -14922,18 +14928,18 @@ - if test "$COMPILE_ENVIRONMENT"; then - if test -n "$MOZ_OPTIMIZE"; then - echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 --echo "configure:14926: checking for valid optimization flags" >&5 -+echo "configure:14932: checking for valid optimization flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:14937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -15150,7 +15156,7 @@ - - if test -n "$_ENABLE_EFENCE"; then - echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 --echo "configure:15154: checking for malloc in -lefence" >&5 -+echo "configure:15160: 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 -@@ -15158,7 +15164,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lefence $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15179: \"$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 -@@ -15270,12 +15276,12 @@ - for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15274: checking for $ac_func" >&5 -+echo "configure:15280: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15311: \"$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 -@@ -15544,12 +15550,12 @@ - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15548: checking for $ac_func" >&5 -+echo "configure:15554: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15585: \"$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 -@@ -15713,7 +15719,7 @@ - # Compiler Options - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:15717: checking for gcc -pipe support" >&5 -+echo "configure:15723: checking for gcc -pipe support" >&5 - if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then - echo '#include ' > dummy-hello.c - echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c -@@ -15728,14 +15734,14 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -15777,16 +15783,16 @@ - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" - echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 --echo "configure:15781: checking whether compiler supports -Wno-long-long" >&5 -+echo "configure:15787: checking whether compiler supports -Wno-long-long" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15796: \"$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" -@@ -15807,16 +15813,16 @@ - CFLAGS="$CFLAGS -fprofile-generate" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:15811: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:15817: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -15834,16 +15840,16 @@ - else - CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" - echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 --echo "configure:15838: checking whether C compiler supports -fprofile-arcs" >&5 -+echo "configure:15844: checking whether C compiler supports -fprofile-arcs" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:15853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-arcs" - result="yes" -@@ -15889,18 +15895,21 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" - echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 --echo "configure:15893: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:15899: checking whether C++ compiler has -pedantic long long bug" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="no" - else -@@ -15930,13 +15939,16 @@ - fi - - echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 --echo "configure:15934: checking for correct temporary object destruction order" >&5 -+echo "configure:15943: checking for correct temporary object destruction order" >&5 - if test "$cross_compiling" = yes; then - result="maybe" - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - result="yes" - else -@@ -15976,12 +15988,12 @@ - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" - echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 --echo "configure:15980: checking for correct overload resolution with const and templates" >&5 -+echo "configure:15992: 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 < -@@ -16011,7 +16023,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:16015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -16276,7 +16288,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:16280: checking for $ac_word" >&5 -+echo "configure:16292: 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 -@@ -16320,19 +16332,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 --echo "configure:16324: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:16336: 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:16331: checking LIBIDL_CFLAGS" >&5 -+echo "configure:16343: 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:16336: checking LIBIDL_LIBS" >&5 -+echo "configure:16348: 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\"`" -@@ -16455,7 +16467,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:16459: checking for $ac_word" >&5 -+echo "configure:16471: 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 -@@ -16490,7 +16502,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:16494: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:16506: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -16513,7 +16525,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -16589,7 +16601,7 @@ - } - - EOF --if { (eval echo configure:16593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -16623,7 +16635,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -16633,7 +16645,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:16637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16649: \"$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" -@@ -16677,7 +16689,7 @@ - # Extract the first word of "libIDL-config", so it can be a program name with args. - set dummy libIDL-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:16681: checking for $ac_word" >&5 -+echo "configure:16693: 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 -@@ -16712,7 +16724,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:16716: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:16728: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -16739,7 +16751,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -16825,7 +16837,7 @@ - } - - EOF --if { (eval echo configure:16829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -16859,7 +16871,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext < -@@ -16870,7 +16882,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:16874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16886: \"$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" -@@ -16998,7 +17010,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17002: checking for $ac_word" >&5 -+echo "configure:17014: 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 -@@ -17033,7 +17045,7 @@ - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17037: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17049: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -17056,7 +17068,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17132,7 +17144,7 @@ - } - - EOF --if { (eval echo configure:17136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17166,7 +17178,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -17176,7 +17188,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:17180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17192: \"$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" -@@ -17220,7 +17232,7 @@ - # Extract the first word of "libIDL-config", so it can be a program name with args. - set dummy libIDL-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17224: checking for $ac_word" >&5 -+echo "configure:17236: 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 -@@ -17255,7 +17267,7 @@ - - min_libIDL_version=$LIBIDL_VERSION - echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 --echo "configure:17259: checking for libIDL - version >= $min_libIDL_version" >&5 -+echo "configure:17271: checking for libIDL - version >= $min_libIDL_version" >&5 - no_libIDL="" - if test "$LIBIDL_CONFIG" = "no" ; then - no_libIDL=yes -@@ -17282,7 +17294,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17368,7 +17380,7 @@ - } - - EOF --if { (eval echo configure:17372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17402,7 +17414,7 @@ - CFLAGS="$CFLAGS $LIBIDL_CFLAGS" - LIBS="$LIBS $LIBIDL_LIBS" - cat > conftest.$ac_ext < -@@ -17413,7 +17425,7 @@ - return IDL_get_libver_string ? 1 : 0; - ; return 0; } - EOF --if { (eval echo configure:17417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17429: \"$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" -@@ -17454,7 +17466,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17458: checking for $ac_word" >&5 -+echo "configure:17470: 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 -@@ -17498,19 +17510,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 --echo "configure:17502: checking for libIDL-2.0 >= 0.8.0" >&5 -+echo "configure:17514: 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:17509: checking LIBIDL_CFLAGS" >&5 -+echo "configure:17521: 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:17514: checking LIBIDL_LIBS" >&5 -+echo "configure:17526: 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\"`" -@@ -17546,7 +17558,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17550: checking for $ac_word" >&5 -+echo "configure:17562: 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 -@@ -17583,7 +17595,7 @@ - - if test -n "$ORBIT_CONFIG"; then - echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 --echo "configure:17587: checking for ORBit libIDL usability" >&5 -+echo "configure:17599: 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}` -@@ -17600,7 +17612,7 @@ - result="maybe" - else - cat > conftest.$ac_ext < -@@ -17615,7 +17627,7 @@ - } - - EOF --if { (eval echo configure:17619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17631: \"$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" -@@ -17672,7 +17684,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17676: checking for $ac_word" >&5 -+echo "configure:17688: 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 -@@ -17716,19 +17728,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 --echo "configure:17720: checking for glib-2.0 >= 1.3.7" >&5 -+echo "configure:17732: 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:17727: checking GLIB_CFLAGS" >&5 -+echo "configure:17739: 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:17732: checking GLIB_LIBS" >&5 -+echo "configure:17744: 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\"`" -@@ -17812,7 +17824,7 @@ - # Extract the first word of "glib-config", so it can be a program name with args. - set dummy glib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:17816: checking for $ac_word" >&5 -+echo "configure:17828: 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 -@@ -17847,7 +17859,7 @@ - - min_glib_version=${GLIB_VERSION} - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 --echo "configure:17851: checking for GLIB - version >= $min_glib_version" >&5 -+echo "configure:17863: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes -@@ -17870,7 +17882,7 @@ - echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat > conftest.$ac_ext < -@@ -17946,7 +17958,7 @@ - } - - EOF --if { (eval echo configure:17950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -17980,7 +17992,7 @@ - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -@@ -17990,7 +18002,7 @@ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; return 0; } - EOF --if { (eval echo configure:17994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18006: \"$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" -@@ -18069,19 +18081,19 @@ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:18073: checking for working alloca.h" >&5 -+echo "configure:18085: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:18085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18097: \"$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 -@@ -18102,12 +18114,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:18106: checking for alloca" >&5 -+echo "configure:18118: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18151: \"$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 -@@ -18167,12 +18179,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:18171: checking whether alloca needs Cray hooks" >&5 -+echo "configure:18183: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 --echo "configure:18201: checking for $ac_func" >&5 -+echo "configure:18213: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18241: \"$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 -@@ -18252,7 +18264,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:18256: checking stack direction for C alloca" >&5 -+echo "configure:18268: 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 -@@ -18260,7 +18272,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18295: \"$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 -@@ -18328,17 +18340,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:18332: checking for $ac_hdr" >&5 -+echo "configure:18344: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:18342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:18354: \"$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* -@@ -18418,7 +18430,7 @@ - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18422: checking for $ac_word" >&5 -+echo "configure:18434: 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 -@@ -18462,19 +18474,19 @@ - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 --echo "configure:18466: checking for cairo >= $CAIRO_VERSION" >&5 -+echo "configure:18478: 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:18473: checking CAIRO_CFLAGS" >&5 -+echo "configure:18485: 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:18478: checking CAIRO_LIBS" >&5 -+echo "configure:18490: 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\"`" -@@ -18539,7 +18551,7 @@ - # Extract the first word of "python", so it can be a program name with args. - set dummy python; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:18543: checking for $ac_word" >&5 -+echo "configure:18555: 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 -@@ -18800,14 +18812,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext < - int main() { - int x = 1; x++; - ; return 0; } - EOF --if { (eval echo configure:18811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -19102,7 +19114,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext < -@@ -19118,7 +19130,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:19122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -19335,34 +19347,15 @@ - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - MOZ_DEFINES=$DEFS - -@@ -19642,12 +19635,13 @@ - s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g - s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g - s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g --s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g --s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g --s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g - s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g - s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g -+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g -+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g -+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g - s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g -+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g - s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g - s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g - s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g -@@ -20278,7 +20272,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -20421,7 +20415,7 @@ - fi - fi - -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - diff --git a/print-properties.patch b/print-properties.patch deleted file mode 100644 index 6f877d8..0000000 --- a/print-properties.patch +++ /dev/null @@ -1,254 +0,0 @@ -Subject: Printer properties are not saved and displayed correctly -References: -https://bugzilla.mozilla.org/show_bug.cgi?id=324072 -https://bugzilla.novell.com/show_bug.cgi?id=174082 -https://bugzilla.mozilla.org/show_bug.cgi?id=342950 -https://bugzilla.novell.com/show_bug.cgi?id=187013 - -Index: idl/nsIPrintSettingsService.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/Attic/nsIPrintSettingsService.idl,v -retrieving revision 1.2 -diff -p -u -d -8 -r1.2 nsIPrintSettingsService.idl ---- idl/nsIPrintSettingsService.idl 17 Apr 2004 21:52:27 -0000 1.2 -+++ gfx/idl/nsIPrintSettingsService.idl 11 May 2006 21:51:04 -0000 -@@ -67,17 +67,17 @@ interface nsIPrintSettingsService : nsIS - * then it should use "globalPrintSettings" - * - * Initializes the newPrintSettings from the default printer - * - */ - readonly attribute nsIPrintSettings newPrintSettings; - - /** -- * The name of the default printer -+ * The name of the last printer used, or else the system default printer. - */ - readonly attribute wstring defaultPrinterName; - - /** - * Initializes certain settings from the native printer into the PrintSettings - * if aPrinterName is null then it uses the default printer name if it can - * These settings include, but are not limited to: - * Page Orientation -@@ -85,28 +85,31 @@ interface nsIPrintSettingsService : nsIS - * Number of Copies - */ - void initPrintSettingsFromPrinter(in wstring aPrinterName, in nsIPrintSettings aPrintSettings); - - /** - * Reads PrintSettings values from Prefs, - * the values to be read are indicated by the "flags" arg. - * -- * First it reads in the "generic" set of PrintSetings not associated with any printer -- * then it uses the PrinterName in the PrinterSettings to read any settings that were saved -+ * aPrintSettings should be initialized with the name of a printer. First -+ * it reads in the PrintSettings from the last print job. Then it uses the -+ * PrinterName in the PrinterSettings to read any settings that were saved - * just for that printer. - * - * aPS - PrintSettings to have its settings read - * aUsePrinterNamePrefix - indicates whether to use the printer name as a prefix -- * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the const values. -+ * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the -+ * const values. - * - * Items not read: - * startPageRange, endPageRange, scaling, printRange, title - * docURL, howToEnableFrameUI, isCancelled, printFrameTypeUsage -- * printFrameType, printSilent, shrinkToFit, numCopies -+ * printFrameType, printSilent, shrinkToFit, numCopies, -+ * printerName - * - */ - void initPrintSettingsFromPrefs(in nsIPrintSettings aPrintSettings, in boolean aUsePrinterNamePrefix, in unsigned long aFlags); - - /** - * Writes PrintSettings values to Prefs, - * the values to be written are indicated by the "flags" arg. - * -Index: gfx/src/nsPrintOptionsImpl.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/Attic/nsPrintOptionsImpl.cpp,v -retrieving revision 1.76 -diff -p -u -d -8 -r1.76 nsPrintOptionsImpl.cpp ---- src/nsPrintOptionsImpl.cpp 9 Aug 2005 01:35:48 -0000 1.76 -+++ gfx/src/nsPrintOptionsImpl.cpp 11 May 2006 21:51:05 -0000 -@@ -597,23 +597,16 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin - - if (aFlags & nsIPrintSettings::kInitSavePrintCommand) { - if (GETSTRPREF(kPrintCommand, str)) { - aPS->SetPrintCommand(str.get()); - DUMP_STR(kReadStr, kPrintCommand, str.get()); - } - } - -- if (aFlags & nsIPrintSettings::kInitSavePrinterName) { -- if (GETSTRPREF(kPrinterName, str)) { -- aPS->SetPrinterName(str.get()); -- DUMP_STR(kReadStr, kPrinterName, str.get()); -- } -- } -- - if (aFlags & nsIPrintSettings::kInitSavePrintToFile) { - if (GETBOOLPREF(kPrintToFile, &b)) { - aPS->SetPrintToFile(b); - DUMP_BOOL(kReadStr, kPrintToFile, b); - } - } - - if (aFlags & nsIPrintSettings::kInitSaveToFileName) { -@@ -865,20 +858,22 @@ nsPrintOptions::WritePrefs(nsIPrintSetti - - if (aFlags & nsIPrintSettings::kInitSavePrintCommand) { - if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) { - DUMP_STR(kWriteStr, kPrintCommand, uStr); - WritePrefString(uStr, GetPrefName(kPrintCommand, aPrinterName)); - } - } - -- if (aFlags & nsIPrintSettings::kInitSavePrinterName) { -+ // Only the general version of this pref is saved -+ if ((aFlags & nsIPrintSettings::kInitSavePrinterName) -+ && aPrinterName.IsEmpty()) { - if (NS_SUCCEEDED(aPS->GetPrinterName(&uStr))) { - DUMP_STR(kWriteStr, kPrinterName, uStr); -- WritePrefString(uStr, GetPrefName(kPrinterName, aPrinterName)); -+ WritePrefString(uStr, kPrinterName); - } - } - - if (aFlags & nsIPrintSettings::kInitSavePrintToFile) { - if (NS_SUCCEEDED(aPS->GetPrintToFile(&b))) { - DUMP_BOOL(kWriteStr, kPrintToFile, b); - mPrefBranch->SetBoolPref(GetPrefName(kPrintToFile, aPrinterName), b); - } -@@ -965,16 +960,22 @@ NS_IMETHODIMP nsPrintOptions::GetNativeD - - nsresult nsPrintOptions::_CreatePrintSettings(nsIPrintSettings **_retval) - { - // does not initially ref count - nsPrintSettings * printSettings = new nsPrintSettings(); - NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY); - - NS_ADDREF(*_retval = printSettings); // ref count -+ -+ nsXPIDLString printerName; -+ nsresult rv = GetDefaultPrinterName(getter_Copies(printerName)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ (*_retval)->SetPrinterName(printerName.get()); -+ - (void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE, - nsIPrintSettings::kInitSaveAll); - - return NS_OK; - } - - NS_IMETHODIMP nsPrintOptions::CreatePrintSettings(nsIPrintSettings **_retval) - { -@@ -1003,16 +1004,42 @@ nsPrintOptions::GetNewPrintSettings(nsIP - NS_IMETHODIMP - nsPrintOptions::GetDefaultPrinterName(PRUnichar * *aDefaultPrinterName) - { - nsresult rv; - nsCOMPtr prtEnum = do_GetService(kPrinterEnumeratorCID, - &rv); - NS_ENSURE_SUCCESS(rv, rv); - -+ // Look up the printer from the last print job -+ nsAutoString lastPrinterName; -+ ReadPrefString(kPrinterName, lastPrinterName); -+ if (!lastPrinterName.IsEmpty()) { -+ // Verify it's still a valid printer -+ PRUnichar **printers; -+ PRUint32 ctPrinters; -+ rv = prtEnum->EnumeratePrinters(&ctPrinters, &printers); -+ if (NS_SUCCEEDED(rv)) { -+ PRBool isValid = PR_FALSE; -+ for (PRInt32 ii = ctPrinters - 1; ii >= 0; --ii) { -+ if (lastPrinterName.Equals(printers[ii])) { -+ isValid = PR_TRUE; -+ break; -+ } -+ } -+ NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(ctPrinters, printers); -+ if (isValid) { -+ *aDefaultPrinterName = ToNewUnicode(lastPrinterName); -+ return NS_OK; -+ } -+ } -+ } -+ -+ // There is no last printer preference, or it doesn't name a valid printer. -+ // Return the default from the printer enumeration. - return prtEnum->GetDefaultPrinterName(aDefaultPrinterName); - } - - NS_IMETHODIMP - nsPrintOptions::InitPrintSettingsFromPrinter(const PRUnichar *aPrinterName, - nsIPrintSettings *aPrintSettings) - { - NS_ENSURE_ARG_POINTER(aPrintSettings); -@@ -1124,49 +1151,50 @@ nsPrintOptions::InitPrintSettingsFromPre - nsAutoString prtName; - // read any non printer specific prefs - // with empty printer name - nsresult rv = ReadPrefs(aPS, prtName, aFlags); - NS_ENSURE_SUCCESS(rv, rv); - - // Get the Printer Name from the PrintSettings - // to use as a prefix for Pref Names -- GetAdjustedPrinterName(aPS, aUsePNP, prtName); -- NS_ENSURE_FALSE(prtName.IsEmpty(), NS_OK); -+ rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (prtName.IsEmpty()) { -+ NS_WARNING("Caller should supply a printer name."); -+ return NS_OK; -+ } - - // Now read any printer specific prefs - rv = ReadPrefs(aPS, prtName, aFlags); - if (NS_SUCCEEDED(rv)) - aPS->SetIsInitializedFromPrefs(PR_TRUE); - - return NS_OK; - } - --/** --------------------------------------------------- -- * This will save into prefs most all the PrintSettings either generically (not -- * specified printer) or to a specific printer. -+/** -+ * Save all of the printer settings; if we can find a printer name, save -+ * printer-specific preferences. Otherwise, save generic ones. - */ - nsresult - nsPrintOptions::SavePrintSettingsToPrefs(nsIPrintSettings *aPS, - PRBool aUsePrinterNamePrefix, - PRUint32 aFlags) - { - NS_ENSURE_ARG_POINTER(aPS); - nsAutoString prtName; - -- // Get the Printer Name from the PrinterSettings -- // to use as a prefix for Pref Names -+ // Get the printer name from the PrinterSettings for an optional prefix. - nsresult rv = GetAdjustedPrinterName(aPS, aUsePrinterNamePrefix, prtName); - NS_ENSURE_SUCCESS(rv, rv); - -- // Now write any printer specific prefs -- // XXX but when |prtName| is empty, how can we write printer specific prefs? -- rv = WritePrefs(aPS, prtName, aFlags); -- -- return rv; -+ // Write the prefs, with or without a printer name prefix. -+ return WritePrefs(aPS, prtName, aFlags); - } - - - //----------------------------------------------------- - //-- Protected Methods -------------------------------- - //----------------------------------------------------- - nsresult - nsPrintOptions::ReadPrefString(const char * aPrefId, nsAString& aString) diff --git a/remote.patch b/remote.patch deleted file mode 100644 index fa9dbe9..0000000 --- a/remote.patch +++ /dev/null @@ -1,306 +0,0 @@ -Index: widget/public/nsIXRemoteClient.idl -=================================================================== -RCS file: /cvsroot/mozilla/widget/public/nsIXRemoteClient.idl,v -retrieving revision 1.2 -diff -u -p -6 -r1.2 nsIXRemoteClient.idl ---- widget/public/nsIXRemoteClient.idl 8 Apr 2004 14:01:15 -0000 1.2 -+++ widget/public/nsIXRemoteClient.idl 22 Feb 2005 08:18:43 -0000 -@@ -26,13 +26,13 @@ - [scriptable, uuid(0bafc924-1dd2-11b2-8345-b59762ae0df7)] - interface nsIXRemoteClient : nsISupports - { - /** - * Initializes the client - */ -- void init(); -+ void init(in string aDisplay); - - /** - * Sends a command to a running instance. If it returns false then - * there is no running instance. - * - * @param aProgram This is the preferred program that we want to use -Index: widget/src/xremoteclient/XRemoteClient.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/xremoteclient/XRemoteClient.cpp,v -retrieving revision 1.14 -diff -u -p -6 -r1.14 XRemoteClient.cpp ---- widget/src/xremoteclient/XRemoteClient.cpp 8 Apr 2004 14:01:16 -0000 1.14 -+++ widget/src/xremoteclient/XRemoteClient.cpp 22 Feb 2005 08:19:31 -0000 -@@ -77,20 +77,20 @@ XRemoteClient::~XRemoteClient() - - #ifndef XREMOTE_STANDALONE - NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient) - #endif - - NS_IMETHODIMP --XRemoteClient::Init (void) -+XRemoteClient::Init (const char *aDisplay) - { - PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::Init")); - - if (mInitialized) - return NS_OK; - // try to open the display -- mDisplay = XOpenDisplay(0); -+ mDisplay = XOpenDisplay(aDisplay); - if (!mDisplay) - return NS_ERROR_FAILURE; - - // get our atoms - mMozVersionAtom = XInternAtom(mDisplay, MOZILLA_VERSION_PROP, False); - mMozLockAtom = XInternAtom(mDisplay, MOZILLA_LOCK_PROP, False); -Index: widget/src/xremoteclient/mozilla-xremote-client.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp,v -retrieving revision 1.3 -diff -u -p -6 -r1.3 mozilla-xremote-client.cpp ---- widget/src/xremoteclient/mozilla-xremote-client.cpp 8 Apr 2004 14:01:16 -0000 1.3 -+++ widget/src/xremoteclient/mozilla-xremote-client.cpp 22 Feb 2005 08:21:37 -0000 -@@ -37,29 +37,42 @@ - * ***** END LICENSE BLOCK ***** */ - - #include - #include - #include - #include "XRemoteClient.h" -+#include - - static void print_usage(void); - - int main(int argc, char **argv) - { - nsresult rv; - XRemoteClient client; - char *browser = 0; - char *profile = 0; - char *username = 0; - char *command = 0; -+ char *display = 0; -+ PRInt32 i = 0; - - if (argc < 2) { - print_usage(); - return 4; - } - -+ for (i=1; i < argc - 1; i++) { -+ if (strcmp(argv[i], "--display") == 0) { -+ display = argv[i + 1]; -+ /* Now remove the --display parameters from the command line */ -+ memmove(&argv[i], &argv[i + 2], sizeof(argv[i])*(argc - (i + 2))); -+ argc -= 2; -+ break; -+ } -+ } -+ - PLOptStatus os; - PLOptState *opt = PL_CreateOptState(argc, argv, "ha:u:p:"); - while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) { - if (PL_OPT_BAD == os) { - print_usage(); - return 4; -@@ -83,13 +96,13 @@ int main(int argc, char **argv) - command = strdup(opt->value); - default: - break; - } - } - -- rv = client.Init(); -+ rv = client.Init(display); - // failed to connect to the X server - if (NS_FAILED(rv)) - return 1; - - // send the command - it doesn't get any easier than this - PRBool success = PR_FALSE; -@@ -120,10 +133,11 @@ int main(int argc, char **argv) - // else, everything is fine. - return 0; - } - - /* static */ - void print_usage(void) { -- fprintf(stderr, "Usage: mozilla-xremote-client [-a firefox|thunderbird|mozilla|any]\n"); -+ fprintf(stderr, "Usage: mozilla-xremote-client [--display DISPLAY]\n"); -+ fprintf(stderr, " [-a firefox|thunderbird|mozilla|any]\n"); - fprintf(stderr, " [-u ]\n"); - fprintf(stderr, " [-p ] COMMAND\n"); - } -Index: toolkit/xre/nsAppRunner.cpp -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v -retrieving revision 1.27.2.1.4.40 -diff -u -p -6 -r1.27.2.1.4.40 nsAppRunner.cpp ---- toolkit/xre/nsAppRunner.cpp 2 Nov 2004 23:27:24 -0000 1.27.2.1.4.40 -+++ toolkit/xre/nsAppRunner.cpp 25 Feb 2005 07:49:37 -0000 -@@ -977,13 +977,13 @@ DumpVersion() - } - - #ifdef MOZ_ENABLE_XREMOTE - // use int here instead of a PR type since it will be returned - // from main - just to keep types consistent - static int --HandleRemoteArgument(const char* remote) -+HandleRemoteArgument(const char* remote, const char* display) - { - nsresult rv; - ArgResult ar; - - const char *profile = 0; - nsCAutoString program(gAppData->appName); -@@ -1019,13 +1019,13 @@ HandleRemoteArgument(const char* remote) - { // scope the comptr so we don't hold on to XPCOM objects beyond shutdown - // try to get the X remote client - nsCOMPtr client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID)); - NS_ENSURE_TRUE(client, 1); - - // try to init - connects to the X server and stuff -- rv = client->Init(); -+ rv = client->Init(display); - if (NS_FAILED(rv)) { - PR_fprintf(PR_STDERR, "Error: Failed to connect to X server.\n"); - return 1; - } - - nsXPIDLCString response; -@@ -1521,12 +1521,13 @@ public: - ~ScopedFPHandler() { PR_OS2_UnsetFloatExcpHandler(&excpreg); } - }; - #endif - - int xre_main(int argc, char* argv[], const nsXREAppData* aAppData) - { -+ ArgResult ar; - nsresult rv; - NS_TIMELINE_MARK("enter main"); - - #if defined(DEBUG) && defined(XP_WIN32) - // Disable small heap allocator to get heapwalk() giving us - // accurate heap numbers. Win2k non-debug does not use small heap allocator. -@@ -1633,12 +1634,21 @@ int xre_main(int argc, char* argv[], con - - em->Register(); - } - return 0; - } - -+ // save display argument here to reserve it for -remote -+ // handling (it will be removed from gtk_init) -+ const char *display = nsnull; -+ ar = CheckArg("display", &display); -+ if (ar == ARG_BAD) { -+ PR_fprintf(PR_STDERR, "Error: argument --display requires a display number\n"); -+ return 1; -+ } -+ - #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) - // setup for private colormap. Ideally we'd like to do this - // in nsAppShell::Create, but we need to get in before gtk - // has been initialized to make sure everything is running - // consistently. - if (CheckArg("install")) -@@ -1695,19 +1705,19 @@ int xre_main(int argc, char* argv[], con - } - - #ifdef MOZ_ENABLE_XREMOTE - // handle -remote now that xpcom is fired up - - const char* xremotearg; -- ArgResult ar = CheckArg("remote", &xremotearg); -+ ar = CheckArg("remote", &xremotearg); - if (ar == ARG_BAD) { - PR_fprintf(PR_STDERR, "Error: -remote requires an argument\n"); - return 1; - } - if (ar) { -- return HandleRemoteArgument(xremotearg); -+ return HandleRemoteArgument(xremotearg, display); - } - #endif - - nsCOMPtr profileLock; - PRBool startOffline = PR_FALSE; - -Index: xpfe/bootstrap/nsAppRunner.cpp -=================================================================== -RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v -retrieving revision 1.413.2.1.4.1 -diff -u -p -6 -r1.413.2.1.4.1 nsAppRunner.cpp ---- xpfe/bootstrap/nsAppRunner.cpp 10 Jun 2004 20:43:39 -0000 1.413.2.1.4.1 -+++ xpfe/bootstrap/nsAppRunner.cpp 28 Feb 2005 09:11:26 -0000 -@@ -1402,13 +1402,13 @@ static nsresult DumpVersion(char *appnam - return rv; - } - - #ifdef MOZ_ENABLE_XREMOTE - // use int here instead of a PR type since it will be returned - // from main - just to keep types consistent --static int HandleRemoteArguments(int argc, char* argv[], PRBool *aArgUsed) -+static int HandleRemoteArguments(int argc, char* argv[], char* display, PRBool *aArgUsed) - { - int i = 0; - - const char *remote = 0; - const char *profile = 0; - const char *program = 0; -@@ -1463,13 +1463,13 @@ static int HandleRemoteArguments(int arg - nsCOMPtr client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID)); - if (!client) - return 1; - - nsresult rv; - // try to init - connects to the X server and stuff -- rv = client->Init(); -+ rv = client->Init(display); - if (NS_FAILED(rv)) { - PR_fprintf(PR_STDERR, "Error: Failed to connect to X server.\n"); - return 1; - } - - // Make sure to set a username if possible -@@ -1656,12 +1656,28 @@ int main(int argc, char* argv[]) - fprintf(stderr, "%s: XInitThreads failure.", argv[0]); - exit(EXIT_FAILURE); - } - } - #endif /* MOZ_X11 */ - -+ // save --display parameter for possible -remote handling -+ // (it will be lost after gtk_init) -+ char *display = 0; -+ char *param = 0; -+ for (int i=1; iSetCiteReference(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 compFields; - compose->GetCompFields(getter_AddRefs(compFields)); -@@ -2213,6 +2219,7 @@ NS_IMETHODIMP QuotingOutputStreamListene - nsAutoString followUpTo; - nsAutoString messageId; - nsAutoString references; -+ nsAutoString listPost; - nsXPIDLCString outCString; - PRBool needToRemoveDup = PR_FALSE; - if (!mMimeConverter) -@@ -2257,6 +2264,29 @@ NS_IMETHODIMP QuotingOutputStreamListene - - 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("" -+ 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) -@@ -2294,7 +2324,8 @@ NS_IMETHODIMP QuotingOutputStreamListene - 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) -@@ -2796,6 +2827,7 @@ NS_IMETHODIMP nsMsgCompose::RememberQueu - // 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 || -@@ -2834,6 +2866,7 @@ nsresult nsMsgCompose::ProcessReplyFlags - // for this URI. - if (mType == nsIMsgCompType::Reply || - mType == nsIMsgCompType::ReplyAll || -+ mType == nsIMsgCompType::ReplyToList || - mType == nsIMsgCompType::ReplyToGroup || - mType == nsIMsgCompType::ReplyToSender || - mType == nsIMsgCompType::ReplyToSenderAndGroup || -@@ -3745,6 +3778,7 @@ nsMsgCompose::BuildBodyMessageAndSignatu - case nsIMsgCompType::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 : Index: mailnews/mime/public/nsMailHeaders.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/public/nsMailHeaders.h,v @@ -188,3 +48,197 @@ diff -u -p -6 -r1.11 nsMailHeaders.h #define HEADER_PARM_BOUNDARY "BOUNDARY" #define HEADER_PARM_FILENAME "FILENAME" #define HEADER_PARM_NAME "NAME" +Index: mail/base/content/mailCommands.js +=================================================================== +RCS file: /cvsroot/mozilla/mail/base/content/mailCommands.js,v +retrieving revision 1.20.2.5 +diff -u -p -6 -r1.20.2.5 mailCommands.js +--- mail/base/content/mailCommands.js 10 Jul 2006 19:44:11 -0000 1.20.2.5 ++++ mail/base/content/mailCommands.js 21 Nov 2006 07:35:42 -0000 +@@ -260,12 +260,13 @@ function ComposeMessage(type, format, fo + 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) +Index: mailnews/base/resources/content/mailCommands.js +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/base/resources/content/mailCommands.js,v +retrieving revision 1.96.4.4 +diff -u -p -6 -r1.96.4.4 mailCommands.js +--- mailnews/base/resources/content/mailCommands.js 25 Jun 2006 08:56:04 -0000 1.96.4.4 ++++ mailnews/base/resources/content/mailCommands.js 21 Nov 2006 07:35:51 -0000 +@@ -267,12 +267,13 @@ function ComposeMessage(type, format, fo + 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) +Index: mailnews/compose/src/nsMsgCompose.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompose.cpp,v +retrieving revision 1.460.2.27 +diff -u -p -6 -r1.460.2.27 nsMsgCompose.cpp +--- mailnews/compose/src/nsMsgCompose.cpp 4 Jan 2007 19:34:56 -0000 1.460.2.27 ++++ mailnews/compose/src/nsMsgCompose.cpp 10 Jan 2007 09:01:35 -0000 +@@ -1748,12 +1748,13 @@ nsresult nsMsgCompose::CreateMessage(con + + 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... + { +@@ -2192,14 +2193,18 @@ NS_IMETHODIMP QuotingOutputStreamListene + 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 compFields; + compose->GetCompFields(getter_AddRefs(compFields)); + if (compFields) + { + aCharset.AssignLiteral("UTF-8"); +@@ -2210,12 +2215,13 @@ NS_IMETHODIMP QuotingOutputStreamListene + 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); +@@ -2263,13 +2269,36 @@ NS_IMETHODIMP QuotingOutputStreamListene + 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("" ++ 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); + } + +@@ -2300,13 +2329,14 @@ NS_IMETHODIMP QuotingOutputStreamListene + 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; + } +@@ -2805,12 +2835,13 @@ void nsMsgCompose::CleanUpRecipients(nsS + 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) + { +@@ -2843,12 +2874,13 @@ 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) +@@ -3775,12 +3807,13 @@ nsMsgCompose::BuildBodyMessageAndSignatu + 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 : diff --git a/system-extensions.patch b/system-extensions.patch index e50b3fd..3427e26 100644 --- a/system-extensions.patch +++ b/system-extensions.patch @@ -1,11 +1,11 @@ Index: toolkit/mozapps/extensions/src/nsExtensionManager.js.in =================================================================== RCS file: /cvsroot/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in,v -retrieving revision 1.144.2.16 -diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in ---- toolkit/mozapps/extensions/src/nsExtensionManager.js.in 21 Oct 2005 01:27:44 -0000 1.144.2.16 -+++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in 28 Dec 2005 06:58:07 -0000 -@@ -118,12 +118,13 @@ const OP_NEEDS_UPGRADE = +retrieving revision 1.144.2.52 +diff -u -p -6 -r1.144.2.52 nsExtensionManager.js.in +--- toolkit/mozapps/extensions/src/nsExtensionManager.js.in 29 Jun 2006 20:11:57 -0000 1.144.2.52 ++++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in 20 Jul 2006 07:23:39 -0000 +@@ -116,12 +116,13 @@ const OP_NEEDS_UPGRADE = const OP_NEEDS_UNINSTALL = "needs-uninstall"; const OP_NEEDS_ENABLE = "needs-enable"; const OP_NEEDS_DISABLE = "needs-disable"; @@ -19,7 +19,7 @@ diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in const PREFIX_NS_EM = "http://www.mozilla.org/2004/em-rdf#"; const PREFIX_NS_CHROME = "http://www.mozilla.org/rdf/chrome#"; const PREFIX_ITEM_URI = "urn:mozilla:item:"; -@@ -2215,12 +2216,22 @@ function ExtensionManager() { +@@ -2671,12 +2672,23 @@ function ExtensionManager() { var priority = nsIInstallLocation.PRIORITY_APP_PROFILE; var profileLocation = new DirectoryInstallLocation(KEY_APP_PROFILE, appProfileExtensions, false, @@ -35,6 +35,7 @@ diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in + priority); + InstallLocations.put(systemLocation); + } catch (e) {} ++ + #ifdef XP_WIN // Register HKEY_LOCAL_MACHINE Install Location @@ -42,10 +43,10 @@ diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in new WinRegInstallLocation("winreg-app-global", nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE, true, -@@ -3236,13 +3247,13 @@ ExtensionManager.prototype = { - "{641d8d09-7dda-4850-8228-ac0ab65e2ac9}"]); - if (profileDOMi && profileDOMi.exists()) - removeDirRecursive(profileDOMi); +@@ -3830,13 +3842,13 @@ ExtensionManager.prototype = { + // toolkit 1.8 extension datasource. + if (dsExists) + return; // Prepare themes for installation // Only enumerate directories in the app-profile and app-global locations. @@ -57,7 +58,7 @@ diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in continue; var entries = location.itemLocations; -@@ -3300,13 +3311,14 @@ ExtensionManager.prototype = { +@@ -3896,13 +3908,14 @@ ExtensionManager.prototype = { if (this._checkForFileChanges()) { // Create a list of all items that are to be installed so we can migrate // these items's settings to the new datasource. @@ -73,7 +74,7 @@ diff -u -p -6 -r1.144.2.16 nsExtensionManager.js.in } // If there are no items to migrate settings for return early. -@@ -4303,13 +4315,14 @@ ExtensionManager.prototype = { +@@ -4881,13 +4894,14 @@ ExtensionManager.prototype = { var restartRequired = this.installRequiresRestart(id, ds.getItemProperty(id, "type")) this._updateManifests(restartRequired); return; diff --git a/system-nspr.patch b/system-nspr.patch deleted file mode 100644 index 003641f..0000000 --- a/system-nspr.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Wolfgang Rosenauer -Subject: fixes for build --with-system-nspr -References: -https://bugzilla.mozilla.org/show_bug.cgi?id=296819 -https://bugzilla.mozilla.org/show_bug.cgi?id=290923 -https://bugzilla.mozilla.org/show_bug.cgi?id=288647 - -Index: security/coreconf/location.mk -=================================================================== ---- security/coreconf/location.mk.orig -+++ security/coreconf/location.mk -@@ -61,6 +61,8 @@ endif - - DIST = $(SOURCE_PREFIX)/$(PLATFORM) - -+NSPR_LIBDIR = $(DIST)/lib -+ - ifdef BUILD_DEBUG_GC - DEFINES += -DDEBUG_GC - endif -Index: security/manager/Makefile.in -=================================================================== ---- security/manager/Makefile.in.orig -+++ security/manager/Makefile.in -@@ -114,13 +114,25 @@ FREEBL_64INT_CHK = libfreebl_64int_3.chk - FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX) - FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk - endif -- -+ -+# Hmm, hope this is ok. -+ABS_DIST := $(shell cd $(DIST) && pwd) -+ifeq ($(OS_ARCH),WINNT) -+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') -+endif -+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) -+ifneq (,$(strip $(NSPR_LIBDIR))) -+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) -+else -+NSPR_LIBDIR = $(ABS_DIST)/lib -+endif - # NSS makefiles are not safe for parallel execution. - DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 - DEFAULT_GMAKE_FLAGS += CC="$(CC)" --DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" --DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist --DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist -+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" -+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) -+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) -+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 - ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) diff --git a/system-nss.patch b/system-nss.patch deleted file mode 100644 index 80c4c2b..0000000 --- a/system-nss.patch +++ /dev/null @@ -1,627 +0,0 @@ -Index: mozilla/configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1503.2.15 -diff -u -r1.1503.2.15 configure.in ---- mozilla/configure.in 4 Oct 2005 05:53:49 -0000 1.1503.2.15 -+++ configure.in 15 Dec 2005 05:40:40 -0000 -@@ -86,6 +86,7 @@ - MOZPNG=10207 - MOZZLIB=1.2.3 - NSPR_VERSION=4 -+NSS_VERSION=3 - - dnl Set the minimum version of toolkit libs used by mozilla - dnl ======================================================== -@@ -3472,6 +3473,19 @@ - fi - fi - -+dnl ======================================================== -+dnl = If NSS was not detected in the system, -+dnl = use the one in the source tree (mozilla/security/nss) -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-nss, -+[ --with-system-nss Use system installed NSS], -+ _USE_SYSTEM_NSS=1 ) -+ -+if test -n "$_USE_SYSTEM_NSS"; then -+ AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=]) -+fi -+ - if test -z "$SKIP_LIBRARY_CHECKS"; then - dnl system JPEG support - dnl ======================================================== -@@ -6698,6 +6712,10 @@ - AC_SUBST(NSPR_LIBS) - AC_SUBST(MOZ_NATIVE_NSPR) - -+AC_SUBST(NSS_CFLAGS) -+AC_SUBST(NSS_LIBS) -+AC_SUBST(MOZ_NATIVE_NSS) -+ - AC_SUBST(CFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(CPPFLAGS) -Index: mozilla/aclocal.m4 -=================================================================== -RCS file: /cvsroot/mozilla/aclocal.m4,v -retrieving revision 1.14 -diff -u -r1.14 aclocal.m4 ---- mozilla/aclocal.m4 13 May 2004 03:12:47 -0000 1.14 -+++ aclocal.m4 15 Dec 2005 05:40:53 -0000 -@@ -8,6 +8,7 @@ - builtin(include, build/autoconf/libIDL.m4)dnl - builtin(include, build/autoconf/libIDL-2.m4)dnl - builtin(include, build/autoconf/nspr.m4)dnl -+builtin(include, build/autoconf/nss.m4)dnl - builtin(include, build/autoconf/libart.m4)dnl - builtin(include, build/autoconf/pkg.m4)dnl - builtin(include, build/autoconf/freetype2.m4)dnl -Index: mozilla/config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.363.2.1 -diff -u -r3.363.2.1 autoconf.mk.in ---- mozilla/config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1 -+++ config/autoconf.mk.in 15 Dec 2005 05:40:53 -0000 -@@ -229,6 +229,7 @@ - MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@ - - MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@ -+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@ - - CROSS_COMPILE = @CROSS_COMPILE@ - -@@ -384,6 +385,48 @@ - NSPR_CFLAGS = @NSPR_CFLAGS@ - NSPR_LIBS = @NSPR_LIBS@ - -+NSS_CONFIG = @NSS_CONFIG@ -+NSS_CFLAGS = @NSS_CFLAGS@ -+NSS_LIBS = @NSS_LIBS@ -+ -+ifdef MOZ_NATIVE_NSS -+NSS_DEP_LIBS = \ -+ $(NULL) -+NSS_LIBS += \ -+ -lcrmf \ -+ $(NULL) -+else -+NSS_DEP_LIBS = \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -+ $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -+ $(NULL) -+NSS_LIBS = \ -+ $(LIBS_DIR) \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ -lsmime3 \ -+ -lssl3 \ -+ -lnss3 \ -+ -lsoftokn3 \ -+ $(NULL) -+endif -+ -+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) -+ifndef GNU_CC -+ifndef MOZ_NATIVE_NSS -+NSS_LIBS = \ -+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ -+ $(NULL) -+endif -+endif -+endif -+ - LDAP_CFLAGS = @LDAP_CFLAGS@ - LDAP_LIBS = @LDAP_LIBS@ - XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ -Index: mozilla/config/config.mk -=================================================================== -RCS file: /cvsroot/mozilla/config/config.mk,v -retrieving revision 3.337 -diff -u -r3.337 config.mk ---- mozilla/config/config.mk 28 Jul 2005 19:48:11 -0000 3.337 -+++ config/config.mk 15 Dec 2005 05:40:54 -0000 -@@ -138,39 +138,6 @@ - FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps - FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names - --# --# NSS libs needed for final link in static build --# -- --NSS_LIBS = \ -- $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- -lsmime3 \ -- -lssl3 \ -- -lnss3 \ -- -lsoftokn3 \ -- $(NULL) -- --ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) --ifndef GNU_CC --NSS_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ -- $(NULL) --endif --endif -- --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -- - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) - MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) - MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) -Index: mozilla/build/autoconf/nss.m4 -=================================================================== -RCS file: mozilla/build/autoconf/nss.m4 -diff -N mozilla/build/autoconf/nss.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ build/autoconf/nss.m4 15 Dec 2005 05:40:54 -0000 -@@ -0,0 +1,67 @@ -+# -*- tab-width: 4; -*- -+# Configure paths for NSS -+# Public domain - Chris Seawood 2001-04-05 -+# Based upon gtk.m4 (also PD) by Owen Taylor -+ -+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS -+AC_DEFUN(AM_PATH_NSS, -+[dnl -+ -+AC_ARG_WITH(nss-prefix, -+ [ --with-nss-prefix=PFX Prefix where NSS is installed], -+ nss_config_prefix="$withval", -+ nss_config_prefix="") -+ -+AC_ARG_WITH(nss-exec-prefix, -+ [ --with-nss-exec-prefix=PFX -+ Exec prefix where NSS is installed], -+ nss_config_exec_prefix="$withval", -+ nss_config_exec_prefix="") -+ -+ if test -n "$nss_config_exec_prefix"; then -+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config -+ fi -+ fi -+ if test -n "$nss_config_prefix"; then -+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_prefix/bin/nss-config -+ fi -+ fi -+ -+ unset ac_cv_path_NSS_CONFIG -+ AC_PATH_PROG(NSS_CONFIG, nss-config, no) -+ min_nss_version=ifelse([$1], ,3.0.0,$1) -+ AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping)) -+ -+ 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` -+ -+ dnl Skip version check for now -+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ fi -+ -+ if test -z "$no_nss"; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ -+ -+ AC_SUBST(NSS_CFLAGS) -+ AC_SUBST(NSS_LIBS) -+ -+]) -Index: mozilla/security/manager/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v -retrieving revision 1.57 -diff -u -r1.57 Makefile.in ---- mozilla/security/manager/Makefile.in 2 Jun 2005 02:03:05 -0000 1.57 -+++ security/manager/Makefile.in 15 Dec 2005 05:40:54 -0000 -@@ -46,6 +46,8 @@ - MODULE = psm - - PACKAGE_FILE = psm.pkg -+ -+ifndef MOZ_NATIVE_NSS - PACKAGE_VARS += \ - NSS3_LIB \ - SMIME3_LIB \ -@@ -57,6 +59,7 @@ - $(NULL) - - LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -+endif - - NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) - SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -@@ -147,6 +150,7 @@ - export:: .nss.cleaned - - .nss.cleaned: .nss.checkout -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - ifndef SKIP_CHK -@@ -154,9 +158,12 @@ - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - endif - touch $@ -+endif - - .nss.checkout: -+ifndef MOZ_NATIVE_NSS - touch $(srcdir)/$@ -+endif - - dependclean export packages chrome:: - $(MAKE) -C boot $@ -@@ -167,12 +174,15 @@ - endif - - libs:: -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) -+endif - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -@@ -210,6 +220,7 @@ - $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin - endif - endif -+endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -218,6 +229,7 @@ - endif - - install:: -+ifndef MOZ_NATIVE_NSS - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) - ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) -@@ -232,6 +244,7 @@ - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) - endif -+endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -246,15 +259,18 @@ - ifdef MOZ_XUL - $(MAKE) -C pki $@ - endif -+ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - endif -+endif - - echo-requires-recursive:: - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C pki $@ - $(MAKE) -C locales $@ -+ -Index: mozilla/security/manager/ssl/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v -retrieving revision 1.67 -diff -u -r1.67 Makefile.in ---- mozilla/security/manager/ssl/src/Makefile.in 3 Aug 2005 05:24:18 -0000 1.67 -+++ security/manager/ssl/src/Makefile.in 15 Dec 2005 05:40:56 -0000 -@@ -123,8 +123,13 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's -+ifdef MOZ_NATIVE_NSS -+LOCAL_INCLUDES += $(NSS_CFLAGS) \ -+ $(NULL) -+else - LOCAL_INCLUDES += -I$(DIST)/public/nss \ - $(NULL) -+endif - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ -Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v -retrieving revision 1.126.2.1 -diff -u -r1.126.2.1 nsNSSComponent.cpp ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Aug 2005 06:41:50 -0000 1.126.2.1 -+++ security/manager/ssl/src/nsNSSComponent.cpp 15 Dec 2005 05:41:00 -0000 -@@ -488,14 +488,6 @@ - } - - --#ifdef XP_MAC --#ifdef DEBUG --#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb") --#else --#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb") --#endif /*DEBUG*/ --#endif /*XP_MAC*/ -- - static void setOCSPOptions(nsIPrefBranch * pref); - - NS_IMETHODIMP -@@ -689,40 +681,40 @@ - - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -- NS_XPCOM_CURRENT_PROCESS_DIR -+ NS_XPCOM_CURRENT_PROCESS_DIR, -+ 0 - }; -- -+ - for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { - nsCOMPtr mozFile; -- directoryService->Get( possible_ckbi_locations[il], -- NS_GET_IID(nsILocalFile), -- getter_AddRefs(mozFile)); -+ char *fullModuleName = nsnull; -+ -+ if (!possible_ckbi_locations[il]) -+ { -+ fullModuleName = PR_GetLibraryName(nsnull, "nssckbi"); -+ } -+ else -+ { -+ directoryService->Get( possible_ckbi_locations[il], -+ NS_GET_IID(nsILocalFile), -+ getter_AddRefs(mozFile)); - -- if (!mozFile) { -- continue; -+ if (!mozFile) { -+ continue; -+ } -+ -+ nsCAutoString processDir; -+ mozFile->GetNativePath(processDir); -+ fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - } - -- char *fullModuleName = nsnull; --#ifdef XP_MAC -- nsCAutoString nativePath; -- mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files")); -- mozFile->AppendNative(LOADABLE_CERTS_MODULE); -- mozFile->GetNativePath(nativePath); -- fullModuleName = (char *) nativePath.get(); --#else -- nsCAutoString processDir; -- mozFile->GetNativePath(processDir); -- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); --#endif - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); - int modType; - SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType); - SECStatus rv_add = - SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0); --#ifndef XP_MAC -- PR_Free(fullModuleName); // allocated by NSPR --#endif -+ PR_FreeLibraryName(fullModuleName); // allocated by NSPR - if (SECSuccess == rv_add) { - // found a module, no need to try other directories - break; -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1492.2.17.2.3 -diff -u -r1.1492.2.17.2.3 configure ---- configure 11 Jan 2006 05:43:03 -0000 1.1492.2.17.2.3 -+++ configure 11 Jan 2006 22:12:39 -0000 -@@ -44,6 +44,13 @@ - --with-nspr-exec-prefix=PFX - Exec prefix where NSPR is installed" - ac_help="$ac_help -+ --with-system-nss Use system installed NSS" -+ac_help="$ac_help -+ --with-nss-prefix=PFX Prefix where NSS is installed" -+ac_help="$ac_help -+ --with-nss-exec-prefix=PFX -+ Exec prefix where NSS is installed" -+ac_help="$ac_help - --with-system-jpeg[=PFX] - Use system libjpeg [installed at prefix PFX]" - ac_help="$ac_help -@@ -1023,6 +1030,7 @@ - MOZPNG=10207 - MOZZLIB=1.2.3 - NSPR_VERSION=4 -+NSS_VERSION=3 - - GLIB_VERSION=1.2.0 - GTK_VERSION=1.2.0 -@@ -11308,6 +11316,123 @@ - fi - fi - -+ -+# Check whether --with-system-nss or --without-system-nss was given. -+if test "${with_system_nss+set}" = set; then -+ withval="$with_system_nss" -+ if test "$withval" = "yes"; then -+ _USE_SYSTEM_NSS=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$_USE_SYSTEM_NSS"; then -+ -+# Check whether --with-nss-prefix or --without-nss-prefix was given. -+if test "${with_nss_prefix+set}" = set; then -+ withval="$with_nss_prefix" -+ nss_config_prefix="$withval" -+else -+ nss_config_prefix="" -+fi -+ -+ -+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. -+if test "${with_nss_exec_prefix+set}" = set; then -+ withval="$with_nss_exec_prefix" -+ nss_config_exec_prefix="$withval" -+else -+ nss_config_exec_prefix="" -+fi -+ -+ -+ if test -n "$nss_config_exec_prefix"; then -+ nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" -+ if test -z "$NSS_CONFIG"; then -+ NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config -+ fi -+ fi -+ if test -n "$nss_config_prefix"; then -+ nss_config_args="$nss_config_args --prefix=$nss_config_prefix" -+ if test -z "$NSS_CONFIG"; then -+ 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:11371: 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. -+ ;; -+ ?:/*) -+ ac_cv_path_NSS_CONFIG="$NSS_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_NSS_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" -+ ;; -+esac -+fi -+NSS_CONFIG="$ac_cv_path_NSS_CONFIG" -+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:11406: 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` -+ -+ nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ fi -+ -+ if test -z "$no_nss"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_NATIVE_NSS=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ -+ -+ -+ -+ -+fi -+ - if test -z "$SKIP_LIBRARY_CHECKS"; then - # Check whether --with-system-jpeg or --without-system-jpeg was given. - if test "${with_system_jpeg+set}" = set; then -@@ -19491,6 +19620,9 @@ - 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%@GTK_CONFIG@%$GTK_CONFIG%g - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g -@@ -19771,6 +19903,7 @@ - s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g - s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g - s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g -+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g - s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g - s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g - s%@CROSS_COMPILE@%$CROSS_COMPILE%g diff --git a/thunderbird-1.5.0.12-source.tar.bz2 b/thunderbird-1.5.0.12-source.tar.bz2 deleted file mode 100644 index fa0fee6..0000000 --- a/thunderbird-1.5.0.12-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a347dadb3e84876cd99481ebb06af2e12d314683b432d6449c8d39aa3904a83 -size 36172395 diff --git a/thunderbird-2.0.0.0-source.tar.bz2 b/thunderbird-2.0.0.0-source.tar.bz2 new file mode 100644 index 0000000..9f943bf --- /dev/null +++ b/thunderbird-2.0.0.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:135f993277d4ef294a171c344547a8867f3cd0ec69b8a95db6b36fd7c56b5f91 +size 37629763 diff --git a/thunderbird-appname.patch b/thunderbird-appname.patch index 0551005..65412d8 100644 --- a/thunderbird-appname.patch +++ b/thunderbird-appname.patch @@ -1,25 +1,26 @@ Index: mail/components/shell/nsMailGNOMEIntegration.cpp =================================================================== RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v -retrieving revision 1.8 -diff -u -p -6 -r1.8 nsMailGNOMEIntegration.cpp ---- mail/components/shell/nsMailGNOMEIntegration.cpp 18 Jul 2005 17:51:32 -0000 1.8 -+++ mail/components/shell/nsMailGNOMEIntegration.cpp 20 Sep 2005 07:40:47 -0000 -@@ -89,12 +89,17 @@ nsMailGNOMEIntegration::Init() +retrieving revision 1.8.2.1 +diff -u -p -6 -r1.8.2.1 nsMailGNOMEIntegration.cpp +--- mail/components/shell/nsMailGNOMEIntegration.cpp 23 Oct 2006 03:32:47 -0000 1.8.2.1 ++++ mail/components/shell/nsMailGNOMEIntegration.cpp 19 Nov 2006 11:54:48 -0000 +@@ -94,12 +94,18 @@ nsMailGNOMEIntegration::Init() + NS_ENSURE_SUCCESS(rv, rv); + rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird")); NS_ENSURE_SUCCESS(rv, rv); rv = appPath->GetNativePath(mAppPath); - NS_ENSURE_SUCCESS(rv, rv); - ++ + /* This path of thunderbird is hardcoded for the default path setting + * And the above code is not used. + */ + mAppPath.Assign ("/usr/bin/thunderbird"); + - PRBool isDefault; - nsMailGNOMEIntegration::GetIsDefaultMailClient(&isDefault); - mShowMailDialog = !isDefault; + return rv; + } + + NS_IMPL_ISUPPORTS1(nsMailGNOMEIntegration, nsIShellService) + - nsMailGNOMEIntegration::GetIsDefaultNewsClient(&isDefault); - mShowNewsDialog = !isDefault; diff --git a/xul-picker.patch b/xul-picker.patch deleted file mode 100644 index 7300ff2..0000000 --- a/xul-picker.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: widget/src/gtk2/nsWidgetFactory.cpp -=================================================================== -RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWidgetFactory.cpp,v -retrieving revision 1.26.12.1 -diff -u -p -6 -r1.26.12.1 nsWidgetFactory.cpp ---- widget/src/gtk2/nsWidgetFactory.cpp 21 Apr 2006 21:43:42 -0000 1.26.12.1 -+++ widget/src/gtk2/nsWidgetFactory.cpp 25 Apr 2006 05:05:06 -0000 -@@ -52,12 +52,13 @@ - #include "nsBidiKeyboard.h" - #include "nsNativeKeyBindings.h" - - #include "nsIComponentRegistrar.h" - #include "nsComponentManagerUtils.h" - #include "nsAutoPtr.h" -+#include "prenv.h" - #include - - /* from nsFilePicker.js */ - #define XULFILEPICKER_CID \ - { 0x54ae32f8, 0x1dd2, 0x11b2, \ - { 0xa2, 0x09, 0xdf, 0x7c, 0x50, 0x53, 0x70, 0xf8} } -@@ -83,13 +84,13 @@ nsFilePickerConstructor(nsISupports *aOu - *aResult = nsnull; - if (aOuter != nsnull) { - return NS_ERROR_NO_AGGREGATION; - } - - nsCOMPtr picker; -- if (gtk_check_version(2,6,3) == NULL) { -+ if ( (gtk_check_version(2,6,3) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) { - picker = new nsFilePicker; - } else { - picker = do_CreateInstance(kXULFilePickerCID); - } - - if (!picker) {