--- firefox-2.0.0.14+1nobinonly.orig/browser/app/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/browser/app/Makefile.in
@@ -88,7 +88,9 @@
$(EXTRA_DSO_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
$(MOZ_JS_LIBS) \
+ -Wl,--no-as-needed \
$(XPCOM_LIBS) \
+ -Wl,--as-needed \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
--- firefox-2.0.0.14+1nobinonly.orig/browser/app/firefox-branding.js
+++ firefox-2.0.0.14+1nobinonly/browser/app/firefox-branding.js
@@ -1,14 +1,14 @@
-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
+pref("startup.homepage_override_url","http://www.ubuntu.com/download/releasenotes/610");
+pref("startup.homepage_welcome_url","http://www.ubuntu.com/download/releasenotes/610");
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
+pref("app.update.url.details", "file:///usr/share/ubuntu-artwork/home/index.html");
// Release notes URL
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+pref("app.releaseNotesURL", "http://www.ubuntu.com/download/releasenotes/610");
// Search codes belong only in builds with official branding
pref("browser.search.param.yahoo-fr", "");
--- firefox-2.0.0.14+1nobinonly.orig/browser/app/profile/firefox.js
+++ firefox-2.0.0.14+1nobinonly/browser/app/profile/firefox.js
@@ -80,12 +80,12 @@
// App-specific update preferences
// Whether or not app updates are enabled
-pref("app.update.enabled", true);
+pref("app.update.enabled", false);
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
// the UI easier to construct.
-pref("app.update.auto", true);
+pref("app.update.auto", false);
// Defines how the Application Update Service notifies the user about updates:
//
@@ -173,12 +173,12 @@
// Whether or not the application should check at startup each time if it
// is the default browser.
-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
pref("browser.startup.page", 1);
-pref("browser.startup.homepage", "resource:/browserconfig.properties");
+pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties");
pref("browser.cache.disk.capacity", 50000);
pref("browser.enable_automatic_image_resizing", true);
@@ -247,7 +247,7 @@
pref("browser.link.open_external", 3);
// handle links targeting new windows
-pref("browser.link.open_newwindow", 3);
+pref("browser.link.open_newwindow", 2);
// 0: no restrictions - divert everything
// 1: don't divert window.open at all
@@ -338,6 +338,9 @@
pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
// 0=lines, 1=pages, 2=history , 3=text size
#ifdef XP_MACOSX
// On OS X, if the wheel has one axis only, shift+wheel comes through as a
@@ -367,6 +370,8 @@
pref("mousewheel.withcontrolkey.sysnumlines",false);
pref("mousewheel.withcontrolkey.numlines",1);
+pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page
+
pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code
// Customizable toolbar stuff
@@ -414,6 +419,10 @@
pref("security.warn_viewing_mixed.show_once", true);
pref("security.warn_submit_insecure.show_once", true);
+// enable negotiate extension
+pref("network.negotiate-auth.trusted-uris", "https://");
+
+
#ifdef XP_UNIX
pref("browser.urlbar.clickSelectsAll", false);
#else
@@ -446,8 +455,8 @@
pref("browser.download.hide_plugins_without_extensions", true);
// Setting this pref to |true| forces BiDi UI menu items and keyboard shortcuts
-// to be exposed. By default, only expose it for bidi-associated system locales.
-pref("bidi.browser.ui", false);
+// to be exposed.
+pref("bidi.browser.ui", true);
// Backspace and Shift+Backspace behavior
// 0 goes Back/Forward
@@ -542,3 +551,7 @@
pref("browser.sessionstore.privacy_level", 1);
// number of remembered reopenable tabs (per window)
pref("browser.sessionstore.max_tabs_undo", 10);
+
+pref("mozilla.widget.raise-on-setfocus", false);
+
+pref("browser.startup.homepage_override.mstone","ignore");
--- firefox-2.0.0.14+1nobinonly.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -55,3 +55,5 @@
install::
$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+
+GARBAGE += $(FILES)
--- firefox-2.0.0.14+1nobinonly.orig/browser/base/jar.mn
+++ firefox-2.0.0.14+1nobinonly/browser/base/jar.mn
@@ -37,6 +37,7 @@
* content/browser/web-panels.js (content/web-panels.js)
* content/browser/web-panels.xul (content/web-panels.xul)
* content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul)
+* content/browser/ubuntuReportBugOverlay.js (content/ubuntuReportBugOverlay.js)
# XXX: We should exclude this one as well (bug 71895)
* content/browser/hiddenWindow.xul (content/hiddenWindow.xul)
#ifdef XP_MACOSX
--- firefox-2.0.0.14+1nobinonly.orig/browser/base/content/baseMenuOverlay.xul
+++ firefox-2.0.0.14+1nobinonly/browser/base/content/baseMenuOverlay.xul
@@ -51,6 +51,8 @@
+
+
#ifdef XP_MACOSX
+
+
+
+
+
+
#endif
+#if 0
+# The import wizard will usually show an empty nonfunctional dialogue.
+# So we disable it to improve discoverability of
+# Bookmarks / Manage Bookmarks ... // File / Import ...
+# https://bugzilla.mozilla.org/show_bug.cgi?id=117844
+# bugs.debian.org/350599
+#endif
#ifndef XP_MACOSX
#endif
--- firefox-2.0.0.14+1nobinonly.orig/browser/base/content/utilityOverlay.js
+++ firefox-2.0.0.14+1nobinonly/browser/base/content/utilityOverlay.js
@@ -486,3 +486,13 @@
else
checkForUpdates.removeAttribute("loading");
}
+
+function getHelpOnline(event)
+{
+ openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+gethelp", event, false, true);
+}
+
+function helpTranslateLaunchpad(event)
+{
+ openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+translate", event, false, true);
+}
--- firefox-2.0.0.14+1nobinonly.orig/browser/base/content/ubuntuReportBugOverlay.js
+++ firefox-2.0.0.14+1nobinonly/browser/base/content/ubuntuReportBugOverlay.js
@@ -0,0 +1,62 @@
+/*
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Alexander Sack
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+*/
+
+function ubuntuReportBug(event) {
+
+ var executable =
+ Components.classes['@mozilla.org/file/local;1']
+ .createInstance(Components.interfaces.nsILocalFile);
+
+ executable.initWithPath("/usr/bin/ubuntu-bug");
+
+ if(!executable.isExecutable)
+ alert('NOasd');
+
+ var procUtil =
+ Components.classes['@mozilla.org/process/util;1']
+ .createInstance(Components.interfaces.nsIProcess);
+
+ var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
+
+ procUtil.init(executable);
+
+ var args = new Array("-p", "firefox" );
+ var res = procUtil.run(false, args, args.length);
+}
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/bookmarks/content/bookmarksManager.xul
+++ firefox-2.0.0.14+1nobinonly/browser/components/bookmarks/content/bookmarksManager.xul
@@ -52,7 +52,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:web="http://home.netscape.com/WEB-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- width="630" height="400" screenX="20" screenY="20"
+ width="740" height="400" screenX="20" screenY="20"
persist="width height screenX screenY sizemode"
onload="Startup();" onunload="Shutdown();"
onclose="return closeWindow(false);">
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/nsBrowserContentHandler.js
+++ firefox-2.0.0.14+1nobinonly/browser/components/nsBrowserContentHandler.js
@@ -494,29 +494,8 @@
var overridePage = "";
var haveUpdateSession = false;
- try {
- switch (needHomepageOverride(prefb)) {
- case OVERRIDE_NEW_PROFILE:
- // New profile.
- overridePage = formatter.formatURLPref("startup.homepage_welcome_url");
- break;
- case OVERRIDE_NEW_MSTONE:
- // Existing profile.
- copyPrefOverride();
-
- // Check whether we have a session to restore. If we do, we assume
- // that this is an "update" session.
- var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"]
- .getService(Components.interfaces.nsISessionStartup);
- haveUpdateSession = ss.doRestore();
- overridePage = formatter.formatURLPref("startup.homepage_override_url");
- break;
- }
- } catch (e) {}
-
- // formatURLPref might return "about:blank" if getting the pref fails
- if (overridePage == "about:blank")
- overridePage = "";
+ var pagesToLoad = "";
+ var overrideState = needHomepageOverride(prefb);
var startPage = "";
try {
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/feeds/src/FeedWriter.js
+++ firefox-2.0.0.14+1nobinonly/browser/components/feeds/src/FeedWriter.js
@@ -799,8 +799,15 @@
getInterface(Ci.nsIWebNavigation).
QueryInterface(Ci.nsIDocShell_MOZILLA_1_8_BRANCH).
currentDocumentChannel;
- const kPrefix = "jar:file:";
- if (chan.URI.spec.substring(0, kPrefix.length) == kPrefix)
+ const SUBSCRIBE_PAGE_URI = "chrome://browser/content/feeds/subscribe.xhtml";
+ var uri = Cc["@mozilla.org/network/io-service;1"].
+ getService(Ci.nsIIOService).
+ newURI(SUBSCRIBE_PAGE_URI, "", null);
+ var resolvedURI = Cc["@mozilla.org/chrome/chrome-registry;1"].
+ getService(Ci.nsIChromeRegistry).
+ convertChromeURL(uri);
+
+ if (resolvedURI.equals(chan.URI))
return chan.originalURI;
else
return null;
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/microsummaries/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/browser/components/microsummaries/src/Makefile.in
@@ -44,6 +44,7 @@
MODULE = microsummaries
EXTRA_COMPONENTS = nsMicrosummaryService.js
+GARBAGE += nsMicrosummaryService.js
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/preferences/main.js
+++ firefox-2.0.0.14+1nobinonly/browser/components/preferences/main.js
@@ -355,9 +355,13 @@
#ifdef XP_MACOSX
return "UsrDocs";
#else
+#ifdef XP_UNIX
+ return aFolderType == "Desktop" ? "Desk" : "Home";
+#else
return "Home";
#endif
#endif
+#endif
throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
},
--- firefox-2.0.0.14+1nobinonly.orig/browser/components/shell/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/browser/components/shell/src/Makefile.in
@@ -76,21 +76,16 @@
ifdef CPPSRCS
LIBRARY_NAME = shellservice_s
-endif
-
+endif
FORCE_STATIC_LIB = 1
+EXTRA_COMPONENTS = nsSetDefaultBrowser.js
+
include $(topsrcdir)/config/rules.mk
DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
-JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js
-
CXXFLAGS += $(TK_CFLAGS)
-libs::
- $(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components
-
clobber::
rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
- rm -f $(DIST)/bin/components/$(JS_SET_BROWSER_COMPONENT)
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/browser/locales/Makefile.in
@@ -56,6 +56,8 @@
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
$(NULL)
+
+GARBAGE = $(SUBMAKEFILES)
endif
# This makefile uses variable overrides from the libs-% target to
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -32,6 +32,9 @@
+
+
+
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser/pageInfo.dtd
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser/pageInfo.dtd
@@ -39,7 +39,7 @@
-
+
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser/preferences/colors.dtd
@@ -1,5 +1,5 @@
-
+
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser/preferences/connection.dtd
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser/preferences/connection.dtd
@@ -1,6 +1,6 @@
-
+
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -3,7 +3,7 @@
-
+
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/chrome/browser-region/region.properties
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/chrome/browser-region/region.properties
@@ -13,5 +13,10 @@
browser.contentHandlers.types.2.title=Google
browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+releaseNotesURL=http://www.ubuntu.com/download/releasenotes/610
+homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html
+browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html
+browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
+
# Keyword URL (for location bar searches)
keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--- firefox-2.0.0.14+1nobinonly.orig/browser/locales/en-US/profile/bookmarks.html
+++ firefox-2.0.0.14+1nobinonly/browser/locales/en-US/profile/bookmarks.html
@@ -13,11 +13,19 @@
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
- Getting Started
-
- Latest Headlines
+
- Latest BBC Headlines
- Mozilla Firefox
+ Ubuntu and Free Software links
+Information and resources about Ubuntu, Debian and Free Software in general
+
- Ubuntu
+
- Ubuntu Support Home
+
- Ubuntu Wiki (community-edited website)
+
- Make a Support Request to the Ubuntu Community
+
- Free Software Foundation
+
- Debian (Ubuntu is based on Debian)
+
Mozilla Firefox
- Help and Tutorials
- Customize Firefox
- Get Involved
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/altoptions.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/altoptions.m4
@@ -55,7 +55,7 @@
dnl MOZ_TWO_STRING_TEST(NAME, VAL, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
-AC_DEFUN(MOZ_TWO_STRING_TEST,
+AC_DEFUN([MOZ_TWO_STRING_TEST],
[if test "[$2]" = "[$3]"; then
ifelse([$4], , :, [$4])
elif test "[$2]" = "[$5]"; then
@@ -67,23 +67,23 @@
fi])
dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
+AC_DEFUN([MOZ_ARG_ENABLE_BOOL],
[AC_ARG_ENABLE([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4])],
[$5])])
dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
-AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
+AC_DEFUN([MOZ_ARG_DISABLE_BOOL],
[AC_ARG_ENABLE([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])],
[$5])])
dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_ENABLE_STRING,
+AC_DEFUN([MOZ_ARG_ENABLE_STRING],
[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
+AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING],
[ifelse([$5], ,
[errprint([Option, $1, needs an "IF-SET" argument.
])
@@ -93,19 +93,19 @@
[$6])])])
dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_BOOL,
+AC_DEFUN([MOZ_ARG_WITH_BOOL],
[AC_ARG_WITH([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])],
[$5])])
dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
-AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
+AC_DEFUN([MOZ_ARG_WITHOUT_BOOL],
[AC_ARG_WITH([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])],
[$5])])
dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_STRING,
+AC_DEFUN([MOZ_ARG_WITH_STRING],
[AC_ARG_WITH([$1], [$2], [$3], [$4])])
dnl MOZ_ARG_HEADER(Comment)
@@ -118,7 +118,7 @@
dnl using it
dnl
dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN(MOZ_CHECK_PTHREADS,
+AC_DEFUN([MOZ_CHECK_PTHREADS],
[
AC_MSG_CHECKING([for pthread_create in -l$1])
echo "
@@ -145,7 +145,7 @@
])
dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
-AC_DEFUN(MOZ_READ_MOZCONFIG,
+AC_DEFUN([MOZ_READ_MOZCONFIG],
[AC_REQUIRE([AC_INIT_BINSH])dnl
# Read in '.mozconfig' script to set the initial options.
# See the mozconfig2configure script for more details.
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/freetype2.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/freetype2.m4
@@ -4,7 +4,7 @@
dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
dnl
-AC_DEFUN(AC_CHECK_FT2,
+AC_DEFUN([AC_CHECK_FT2],
[dnl
dnl Get the cflags and libraries from the freetype-config script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/glib.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/glib.m4
@@ -5,7 +5,7 @@
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config
dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
[dnl
dnl Get the cflags and libraries from the glib-config script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/gtk.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/gtk.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/libIDL-2.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/libIDL-2.m4
@@ -3,7 +3,7 @@
dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBIDL_2,
+AC_DEFUN([AM_PATH_LIBIDL_2],
[dnl
dnl Get the cflags and libraries from the libIDL-config-2 script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/libIDL.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/libIDL.m4
@@ -3,7 +3,7 @@
dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBIDL,
+AC_DEFUN([AM_PATH_LIBIDL],
[dnl
dnl Get the cflags and libraries from the libIDL-config script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/libart.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/libart.m4
@@ -8,7 +8,7 @@
dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBART,
+AC_DEFUN([AM_PATH_LIBART],
[dnl
dnl Get the cflags and libraries from the libart-config script
dnl
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/nspr.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/nspr.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
+AC_DEFUN([AM_PATH_NSPR],
[dnl
AC_ARG_WITH(nspr-prefix,
--- firefox-2.0.0.14+1nobinonly.orig/build/autoconf/pkg.m4
+++ firefox-2.0.0.14+1nobinonly/build/autoconf/pkg.m4
@@ -2,7 +2,7 @@
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
+AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
--- firefox-2.0.0.14+1nobinonly.orig/build/unix/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/build/unix/Makefile.in
@@ -71,7 +71,7 @@
$(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \
$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
-GARBAGE = $(pkg_config_files) mozilla-config
+GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config
$(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
cat $< | sed \
--- firefox-2.0.0.14+1nobinonly.orig/nsprpub/config/nspr.m4
+++ firefox-2.0.0.14+1nobinonly/nsprpub/config/nspr.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
+AC_DEFUN([AM_PATH_NSPR],
[dnl
AC_ARG_WITH(nspr-prefix,
--- firefox-2.0.0.14+1nobinonly.orig/security/nss/cmd/shlibsign/Makefile
+++ firefox-2.0.0.14+1nobinonly/security/nss/cmd/shlibsign/Makefile
@@ -99,5 +99,5 @@
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
endif
-libs install :: $(CHECKLOC)
+libs install ::
--- firefox-2.0.0.14+1nobinonly.orig/security/nss/lib/freebl/unix_rand.c
+++ firefox-2.0.0.14+1nobinonly/security/nss/lib/freebl/unix_rand.c
@@ -876,7 +876,11 @@
/* Fork netstat to collect its output by default. Do not unset this unless
* another source of entropy is available
*/
+#ifndef LINUX
#define DO_NETSTAT 1
+#else
+#define DO_NETSTAT 0
+#endif
void RNG_SystemInfoForRNG(void)
{
--- firefox-2.0.0.14+1nobinonly.orig/security/manager/pki/resources/content/certManager.xul
+++ firefox-2.0.0.14+1nobinonly/security/manager/pki/resources/content/certManager.xul
@@ -53,7 +53,7 @@
onload="LoadCerts();"
#expand buttons="accept__HELP_BUTTON__"
ondialoghelp="return doHelpButton();"
- style="width: 48em; height: 32em;"
+ style="width: 56em; height: 32em;"
persist="screenX screenY width height">
--- firefox-2.0.0.14+1nobinonly.orig/security/manager/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/security/manager/Makefile.in
@@ -53,7 +53,6 @@
SMIME3_LIB \
SSL3_LIB \
SOFTOKEN3_LIB \
- SOFTOKEN3_CHK \
LOADABLE_ROOT_MODULE \
HAVE_FREEBL_LIBS \
HAVE_FREEBL_LIBS_32 \
@@ -68,7 +67,6 @@
SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
# Default
HAVE_FREEBL_LIBS = 1
@@ -99,23 +97,17 @@
ifdef HAVE_FREEBL_LIBS
FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX)
-FREEBL_CHK = $(DLL_PREFIX)freebl3.chk
endif
ifdef HAVE_FREEBL_LIBS_32
FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX)
-FREEBL_32INT_CHK = libfreebl_32int_3.chk
FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX)
-FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk
endif
ifdef HAVE_FREEBL_LIBS_32INT64
FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX)
-FREEBL_32INT64_CHK = libfreebl_32int64_3.chk
endif
ifdef HAVE_FREEBL_LIBS_64
FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX)
-FREEBL_64INT_CHK = libfreebl_64int_3.chk
FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
-FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
endif
ABS_DIST := $(shell cd $(DIST) && pwd)
@@ -206,7 +198,6 @@
OS_ARCH="$(OS_ARCH)" \
CPU_ARCH="$(TARGET_CPU)" \
$(NULL)
-SKIP_CHK=1
endif
SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
@@ -219,13 +210,13 @@
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
touch $@
endif
+GARBAGE += .nss.cleaned
+
.nss.checkout:
ifndef MOZ_NATIVE_NSS
touch $(srcdir)/$@
@@ -250,43 +241,24 @@
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)
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
endif
@@ -301,38 +273,21 @@
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)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
endif
@@ -354,11 +309,9 @@
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 $@
--- firefox-2.0.0.14+1nobinonly.orig/directory/c-sdk/config/autoconf/nspr.m4
+++ firefox-2.0.0.14+1nobinonly/directory/c-sdk/config/autoconf/nspr.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
+AC_DEFUN([AM_PATH_NSPR],
[dnl
AC_ARG_WITH(nspr-prefix,
--- firefox-2.0.0.14+1nobinonly.orig/modules/libpref/src/init/all.js
+++ firefox-2.0.0.14+1nobinonly/modules/libpref/src/init/all.js
@@ -49,10 +49,11 @@
pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
pref("keyword.enabled", false);
-pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
-pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
-pref("general.config.obscure_value", 13); // for MCD .cfg files
+pref("general.config.obscure_value", 0); // for MCD .cfg files
+pref("general.config.filename", "firefox.cfg");
// maximum number of dated backups to keep at any time
pref("browser.bookmarks.max_backups", 5);
@@ -459,7 +460,7 @@
// 2 = openAbused
pref("privacy.popups.disable_from_plugins", 2);
-pref("dom.event.contextmenu.enabled", true);
+pref("dom.event.contextmenu.enabled", false);
pref("javascript.enabled", true);
pref("javascript.allow.mailnews", false);
@@ -769,32 +770,32 @@
pref("ime.password.onFocus.dontCare", false);
pref("ime.password.onBlur.dontCare", false);
-pref("intl.accept_languages", "chrome://navigator/locale/navigator.properties");
+pref("intl.accept_languages", "chrome://global/locale/intl.properties");
pref("intl.accept_charsets", "iso-8859-1,*,utf-8");
-pref("intl.collationOption", "chrome://navigator-platform/locale/navigator.properties");
-pref("intl.menuitems.alwaysappendaccesskeys","chrome://navigator/locale/navigator.properties");
-pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.static", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more1", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more2", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more3", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more4", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more5", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.unicode", "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.mailedit", "chrome://navigator/locale/navigator.properties");
+pref("intl.collationOption", "chrome://global-platform/locale/intl.properties");
+pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.unicode", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.cache", "");
pref("intl.charsetmenu.mailview.cache", "");
pref("intl.charsetmenu.composer.cache", "");
pref("intl.charsetmenu.browser.cache.size", 5);
-pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties");
-pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties");
-pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties");
+pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
+pref("intl.content.langcode", "chrome://browser-region/locale/region.properties");
pref("intl.locale.matchOS", false);
// fallback charset list for Unicode conversion (converting from Unicode)
// currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
// for ISO-8859-1
pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
-pref("font.language.group", "chrome://navigator/locale/navigator.properties");
+pref("font.language.group", "chrome://global/locale/intl.properties");
pref("images.dither", "auto");
pref("security.directory", "");
@@ -1218,7 +1219,7 @@
pref("font.size.variable.ar", 16);
pref("font.size.fixed.ar", 13);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 13);
@@ -1234,11 +1235,11 @@
pref("font.size.variable.ko", 16);
pref("font.size.fixed.ko", 16);
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 13);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
@@ -1478,7 +1479,7 @@
pref("font.size.variable.ar", 15);
pref("font.size.fixed.ar", 13);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 13);
@@ -1494,11 +1495,11 @@
pref("font.size.variable.ko", 16);
pref("font.size.fixed.ko", 16);
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 13);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
@@ -1656,7 +1657,7 @@
pref("font.size.variable.ar", 16);
pref("font.size.fixed.ar", 13);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 13);
@@ -1672,11 +1673,11 @@
pref("font.size.variable.ko", 16);
pref("font.size.fixed.ko", 16);
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 13);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
@@ -1769,7 +1770,7 @@
pref("font.size.variable.ar", 16);
pref("font.size.fixed.ar", 13);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 13);
@@ -1785,11 +1786,11 @@
pref("font.size.variable.ko", 16);
pref("font.size.fixed.ko", 16);
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 13);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 13);
@@ -1895,7 +1896,7 @@
pref("applications.tn3270", "xterm -e tn3270 %h");
pref("applications.rlogin", "xterm -e rlogin %h");
pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
-pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
+pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
pref("print.printer_list", ""); // list of printers, separated by spaces
pref("print.print_reversed", false);
pref("print.print_color", true);
@@ -2045,7 +2046,7 @@
pref("font.size.variable.ar", 16);
pref("font.size.fixed.ar", 12);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
pref("font.size.fixed.el", 12);
@@ -2061,11 +2062,11 @@
pref("font.size.variable.ko", 16);
pref("font.size.fixed.ko", 16);
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
pref("font.size.fixed.th", 12);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
pref("font.size.fixed.tr", 12);
@@ -2232,7 +2233,7 @@
// pref("print.postscript.enabled", true);
pref("print.postscript.paper_size", "letter");
pref("print.postscript.orientation", "portrait");
-pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
+pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
/* PostScript print module font config
* this list is used by the postscript font
--- firefox-2.0.0.14+1nobinonly.orig/modules/libpref/src/nsPrefService.cpp
+++ firefox-2.0.0.14+1nobinonly/modules/libpref/src/nsPrefService.cpp
@@ -758,6 +758,21 @@
NS_WARNING("Error parsing application default preferences.");
}
+ // Load files from defaults/syspref
+ nsCOMPtr SysPrefDir;
+ rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir));
+ NS_ENSURE_SUCCESS(rv, rv);
+ rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref"));
+ NS_ENSURE_SUCCESS(rv, rv);
+ PRBool exists;
+ if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) {
+ rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0);
+ if (NS_FAILED(rv)) {
+ NS_WARNING("Error parsing system default preferences.");
+ }
+
+ }
+
// xxxbsmedberg: TODO load default prefs from a category
// but the architecture is not quite there yet
--- firefox-2.0.0.14+1nobinonly.orig/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+++ firefox-2.0.0.14+1nobinonly/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
@@ -88,6 +88,9 @@
nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2()
{
if(mGtkSocket) {
+ GtkWidget **widget = &mGtkSocket;
+ g_object_remove_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget);
+
gtk_widget_destroy(mGtkSocket);
mGtkSocket = 0;
}
@@ -147,6 +150,9 @@
GdkWindow *win = gdk_window_lookup((XID)window);
mGtkSocket = gtk_socket_new();
+ GtkWidget **widget = &mGtkSocket;
+ g_object_add_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget);
+
//attach the socket to the container widget
gtk_widget_set_parent_window(mGtkSocket, win);
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/components/printing/content/printdialog.js
+++ firefox-2.0.0.14+1nobinonly/toolkit/components/printing/content/printdialog.js
@@ -160,6 +160,11 @@
if (strDefaultPrinterName == "")
strDefaultPrinterName = printerNameStr;
+ // We strip PostScript/ from the front of displayed printer
+ // names. It's a bit kludgy to do this here but at least
+ // for Ubuntu all the printers come via CUPS.
+ var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
+
list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
}
if (strDefaultPrinterName != "") {
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/library/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/toolkit/library/Makefile.in
@@ -406,9 +406,13 @@
dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp
$(INSTALL) $^ .
+GARBAGE += dlldeps.cpp dlldeps-obs.cpp
+
ifdef MOZ_JAVAXPCOM
export:: dlldeps-javaxpcom.cpp
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
$(INSTALL) $^ .
+
+GARBAGE += dlldeps-javaxpcom.cpp
endif
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
+++ firefox-2.0.0.14+1nobinonly/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
@@ -1,4 +1,5 @@
+
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/mozapps/downloads/content/downloads.js
+++ firefox-2.0.0.14+1nobinonly/toolkit/mozapps/downloads/content/downloads.js
@@ -790,9 +790,13 @@
#ifdef XP_MACOSX
return "UsrDocs";
#else
+#ifdef XP_UNIX
+ return aFolderType == "Desktop" ? "Desk" : "Home";
+#else
return "Home";
#endif
#endif
+#endif
}
function getDownloadsFolder(aFolder)
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/mozapps/downloads/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/toolkit/mozapps/downloads/src/Makefile.in
@@ -45,6 +45,7 @@
MODULE = helperAppDlg
EXTRA_COMPONENTS = nsHelperAppDlg.js
+GARBAGE += nsHelperAppDlg.js
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/mozapps/extensions/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/toolkit/mozapps/extensions/src/Makefile.in
@@ -45,6 +45,7 @@
MODULE = extensions
EXTRA_COMPONENTS = nsExtensionManager.js
+GARBAGE += nsExtensionManager.js
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/mozapps/update/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/toolkit/mozapps/update/src/Makefile.in
@@ -49,6 +49,7 @@
endif
EXTRA_COMPONENTS = nsUpdateService.js
+GARBAGE += nsUpdateService.js
ifeq ($(OS_ARCH),WINNT)
EXTRA_COMPONENTS += nsPostUpdateWin.js
--- firefox-2.0.0.14+1nobinonly.orig/toolkit/xre/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/toolkit/xre/Makefile.in
@@ -160,16 +160,14 @@
SHAREDCPPSRCS += nsSigHandlers.cpp
endif
-GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX))
+GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
ifeq ($(OS_ARCH),WINNT)
-GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS))
+GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS))
endif
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-ifndef MOZ_ENABLE_LIBXUL
GARBAGE += $(STACKWALK_SRC_LCSRCS)
endif
-endif
SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
--- firefox-2.0.0.14+1nobinonly.orig/extensions/pref/system-pref/src/gconf/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/extensions/pref/system-pref/src/gconf/Makefile.in
@@ -87,3 +87,5 @@
export::
$(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp .
+
+GARBAGE += nsSystemPrefFactory.cpp
--- firefox-2.0.0.14+1nobinonly.orig/extensions/spellcheck/myspell/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/extensions/spellcheck/myspell/src/Makefile.in
@@ -60,15 +60,18 @@
xulapp \
$(NULL)
-CPPSRCS = affentry.cpp \
- affixmgr.cpp \
- hashmgr.cpp \
- suggestmgr.cpp \
- csutil.cpp \
- myspell.cpp \
- mozMySpell.cpp \
- mozMySpellFactory.cpp \
+CPPSRCS = mozMySpell.cpp \
+ mozMySpellFactory.cpp \
$(NULL)
+ifndef MOZ_NATIVE_MYSPELL
+CPPSRCS += affentry.cpp \
+ affixmgr.cpp \
+ hashmgr.cpp \
+ suggestmgr.cpp \
+ csutil.cpp \
+ myspell.cpp \
+ $(NULL)
+endif
ifdef MOZ_XUL_APP
CPPSRCS += mozMySpellDirProvider.cpp
@@ -79,6 +82,11 @@
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_MYSPELL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_MYSPELL
+CXXFLAGS += $(MOZ_MYSPELL_CFLAGS)
+endif
--- firefox-2.0.0.14+1nobinonly.orig/extensions/spellcheck/myspell/src/mozMySpell.h
+++ firefox-2.0.0.14+1nobinonly/extensions/spellcheck/myspell/src/mozMySpell.h
@@ -56,7 +56,7 @@
#ifndef mozMySpell_h__
#define mozMySpell_h__
-#include "myspell.hxx"
+#include "hunspell.hxx"
#include "mozISpellCheckingEngine.h"
#include "mozIPersonalDictionary.h"
#include "nsString.h"
--- firefox-2.0.0.14+1nobinonly.orig/extensions/transformiix/source/base/Double.cpp
+++ firefox-2.0.0.14+1nobinonly/extensions/transformiix/source/base/Double.cpp
@@ -75,14 +75,7 @@
#define CPU_IS_ARM
#endif
-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
-/**
- * This version of the macros is safe for the alias optimizations
- * that gcc does, but uses gcc-specific extensions.
- */
-
typedef union txdpun {
- PRFloat64 d;
struct {
#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
PRUint32 lo, hi;
@@ -90,8 +83,14 @@
PRUint32 hi, lo;
#endif
} s;
+ PRFloat64 d;
} txdpun;
+#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+/**
+ * This version of the macros is safe for the alias optimizations
+ * that gcc does, but uses gcc-specific extensions.
+ */
#define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
#define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
@@ -117,20 +116,20 @@
//-- Initialize Double related constants
#ifdef IS_BIG_ENDIAN
-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
- 0xffffffff};
-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0};
-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
+const txdpun nanMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
+ 0xffffffff};
+const txdpun infMask = {TX_DOUBLE_HI32_EXPMASK, 0};
+const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
#else
-const PRUint32 nanMask[2] = {0xffffffff,
- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK};
-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
+const txdpun nanMask = {0xffffffff,
+ TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
+const txdpun infMask = {0, TX_DOUBLE_HI32_EXPMASK};
+const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
#endif
-const double Double::NaN = *((double*)nanMask);
-const double Double::POSITIVE_INFINITY = *((double*)infMask);
-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
+const double Double::NaN = nanMask.d;
+const double Double::POSITIVE_INFINITY = infMask.d;
+const double Double::NEGATIVE_INFINITY = negInfMask.d;
/*
* Determines whether the given double represents positive or negative
--- firefox-2.0.0.14+1nobinonly.orig/configure
+++ firefox-2.0.0.14+1nobinonly/configure
@@ -60,6 +60,8 @@
--with-system-png[=PFX]
Use system libpng [installed at prefix PFX]"
ac_help="$ac_help
+ --enable-system-myspell Use system myspell (located with pkgconfig)"
+ac_help="$ac_help
--with-java-include-path=dir Location of Java SDK headers"
ac_help="$ac_help
--with-java-bin-path=dir Location of Java binaries (java, javac, jar)"
@@ -146,6 +148,8 @@
ac_help="$ac_help
--enable-ctl Enable Thai Complex Script support"
ac_help="$ac_help
+ --disable-libthai Disable Thai word break support with libthai"
+ac_help="$ac_help
--disable-view-source Disable view source support"
ac_help="$ac_help
--disable-accessibility Disable accessibility support"
@@ -960,7 +964,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:964: checking host system type" >&5
+echo "configure:968: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -981,7 +985,7 @@
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:985: checking target system type" >&5
+echo "configure:989: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -999,7 +1003,7 @@
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1003: checking build system type" >&5
+echo "configure:1007: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1069,12 +1073,12 @@
LIBGNOME_VERSION=2.0
MISSING_X=
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1078: checking for $ac_word" >&5
+echo "configure:1082: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1172,7 +1176,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1176: checking for $ac_word" >&5
+echo "configure:1180: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1214,7 +1218,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1218: checking for $ac_word" >&5
+echo "configure:1222: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1285,13 +1289,13 @@
_SAVE_LDFLAGS="$LDFLAGS"
echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
-echo "configure:1289: checking for host c compiler" >&5
+echo "configure:1293: checking for host c compiler" >&5
for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1295: checking for $ac_word" >&5
+echo "configure:1299: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1326,13 +1330,13 @@
fi
echo "$ac_t""$HOST_CC" 1>&6
echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
-echo "configure:1330: checking for host c++ compiler" >&5
+echo "configure:1334: checking for host c++ compiler" >&5
for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1336: checking for $ac_word" >&5
+echo "configure:1340: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1381,7 +1385,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1385: checking for $ac_word" >&5
+echo "configure:1389: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1416,7 +1420,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1420: checking for $ac_word" >&5
+echo "configure:1424: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1451,16 +1455,16 @@
LDFLAGS="$HOST_LDFLAGS"
echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1459: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
else
@@ -1475,16 +1479,16 @@
CFLAGS="$HOST_CXXFLAGS"
echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1483: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
else
@@ -1513,7 +1517,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1517: checking for $ac_word" >&5
+echo "configure:1521: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1547,7 +1551,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1551: checking for $ac_word" >&5
+echo "configure:1555: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1577,7 +1581,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1581: checking for $ac_word" >&5
+echo "configure:1585: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1628,7 +1632,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1632: checking for $ac_word" >&5
+echo "configure:1636: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1660,7 +1664,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1671,12 +1675,12 @@
cat > conftest.$ac_ext << EOF
-#line 1675 "configure"
+#line 1679 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1702,12 +1706,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1711: checking whether we are using GNU C" >&5
+echo "configure:1715: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1716,7 +1720,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1735,7 +1739,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1743: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1771,7 +1775,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1775: checking for $ac_word" >&5
+echo "configure:1779: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1807,7 +1811,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1811: checking for $ac_word" >&5
+echo "configure:1815: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1839,7 +1843,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1847: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1850,12 +1854,12 @@
cat > conftest.$ac_ext << EOF
-#line 1854 "configure"
+#line 1858 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1881,12 +1885,12 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1889: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1890: checking whether we are using GNU C++" >&5
+echo "configure:1894: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1895,7 +1899,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1914,7 +1918,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1922: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1945,57 +1949,6 @@
fi
fi
-for ac_declaration in \
- ''\
- '#include ' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat > conftest.$ac_ext <
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- :
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- continue
-fi
-rm -f conftest*
- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- break
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-
case "$build:$target" in
powerpc-apple-darwin8*:i?86-apple-darwin*)
@@ -2009,7 +1962,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2013: checking for $ac_word" >&5
+echo "configure:1966: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2044,7 +1997,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2048: checking for $ac_word" >&5
+echo "configure:2001: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2079,7 +2032,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2083: checking for $ac_word" >&5
+echo "configure:2036: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2120,7 +2073,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2124: checking for $ac_word" >&5
+echo "configure:2077: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2155,7 +2108,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2159: checking for $ac_word" >&5
+echo "configure:2112: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2190,7 +2143,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2194: checking for $ac_word" >&5
+echo "configure:2147: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2228,7 +2181,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2232: checking for $ac_word" >&5
+echo "configure:2185: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2258,7 +2211,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2262: checking for $ac_word" >&5
+echo "configure:2215: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2309,7 +2262,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2313: checking for $ac_word" >&5
+echo "configure:2266: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2341,7 +2294,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2298: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2352,12 +2305,12 @@
cat > conftest.$ac_ext << EOF
-#line 2356 "configure"
+#line 2309 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -2383,12 +2336,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2340: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2392: checking whether we are using GNU C" >&5
+echo "configure:2345: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2397,7 +2350,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -2416,7 +2369,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2373: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2452,7 +2405,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2456: checking for $ac_word" >&5
+echo "configure:2409: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2484,7 +2437,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2441: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2495,12 +2448,12 @@
cat > conftest.$ac_ext << EOF
-#line 2499 "configure"
+#line 2452 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -2526,12 +2479,12 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2483: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:2535: checking whether we are using GNU C++" >&5
+echo "configure:2488: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2540,7 +2493,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -2559,7 +2512,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2516: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2590,61 +2543,10 @@
fi
fi
-for ac_declaration in \
- ''\
- '#include ' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat > conftest.$ac_ext <
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- :
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- continue
-fi
-rm -f conftest*
- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- break
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2648: checking for $ac_word" >&5
+echo "configure:2550: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2676,7 +2578,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2680: checking for $ac_word" >&5
+echo "configure:2582: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2717,7 +2619,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2721: checking for $ac_word" >&5
+echo "configure:2623: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2752,7 +2654,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2756: checking for $ac_word" >&5
+echo "configure:2658: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2787,7 +2689,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2791: checking for $ac_word" >&5
+echo "configure:2693: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2822,7 +2724,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2826: checking for $ac_word" >&5
+echo "configure:2728: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2911,7 +2813,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2915: checking for $ac_word" >&5
+echo "configure:2817: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2953,14 +2855,14 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -2978,14 +2880,14 @@
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <
int main() {
unsigned *test = new unsigned(42);
; return 0; }
EOF
-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -3041,7 +2943,7 @@
_MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
# Add flags if necessary
echo $ac_n "checking for midl flags""... $ac_c" 1>&6
-echo "configure:3045: checking for midl flags" >&5
+echo "configure:2947: checking for midl flags" >&5
if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then
# Starting with MIDL version 6.0.359, the MIDL compiler
# generates /Oicf /robust stubs by default, which is not
@@ -3063,9 +2965,9 @@
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
_W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
-echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5
+echo "configure:2969: checking for w32api version >= $W32API_VERSION" >&5
cat > conftest.$ac_ext <
int main() {
@@ -3077,7 +2979,7 @@
; return 0; }
EOF
-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
res=yes
else
@@ -3093,7 +2995,7 @@
fi
# Check windres version
echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5
+echo "configure:2999: checking for windres version >= $WINDRES_VERSION" >&5
_WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
echo "$ac_t""$_WINDRES_VERSION" 1>&6
_WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
@@ -3120,7 +3022,7 @@
SKIP_COMPILER_CHECKS=1
SKIP_LIBRARY_CHECKS=1
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3124: checking how to run the C preprocessor" >&5
+echo "configure:3026: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -3135,13 +3037,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3152,13 +3054,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3169,13 +3071,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3203,17 +3105,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3207: checking for $ac_hdr" >&5
+echo "configure:3109: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3244,10 +3146,10 @@
if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
if test "x$CC" != xcc; then
echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:3150: checking whether $CC and cc understand -c and -o together" >&5
else
echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:3251: checking whether cc understands -c and -o together" >&5
+echo "configure:3153: checking whether cc understands -c and -o together" >&5
fi
set dummy $CC; ac_cc="`echo $2 |
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
@@ -3259,16 +3161,16 @@
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:3165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
ac_try='cc -c conftest.c -o conftest.o 1>&5'
- if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ if { (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
# cc works too.
:
@@ -3304,7 +3206,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3308: checking how to run the C preprocessor" >&5
+echo "configure:3210: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -3319,13 +3221,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3336,13 +3238,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3353,13 +3255,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3384,7 +3286,7 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:3388: checking how to run the C++ preprocessor" >&5
+echo "configure:3290: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3397,12 +3299,12 @@
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -3449,7 +3351,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3453: checking for a BSD compatible install" >&5
+echo "configure:3355: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3502,7 +3404,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3506: checking whether ln -s works" >&5
+echo "configure:3408: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3527,7 +3429,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3531: checking for $ac_word" >&5
+echo "configure:3433: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3567,7 +3469,7 @@
fi
echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5
+echo "configure:3473: checking for minimum required perl version >= $PERL_VERSION" >&5
_perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5`
_perl_res=$?
echo "$ac_t""$_perl_version" 1>&6
@@ -3577,7 +3479,7 @@
fi
echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
-echo "configure:3581: checking for full perl installation" >&5
+echo "configure:3483: checking for full perl installation" >&5
_perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5`
_perl_res=$?
if test "$_perl_res" != 0; then
@@ -3590,7 +3492,7 @@
# Extract the first word of "doxygen", so it can be a program name with args.
set dummy doxygen; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3594: checking for $ac_word" >&5
+echo "configure:3496: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3626,7 +3528,7 @@
# Extract the first word of "whoami", so it can be a program name with args.
set dummy whoami; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3630: checking for $ac_word" >&5
+echo "configure:3532: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3662,7 +3564,7 @@
# Extract the first word of "autoconf", so it can be a program name with args.
set dummy autoconf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3666: checking for $ac_word" >&5
+echo "configure:3568: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3698,7 +3600,7 @@
# Extract the first word of "unzip", so it can be a program name with args.
set dummy unzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3702: checking for $ac_word" >&5
+echo "configure:3604: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3736,7 +3638,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3740: checking for $ac_word" >&5
+echo "configure:3642: 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
@@ -3771,13 +3673,10 @@
test -n "$ZIP" && break
done
-if test -z "$ZIP" || test "$ZIP" = ":"; then
- { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; }
-fi
# Extract the first word of "makedepend", so it can be a program name with args.
set dummy makedepend; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3781: checking for $ac_word" >&5
+echo "configure:3680: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3812,7 +3711,7 @@
# Extract the first word of "xargs", so it can be a program name with args.
set dummy xargs; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3816: checking for $ac_word" >&5
+echo "configure:3715: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3875,7 +3774,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3879: checking for $ac_word" >&5
+echo "configure:3778: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3925,7 +3824,7 @@
# Extract the first word of "sdp", so it can be a program name with args.
set dummy sdp; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3929: checking for $ac_word" >&5
+echo "configure:3828: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4056,7 +3955,7 @@
fi
echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
-echo "configure:4060: checking for valid compiler/Mac OS X SDK combination" >&5
+echo "configure:3959: checking for valid compiler/Mac OS X SDK combination" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4065,7 +3964,7 @@
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <
int main() { return 0; }
@@ -4073,7 +3972,7 @@
result=yes
; return 0; }
EOF
-if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result=no
else
@@ -4098,7 +3997,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4102: checking for $ac_word" >&5
+echo "configure:4001: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4141,7 +4040,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4145: checking for $ac_word" >&5
+echo "configure:4044: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4209,7 +4108,7 @@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4213: checking for X" >&5
+echo "configure:4112: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -4271,12 +4170,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4345,14 +4244,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:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -4458,17 +4357,17 @@
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4462: checking whether -R must be followed by a space" >&5
+echo "configure:4361: 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:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -4484,14 +4383,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:4394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -4523,7 +4422,7 @@
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4527: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4426: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4531,7 +4430,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:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4567,7 +4466,7 @@
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4571: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4470: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4575,7 +4474,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: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
@@ -4618,12 +4517,12 @@
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4622: checking for gethostbyname" >&5
+echo "configure:4521: 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:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -4670,7 +4569,7 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4674: checking for gethostbyname in -lnsl" >&5
+echo "configure:4573: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4678,7 +4577,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:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4722,12 +4621,12 @@
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4726: checking for connect" >&5
+echo "configure:4625: 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:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -4774,7 +4673,7 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4778: checking for connect in -lsocket" >&5
+echo "configure:4677: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4782,7 +4681,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:4699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4820,12 +4719,12 @@
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4824: checking for remove" >&5
+echo "configure:4723: 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:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -4872,7 +4771,7 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4876: checking for remove in -lposix" >&5
+echo "configure:4775: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4880,7 +4779,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:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4918,12 +4817,12 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4922: checking for shmat" >&5
+echo "configure:4821: 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:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -4970,7 +4869,7 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4974: checking for shmat in -lipc" >&5
+echo "configure:4873: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4978,7 +4877,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:4895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5025,7 +4924,7 @@
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:5029: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4928: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5033,7 +4932,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:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5485,7 +5384,7 @@
if test "$COMPILE_ENVIRONMENT"; then
if test "$GNU_CC"; then
echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
-echo "configure:5489: checking whether ld has archive extraction flags" >&5
+echo "configure:5388: checking whether ld has archive extraction flags" >&5
if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5502,14 +5401,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:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_mkshlib_force_and_unforce=$line; break
else
@@ -5542,7 +5441,7 @@
'
echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
-echo "configure:5546: checking that static assertion macros used in autoconf tests work" >&5
+echo "configure:5445: checking that static assertion macros used in autoconf tests work" >&5
if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5556,14 +5455,14 @@
ac_cv_static_assertion_macros_work="yes"
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -5573,14 +5472,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_static_assertion_macros_work="no"
else
@@ -5596,14 +5495,14 @@
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -5613,14 +5512,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_static_assertion_macros_work="no"
else
@@ -5655,16 +5554,16 @@
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
-echo "configure:5659: checking for 64-bit OS" >&5
+echo "configure:5558: checking for 64-bit OS" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes"
else
@@ -5822,9 +5721,9 @@
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6
-echo "configure:5826: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
+echo "configure:5725: 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:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_BAD_COMPILER=
else
@@ -5871,17 +5770,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5875: checking for $ac_hdr" >&5
+echo "configure:5774: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5923,7 +5822,7 @@
LIBS="$LIBS -lbe"
if test "$COMPILE_ENVIRONMENT"; then
echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
-echo "configure:5927: checking for main in -lbind" >&5
+echo "configure:5826: checking for main in -lbind" >&5
ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5931,14 +5830,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:5841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5959,7 +5858,7 @@
fi
echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
-echo "configure:5963: checking for main in -lzeta" >&5
+echo "configure:5862: checking for main in -lzeta" >&5
ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5967,14 +5866,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:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6042,18 +5941,18 @@
MACOSX=1
echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
-echo "configure:6046: checking for -dead_strip option to ld" >&5
+echo "configure:5945: 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:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
_HAVE_DEAD_STRIP=1
else
@@ -6921,14 +6820,14 @@
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
cat > conftest.$ac_ext <
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6956,7 +6855,7 @@
CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6
-echo "configure:6960: checking for Forte compiler version >= WS6U2" >&5
+echo "configure:6859: checking for Forte compiler version >= WS6U2" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -6966,7 +6865,7 @@
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_BAD_COMPILER=
else
@@ -7125,12 +7024,12 @@
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:7129: checking for ANSI C header files" >&5
+echo "configure:7028: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7138,7 +7037,7 @@
#include
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7155,7 +7054,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -7173,7 +7072,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -7194,7 +7093,7 @@
:
else
cat > conftest.$ac_ext <
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -7205,7 +7104,7 @@
exit (0); }
EOF
-if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -7229,12 +7128,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:7233: checking for working const" >&5
+echo "configure:7132: 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:7186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -7304,12 +7203,12 @@
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:7308: checking for mode_t" >&5
+echo "configure:7207: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -7337,12 +7236,12 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:7341: checking for off_t" >&5
+echo "configure:7240: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -7370,12 +7269,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:7374: checking for pid_t" >&5
+echo "configure:7273: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -7403,12 +7302,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:7407: checking for size_t" >&5
+echo "configure:7306: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -7436,12 +7335,12 @@
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:7440: checking for st_blksize in struct stat" >&5
+echo "configure:7339: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7449,7 +7348,7 @@
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -7470,12 +7369,12 @@
fi
echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
-echo "configure:7474: checking for siginfo_t" >&5
+echo "configure:7373: checking for siginfo_t" >&5
if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -7483,7 +7382,7 @@
siginfo_t* info;
; return 0; }
EOF
-if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_siginfo_t=true
else
@@ -7517,12 +7416,12 @@
fi
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-echo "configure:7521: checking for int16_t" >&5
+echo "configure:7420: checking for int16_t" >&5
if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7530,7 +7429,7 @@
int16_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int16_t=true
else
@@ -7552,12 +7451,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:7556: checking for int32_t" >&5
+echo "configure:7455: checking for int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7565,7 +7464,7 @@
int32_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int32_t=true
else
@@ -7587,12 +7486,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for int64_t""... $ac_c" 1>&6
-echo "configure:7591: checking for int64_t" >&5
+echo "configure:7490: checking for int64_t" >&5
if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7600,7 +7499,7 @@
int64_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int64_t=true
else
@@ -7622,12 +7521,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for int64""... $ac_c" 1>&6
-echo "configure:7626: checking for int64" >&5
+echo "configure:7525: checking for int64" >&5
if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7635,7 +7534,7 @@
int64 foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int64=true
else
@@ -7657,12 +7556,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for uint""... $ac_c" 1>&6
-echo "configure:7661: checking for uint" >&5
+echo "configure:7560: checking for uint" >&5
if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7670,7 +7569,7 @@
uint foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_uint=true
else
@@ -7692,12 +7591,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for uint_t""... $ac_c" 1>&6
-echo "configure:7696: checking for uint_t" >&5
+echo "configure:7595: checking for uint_t" >&5
if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7705,7 +7604,7 @@
uint_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_uint_t=true
else
@@ -7727,12 +7626,12 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
-echo "configure:7731: checking for uint16_t" >&5
+echo "configure:7630: checking for uint16_t" >&5
if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -7740,7 +7639,7 @@
uint16_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_uint16_t=true
else
@@ -7771,12 +7670,12 @@
echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
-echo "configure:7775: checking for uname.domainname" >&5
+echo "configure:7674: checking for uname.domainname" >&5
if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
@@ -7784,7 +7683,7 @@
(void)uname(res); if (res != 0) { domain = res->domainname; }
; return 0; }
EOF
-if { (eval echo configure:7788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_uname_domainname_field=true
else
@@ -7808,12 +7707,12 @@
fi
echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
-echo "configure:7812: checking for uname.__domainname" >&5
+echo "configure:7711: checking for uname.__domainname" >&5
if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
@@ -7821,7 +7720,7 @@
(void)uname(res); if (res != 0) { domain = res->__domainname; }
; return 0; }
EOF
-if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_uname_us_domainname_field=true
else
@@ -7854,12 +7753,12 @@
echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
-echo "configure:7858: checking for usable wchar_t (2 bytes, unsigned)" >&5
+echo "configure:7757: checking for usable wchar_t (2 bytes, unsigned)" >&5
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
$configure_static_assert_macros
@@ -7868,7 +7767,7 @@
CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
; return 0; }
EOF
-if { (eval echo configure:7872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_usable_wchar_v2="yes"
else
@@ -7901,12 +7800,12 @@
CXXFLAGS="$CXXFLAGS -fshort-wchar"
echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
-echo "configure:7905: checking for compiler -fshort-wchar option" >&5
+echo "configure:7804: checking for compiler -fshort-wchar option" >&5
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
$configure_static_assert_macros
@@ -7915,7 +7814,7 @@
CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
; return 0; }
EOF
-if { (eval echo configure:7919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_usable_wchar_option_v2="yes"
else
@@ -7949,7 +7848,7 @@
if test "$GNU_CC"; then
echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
-echo "configure:7953: checking for visibility(hidden) attribute" >&5
+echo "configure:7852: checking for visibility(hidden) attribute" >&5
if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7974,7 +7873,7 @@
echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
-echo "configure:7978: checking for visibility(default) attribute" >&5
+echo "configure:7877: checking for visibility(default) attribute" >&5
if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7999,7 +7898,7 @@
echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
-echo "configure:8003: checking for visibility pragma support" >&5
+echo "configure:7902: checking for visibility pragma support" >&5
if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8024,7 +7923,7 @@
echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
if test "$ac_cv_visibility_pragma" = "yes"; then
echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
-echo "configure:8028: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
+echo "configure:7927: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8052,7 +7951,7 @@
echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
-echo "configure:8056: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
+echo "configure:7955: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8100,12 +7999,12 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8104: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8003: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include <$ac_hdr>
@@ -8113,7 +8012,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:8117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -8138,7 +8037,7 @@
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8142: checking for opendir in -ldir" >&5
+echo "configure:8041: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8146,7 +8045,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:8060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8179,7 +8078,7 @@
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8183: checking for opendir in -lx" >&5
+echo "configure:8082: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8187,7 +8086,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:8101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8230,17 +8129,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8234: checking for $ac_hdr" >&5
+echo "configure:8133: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8270,17 +8169,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8274: checking for $ac_hdr" >&5
+echo "configure:8173: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8310,17 +8209,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8314: checking for $ac_hdr" >&5
+echo "configure:8213: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8350,17 +8249,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8354: checking for $ac_hdr" >&5
+echo "configure:8253: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8390,17 +8289,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8394: checking for $ac_hdr" >&5
+echo "configure:8293: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8431,17 +8330,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8435: checking for $ac_hdr" >&5
+echo "configure:8334: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8472,17 +8371,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8476: checking for $ac_hdr" >&5
+echo "configure:8375: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8519,17 +8418,17 @@
NEW_H=new.h
ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for new""... $ac_c" 1>&6
-echo "configure:8523: checking for new" >&5
+echo "configure:8422: checking for new" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8570,17 +8469,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8574: checking for $ac_hdr" >&5
+echo "configure:8473: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8614,7 +8513,7 @@
;;
*)
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-echo "configure:8618: checking for gethostbyname_r in -lc_r" >&5
+echo "configure:8517: checking for gethostbyname_r in -lc_r" >&5
ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8622,7 +8521,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:8536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8663,7 +8562,7 @@
;;
esac
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:8667: checking for atan in -lm" >&5
+echo "configure:8566: checking for atan in -lm" >&5
ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8671,7 +8570,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:8585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8716,7 +8615,7 @@
;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:8720: checking for dlopen in -ldl" >&5
+echo "configure:8619: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8724,7 +8623,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:8638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8752,17 +8651,17 @@
echo "$ac_t""yes" 1>&6
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:8756: checking for dlfcn.h" >&5
+echo "configure:8655: checking for dlfcn.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8798,7 +8697,7 @@
case $target in
*-aix*)
echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
-echo "configure:8802: checking for demangle in -lC_r" >&5
+echo "configure:8701: checking for demangle in -lC_r" >&5
ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8806,7 +8705,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:8720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8847,7 +8746,7 @@
;;
*)
echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
-echo "configure:8851: checking for demangle in -lC" >&5
+echo "configure:8750: checking for demangle in -lC" >&5
ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8855,7 +8754,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:8769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8897,7 +8796,7 @@
esac
fi
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8901: checking for socket in -lsocket" >&5
+echo "configure:8800: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8905,7 +8804,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:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8961,7 +8860,7 @@
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
-echo "configure:8965: checking for XDrawLines in -lX11" >&5
+echo "configure:8864: checking for XDrawLines in -lX11" >&5
ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8969,7 +8868,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:8883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9002,7 +8901,7 @@
fi
echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
-echo "configure:9006: checking for XextAddDisplay in -lXext" >&5
+echo "configure:8905: checking for XextAddDisplay in -lXext" >&5
ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9010,7 +8909,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:8924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9045,7 +8944,7 @@
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:9049: checking for XtFree in -lXt" >&5
+echo "configure:8948: checking for XtFree in -lXt" >&5
ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9053,7 +8952,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:8967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9085,7 +8984,7 @@
unset ac_cv_lib_Xt_XtFree
echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
-echo "configure:9089: checking for IceFlush in -lICE" >&5
+echo "configure:8988: checking for IceFlush in -lICE" >&5
ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9093,7 +8992,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:9007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9125,7 +9024,7 @@
fi
echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
-echo "configure:9129: checking for SmcCloseConnection in -lSM" >&5
+echo "configure:9028: checking for SmcCloseConnection in -lSM" >&5
ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9133,7 +9032,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:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9165,7 +9064,7 @@
fi
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:9169: checking for XtFree in -lXt" >&5
+echo "configure:9068: checking for XtFree in -lXt" >&5
ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9173,7 +9072,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:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9218,7 +9117,7 @@
esac
echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
-echo "configure:9222: checking for XineramaIsActive in -lXinerama" >&5
+echo "configure:9121: checking for XineramaIsActive in -lXinerama" >&5
ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9226,7 +9125,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:9140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9259,17 +9158,17 @@
ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
-echo "configure:9263: checking for X11/extensions/Xinerama.h" >&5
+echo "configure:9162: checking for X11/extensions/Xinerama.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9292,7 +9191,7 @@
echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
-echo "configure:9296: checking for XShmCreateImage in -lXext" >&5
+echo "configure:9195: checking for XShmCreateImage in -lXext" >&5
ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9300,7 +9199,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:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9333,17 +9232,17 @@
ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
-echo "configure:9337: checking for X11/extensions/XShm.h" >&5
+echo "configure:9236: checking for X11/extensions/XShm.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9373,7 +9272,7 @@
fi
echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
-echo "configure:9377: checking for XieFloGeometry in -lXIE" >&5
+echo "configure:9276: checking for XieFloGeometry in -lXIE" >&5
ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9381,7 +9280,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:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9414,17 +9313,17 @@
ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
-echo "configure:9418: checking for X11/extensions/XIElib.h" >&5
+echo "configure:9317: checking for X11/extensions/XIElib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9498,7 +9397,7 @@
# Extract the first word of "freetype-config", so it can be a program name with args.
set dummy freetype-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9502: checking for $ac_word" >&5
+echo "configure:9401: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9534,7 +9433,7 @@
min_ft_version=6.1.0
echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
-echo "configure:9538: checking for FreeType - version >= $min_ft_version" >&5
+echo "configure:9437: checking for FreeType - version >= $min_ft_version" >&5
no_ft=""
if test "$FT2_CONFIG" = "no" ; then
no_ft=yes
@@ -9582,7 +9481,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -9608,7 +9507,7 @@
}
EOF
-if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -9660,7 +9559,7 @@
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:9664: checking for pthread_create in -lpthreads" >&5
+echo "configure:9563: checking for pthread_create in -lpthreads" >&5
echo "
#include
void *foo(void *v) { int a = 1; }
@@ -9682,7 +9581,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:9686: checking for pthread_create in -lpthread" >&5
+echo "configure:9585: checking for pthread_create in -lpthread" >&5
echo "
#include
void *foo(void *v) { int a = 1; }
@@ -9704,7 +9603,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:9708: checking for pthread_create in -lc_r" >&5
+echo "configure:9607: checking for pthread_create in -lc_r" >&5
echo "
#include
void *foo(void *v) { int a = 1; }
@@ -9726,7 +9625,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:9730: checking for pthread_create in -lc" >&5
+echo "configure:9629: checking for pthread_create in -lc" >&5
echo "
#include
void *foo(void *v) { int a = 1; }
@@ -9782,7 +9681,7 @@
rm -f conftest*
ac_cv_have_dash_pthread=no
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:9786: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:9685: checking whether ${CC-cc} accepts -pthread" >&5
echo 'int main() { return 0; }' | cat > conftest.c
${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
if test $? -eq 0; then
@@ -9805,7 +9704,7 @@
ac_cv_have_dash_pthreads=no
if test "$ac_cv_have_dash_pthread" = "no"; then
echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:9809: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:9708: checking whether ${CC-cc} accepts -pthreads" >&5
echo 'int main() { return 0; }' | cat > conftest.c
${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
if test $? -eq 0; then
@@ -9900,7 +9799,7 @@
fi
echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
-echo "configure:9904: checking whether mmap() sees write()s" >&5
+echo "configure:9803: checking whether mmap() sees write()s" >&5
mmap_test_prog='
@@ -9939,11 +9838,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:9846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="yes"
else
@@ -9968,13 +9867,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:9972: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9871: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <
Autoconf TIOCGETP
@@ -9992,7 +9891,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <
Autoconf TCGETA
@@ -10014,7 +9913,7 @@
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:10018: checking for 8-bit clean memcmp" >&5
+echo "configure:9917: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10022,7 +9921,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:9935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -10052,12 +9951,12 @@
for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10056: checking for $ac_func" >&5
+echo "configure:9955: 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:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -10107,12 +10006,12 @@
for ac_func in flockfile getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10111: checking for $ac_func" >&5
+echo "configure:10010: 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:10038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -10164,12 +10063,12 @@
for ac_func in localtime_r strtok_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10168: checking for $ac_func" >&5
+echo "configure:10067: 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:10095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -10228,19 +10127,19 @@
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
-echo "configure:10232: checking for wcrtomb" >&5
+echo "configure:10131: checking for wcrtomb" >&5
if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
mbstate_t ps={0};wcrtomb(0,'f',&ps);
; return 0; }
EOF
-if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_wcrtomb="yes"
else
@@ -10260,19 +10159,19 @@
fi
echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
-echo "configure:10264: checking for mbrtowc" >&5
+echo "configure:10163: checking for mbrtowc" >&5
if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
mbstate_t ps={0};mbrtowc(0,0,0,&ps);
; return 0; }
EOF
-if { (eval echo configure:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_mbrtowc="yes"
else
@@ -10301,12 +10200,12 @@
fi
echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
-echo "configure:10305: checking for res_ninit()" >&5
+echo "configure:10204: 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:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_res_ninit=yes
else
@@ -10348,12 +10247,12 @@
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
-echo "configure:10352: checking for gnu_get_libc_version()" >&5
+echo "configure:10251: 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:10267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_gnu_get_libc_version=yes
else
@@ -10393,7 +10292,7 @@
*)
echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
-echo "configure:10397: checking for iconv in -lc" >&5
+echo "configure:10296: checking for iconv in -lc" >&5
ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10401,7 +10300,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:10318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10434,7 +10333,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:10438: checking for iconv in -liconv" >&5
+echo "configure:10337: checking for iconv in -liconv" >&5
ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10442,7 +10341,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:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10475,7 +10374,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:10479: checking for libiconv in -liconv" >&5
+echo "configure:10378: checking for libiconv in -liconv" >&5
ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10483,7 +10382,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:10400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10524,12 +10423,12 @@
_SAVE_LIBS=$LIBS
LIBS="$LIBS $_ICONV_LIBS"
echo $ac_n "checking for iconv()""... $ac_c" 1>&6
-echo "configure:10528: checking for iconv()" >&5
+echo "configure:10427: checking for iconv()" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -10543,7 +10442,7 @@
; return 0; }
EOF
-if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_iconv=yes
else
@@ -10567,12 +10466,12 @@
LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
LIBICONV="$_ICONV_LIBS"
echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
-echo "configure:10571: checking for iconv() with const input" >&5
+echo "configure:10470: checking for iconv() with const input" >&5
if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -10587,7 +10486,7 @@
; return 0; }
EOF
-if { (eval echo configure:10591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_const_iconv=yes
else
@@ -10616,19 +10515,19 @@
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:10620: checking for nl_langinfo and CODESET" >&5
+echo "configure:10519: checking for nl_langinfo and CODESET" >&5
if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_langinfo_codeset=yes
else
@@ -10660,7 +10559,7 @@
echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
-echo "configure:10664: checking for an implementation of va_copy()" >&5
+echo "configure:10563: checking for an implementation of va_copy()" >&5
if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10670,7 +10569,7 @@
else
cat > conftest.$ac_ext <
@@ -10684,7 +10583,7 @@
}
int main() { f (0, 42); return 0; }
EOF
-if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_va_copy=yes
else
@@ -10701,7 +10600,7 @@
echo "$ac_t""$ac_cv_va_copy" 1>&6
echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
-echo "configure:10705: checking for an implementation of __va_copy()" >&5
+echo "configure:10604: checking for an implementation of __va_copy()" >&5
if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10711,7 +10610,7 @@
else
cat > conftest.$ac_ext <
@@ -10725,7 +10624,7 @@
}
int main() { f (0, 42); return 0; }
EOF
-if { (eval echo configure:10729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv___va_copy=yes
else
@@ -10742,7 +10641,7 @@
echo "$ac_t""$ac_cv___va_copy" 1>&6
echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
-echo "configure:10746: checking whether va_lists can be copied by value" >&5
+echo "configure:10645: checking whether va_lists can be copied by value" >&5
if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10752,7 +10651,7 @@
else
cat > conftest.$ac_ext <
@@ -10766,7 +10665,7 @@
}
int main() { f (0, 42); return 0; }
EOF
-if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_va_val_copy=yes
else
@@ -10865,7 +10764,7 @@
if test "$GNU_CXX"; then
echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
-echo "configure:10869: checking for C++ exceptions flag" >&5
+echo "configure:10768: checking for C++ exceptions flag" >&5
if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10900,12 +10799,12 @@
HAVE_GCC3_ABI=
if test "$GNU_CC"; then
echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
-echo "configure:10904: checking for gcc 3.0 ABI" >&5
+echo "configure:10803: 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:10821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_gcc_three_abi="yes"
else
@@ -10942,12 +10841,12 @@
echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
-echo "configure:10946: checking for C++ \"explicit\" keyword" >&5
+echo "configure:10845: 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:10860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_explicit=yes
else
@@ -10978,12 +10877,12 @@
fi
echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
-echo "configure:10982: checking for C++ \"typename\" keyword" >&5
+echo "configure:10881: 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:10905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_typename=yes
else
@@ -11023,12 +10922,12 @@
fi
echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
-echo "configure:11027: checking for modern C++ template specialization syntax support" >&5
+echo "configure:10926: checking for modern C++ template specialization syntax support" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext < struct X { int a; };
class Y {};
@@ -11038,7 +10937,7 @@
X y_x;
; return 0; }
EOF
-if { (eval echo configure:11042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_modern_specialize_template_syntax=yes
else
@@ -11060,12 +10959,12 @@
echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
-echo "configure:11064: checking whether partial template specialization works" >&5
+echo "configure:10963: checking whether partial template specialization works" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext < class Foo {};
template class Foo {};
@@ -11073,7 +10972,7 @@
return 0;
; return 0; }
EOF
-if { (eval echo configure:11077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_partial_specialization=yes
else
@@ -11094,12 +10993,12 @@
fi
echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
-echo "configure:11098: checking whether operators must be re-defined for templates derived from templates" >&5
+echo "configure:10997: checking whether operators must be re-defined for templates derived from templates" >&5
if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext < class Base { };
template
@@ -11111,7 +11010,7 @@
return 0;
; return 0; }
EOF
-if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_need_derived_template_operators=no
else
@@ -11133,12 +11032,12 @@
echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
-echo "configure:11137: checking whether we need to cast a derived template to pass as its base class" >&5
+echo "configure:11036: checking whether we need to cast a derived template to pass as its base class" >&5
if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext < class Base { };
template class Derived : public Base { };
@@ -11147,7 +11046,7 @@
Derived bar; return foo(bar);
; return 0; }
EOF
-if { (eval echo configure:11151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_need_cpp_template_cast_to_base=no
else
@@ -11168,12 +11067,12 @@
fi
echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
-echo "configure:11172: checking whether the compiler can resolve const ambiguities for templates" >&5
+echo "configure:11071: checking whether the compiler can resolve const ambiguities for templates" >&5
if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext < class ptrClass {
@@ -11194,7 +11093,7 @@
a(&i);
; return 0; }
EOF
-if { (eval echo configure:11198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_can_resolve_const_ambiguity=yes
else
@@ -11216,12 +11115,12 @@
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
-echo "configure:11220: checking whether the C++ \"using\" keyword can change access" >&5
+echo "configure:11119: 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:11132: \"$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:11143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_access_changing_using2=no
else
@@ -11268,12 +11167,12 @@
fi
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
-echo "configure:11272: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
+echo "configure:11171: 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:11192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_ambiguity_resolving_using=yes
else
@@ -11310,19 +11209,19 @@
fi
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
-echo "configure:11314: checking for \"std::\" namespace" >&5
+echo "configure:11213: checking for \"std::\" namespace" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
return std::min(0, 1);
; return 0; }
EOF
-if { (eval echo configure:11326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_namespace_std=yes
else
@@ -11343,12 +11242,12 @@
fi
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
-echo "configure:11347: checking whether standard template operator!=() is ambiguous" >&5
+echo "configure:11246: checking whether standard template operator!=() is ambiguous" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
struct T1 {};
@@ -11358,7 +11257,7 @@
T1 a,b; return a != b;
; return 0; }
EOF
-if { (eval echo configure:11362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_unambiguous_std_notequal=unambiguous
else
@@ -11380,12 +11279,12 @@
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
-echo "configure:11384: checking for C++ reinterpret_cast" >&5
+echo "configure:11283: checking for C++ reinterpret_cast" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <(z);
; return 0; }
EOF
-if { (eval echo configure:11397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_reinterpret_cast=yes
else
@@ -11414,7 +11313,7 @@
fi
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
-echo "configure:11418: checking for C++ dynamic_cast to void*" >&5
+echo "configure:11317: checking for C++ dynamic_cast to void*" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11422,8 +11321,11 @@
ac_cv_cpp_dynamic_cast_void_ptr=no
else
cat > conftest.$ac_ext <(suby))));
}
EOF
-if { (eval echo configure:11442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_cpp_dynamic_cast_void_ptr=yes
else
@@ -11462,19 +11364,19 @@
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
-echo "configure:11466: checking whether C++ requires implementation of unused virtual methods" >&5
+echo "configure:11368: 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:11380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_cpp_unused_required=no
else
@@ -11497,12 +11399,12 @@
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
-echo "configure:11501: checking for trouble comparing to zero near std::operator!=()" >&5
+echo "configure:11403: checking for trouble comparing to zero near std::operator!=()" >&5
if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
template class Foo {};
@@ -11513,7 +11415,7 @@
Foo f; return (0 != f);
; return 0; }
EOF
-if { (eval echo configure:11517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_trouble_comparing_to_zero=no
else
@@ -11545,19 +11447,19 @@
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:11549: checking for LC_MESSAGES" >&5
+echo "configure:11451: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
int category = LC_MESSAGES;
; return 0; }
EOF
-if { (eval echo configure:11561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_i18n_lc_messages=yes
else
@@ -11638,7 +11540,7 @@
# Extract the first word of "nspr-config", so it can be a program name with args.
set dummy nspr-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11642: checking for $ac_word" >&5
+echo "configure:11544: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11673,7 +11575,7 @@
min_nspr_version=4.0.0
echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
-echo "configure:11677: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+echo "configure:11579: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
no_nspr=""
if test "$NSPR_CONFIG" = "no"; then
@@ -11775,7 +11677,7 @@
# Extract the first word of "nss-config", so it can be a program name with args.
set dummy nss-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11779: checking for $ac_word" >&5
+echo "configure:11681: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11810,7 +11712,7 @@
min_nss_version=3.0.0
echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
-echo "configure:11814: checking for NSS - version >= $min_nss_version (skipping)" >&5
+echo "configure:11716: checking for NSS - version >= $min_nss_version (skipping)" >&5
no_nss=""
if test "$NSS_CONFIG" = "no"; then
@@ -11883,7 +11785,7 @@
SYSTEM_JPEG=
else
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:11887: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:11789: checking for jpeg_destroy_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11891,7 +11793,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:11808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11931,7 +11833,7 @@
SYSTEM_JPEG=
else
cat > conftest.$ac_ext <
#include
@@ -11945,7 +11847,7 @@
}
EOF
-if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_JPEG=1
else
@@ -11986,7 +11888,7 @@
SYSTEM_ZLIB=
else
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
-echo "configure:11990: checking for gzread in -lz" >&5
+echo "configure:11892: checking for gzread in -lz" >&5
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11994,7 +11896,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:11911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12033,7 +11935,7 @@
SYSTEM_ZLIB=
else
cat > conftest.$ac_ext <
@@ -12054,7 +11956,7 @@
}
EOF
-if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_ZLIB=1
else
@@ -12097,7 +11999,7 @@
SYSTEM_PNG=
else
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
-echo "configure:12101: checking for png_get_valid in -lpng" >&5
+echo "configure:12003: checking for png_get_valid in -lpng" >&5
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -12105,7 +12007,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:12022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12144,7 +12046,7 @@
SYSTEM_PNG=
else
cat > conftest.$ac_ext <
#include
@@ -12158,7 +12060,7 @@
}
EOF
-if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_PNG=1
else
@@ -12183,6 +12085,28 @@
fi # SKIP_LIBRARY_CHECKS
+# Check whether --enable-system-myspell or --disable-system-myspell was given.
+if test "${enable_system_myspell+set}" = set; then
+ enableval="$enable_system_myspell"
+ if test "$enableval" = "yes"; then
+ SYSTEM_MYSPELL=1
+ elif test "$enableval" = "no"; then
+ :
+ else
+ { echo "configure: error: Option, system-myspell, does not take an argument ($enableval)." 1>&2; exit 1; }
+ fi
+fi
+
+
+if test -n "$SYSTEM_MYSPELL"; then
+ MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
+ MOZ_MYSPELL_LIBS="-lhunspell"
+fi
+
+
+
+
+
JAVA_INCLUDE_PATH=
# Check whether --with-java-include-path or --without-java-include-path was given.
if test "${with_java_include_path+set}" = set; then
@@ -12408,7 +12332,7 @@
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12412: checking for $ac_word" >&5
+echo "configure:12336: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12443,7 +12367,7 @@
min_gtk_version=$GTK_VERSION
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12447: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12371: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
@@ -12466,7 +12390,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -12544,7 +12468,7 @@
}
EOF
-if { (eval echo configure:12548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -12579,7 +12503,7 @@
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <
@@ -12589,7 +12513,7 @@
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:12593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -12641,7 +12565,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12645: checking for $ac_word" >&5
+echo "configure:12569: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12685,19 +12609,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6
-echo "configure:12689: checking for gtk+-2.0 >= 1.3.7" >&5
+echo "configure:12613: checking for gtk+-2.0 >= 1.3.7" >&5
if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
-echo "configure:12696: checking MOZ_GTK2_CFLAGS" >&5
+echo "configure:12620: checking MOZ_GTK2_CFLAGS" >&5
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
-echo "configure:12701: checking MOZ_GTK2_LIBS" >&5
+echo "configure:12625: checking MOZ_GTK2_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`"
@@ -12762,7 +12686,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12766: checking for $ac_word" >&5
+echo "configure:12690: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12814,7 +12738,7 @@
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
-echo "configure:12818: checking for main in -lqt" >&5
+echo "configure:12742: checking for main in -lqt" >&5
ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -12822,14 +12746,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:12757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12848,7 +12772,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
-echo "configure:12852: checking for main in -lqt-mt" >&5
+echo "configure:12776: checking for main in -lqt-mt" >&5
ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -12856,14 +12780,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:12791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12899,9 +12823,9 @@
LIBS="$LIBS $QT_LIBS"
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
-echo "configure:12903: checking Qt - version >= $QT_VERSION" >&5
+echo "configure:12827: checking Qt - version >= $QT_VERSION" >&5
cat > conftest.$ac_ext <
int main() {
@@ -12912,7 +12836,7 @@
; return 0; }
EOF
-if { (eval echo configure:12916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes"
else
@@ -13508,7 +13432,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13512: checking for $ac_word" >&5
+echo "configure:13436: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13552,19 +13476,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for xft""... $ac_c" 1>&6
-echo "configure:13556: checking for xft" >&5
+echo "configure:13480: checking for xft" >&5
if $PKG_CONFIG --exists "xft" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
-echo "configure:13563: checking MOZ_XFT_CFLAGS" >&5
+echo "configure:13487: checking MOZ_XFT_CFLAGS" >&5
MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
-echo "configure:13568: checking MOZ_XFT_LIBS" >&5
+echo "configure:13492: checking MOZ_XFT_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
@@ -13599,7 +13523,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13603: checking for $ac_word" >&5
+echo "configure:13527: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13643,19 +13567,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6
-echo "configure:13647: checking for pango >= 1.1.0" >&5
+echo "configure:13571: checking for pango >= 1.1.0" >&5
if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
-echo "configure:13654: checking _PANGOCHK_CFLAGS" >&5
+echo "configure:13578: checking _PANGOCHK_CFLAGS" >&5
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
-echo "configure:13659: checking _PANGOCHK_LIBS" >&5
+echo "configure:13583: checking _PANGOCHK_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
_PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"
@@ -13715,7 +13639,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13719: checking for $ac_word" >&5
+echo "configure:13643: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13759,19 +13683,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
-echo "configure:13763: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
+echo "configure:13687: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
-echo "configure:13770: checking MOZ_PANGO_CFLAGS" >&5
+echo "configure:13694: checking MOZ_PANGO_CFLAGS" >&5
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
-echo "configure:13775: checking MOZ_PANGO_LIBS" >&5
+echo "configure:13699: checking MOZ_PANGO_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
@@ -13839,7 +13763,7 @@
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
-echo "configure:13843: checking for XpGetPrinterList in -lXp" >&5
+echo "configure:13767: checking for XpGetPrinterList in -lXp" >&5
ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -13847,7 +13771,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:13786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13931,7 +13855,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13935: checking for $ac_word" >&5
+echo "configure:13859: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13975,19 +13899,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
-echo "configure:13979: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+echo "configure:13903: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
-echo "configure:13986: checking MOZ_GNOMEVFS_CFLAGS" >&5
+echo "configure:13910: checking MOZ_GNOMEVFS_CFLAGS" >&5
MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
-echo "configure:13991: checking MOZ_GNOMEVFS_LIBS" >&5
+echo "configure:13915: checking MOZ_GNOMEVFS_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`"
@@ -14038,7 +13962,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14042: checking for $ac_word" >&5
+echo "configure:13966: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14082,19 +14006,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
-echo "configure:14086: checking for gconf-2.0 >= $GCONF_VERSION" >&5
+echo "configure:14010: checking for gconf-2.0 >= $GCONF_VERSION" >&5
if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
-echo "configure:14093: checking MOZ_GCONF_CFLAGS" >&5
+echo "configure:14017: checking MOZ_GCONF_CFLAGS" >&5
MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
-echo "configure:14098: checking MOZ_GCONF_LIBS" >&5
+echo "configure:14022: 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\"`"
@@ -14141,7 +14065,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14145: checking for $ac_word" >&5
+echo "configure:14069: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14185,19 +14109,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
-echo "configure:14189: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
+echo "configure:14113: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
-echo "configure:14196: checking MOZ_LIBGNOME_CFLAGS" >&5
+echo "configure:14120: checking MOZ_LIBGNOME_CFLAGS" >&5
MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
-echo "configure:14201: checking MOZ_LIBGNOME_LIBS" >&5
+echo "configure:14125: checking MOZ_LIBGNOME_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`"
@@ -14275,7 +14199,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14279: checking for $ac_word" >&5
+echo "configure:14203: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14319,19 +14243,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
-echo "configure:14323: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+echo "configure:14247: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
-echo "configure:14330: checking MOZ_GNOMEUI_CFLAGS" >&5
+echo "configure:14254: checking MOZ_GNOMEUI_CFLAGS" >&5
MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
-echo "configure:14335: checking MOZ_GNOMEUI_LIBS" >&5
+echo "configure:14259: 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\"`"
@@ -14505,6 +14429,117 @@
fi
+MOZ_ENABLE_LIBTHAI_COMPONENT=
+# Check whether --enable-libthai or --disable-libthai was given.
+if test "${enable_libthai+set}" = set; then
+ enableval="$enable_libthai"
+ if test "$enableval" = "no"; then
+ MOZ_ENABLE_LIBTHAI_COMPONENT=
+ elif test "$enableval" = "yes"; then
+ MOZ_ENABLE_LIBTHAI_COMPONENT=1
+ else
+ { echo "configure: error: Option, libthai, does not take an argument ($enableval)." 1>&2; exit 1; }
+ fi
+fi
+
+if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14454: 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 libthai""... $ac_c" 1>&6
+echo "configure:14498: checking for libthai" >&5
+
+ if $PKG_CONFIG --exists "libthai" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking MOZ_LIBTHAI_CFLAGS""... $ac_c" 1>&6
+echo "configure:14505: checking MOZ_LIBTHAI_CFLAGS" >&5
+ MOZ_LIBTHAI_CFLAGS=`$PKG_CONFIG --cflags "libthai"`
+ echo "$ac_t""$MOZ_LIBTHAI_CFLAGS" 1>&6
+
+ echo $ac_n "checking MOZ_LIBTHAI_LIBS""... $ac_c" 1>&6
+echo "configure:14510: checking MOZ_LIBTHAI_LIBS" >&5
+ ## don't use --libs since that can do evil things like add
+ ## -Wl,--export-dynamic
+ MOZ_LIBTHAI_LIBS="`$PKG_CONFIG --libs-only-L \"libthai\"` `$PKG_CONFIG --libs-only-l \"libthai\"`"
+ echo "$ac_t""$MOZ_LIBTHAI_LIBS" 1>&6
+ else
+ MOZ_LIBTHAI_CFLAGS=""
+ MOZ_LIBTHAI_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ MOZ_LIBTHAI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libthai"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+
+ MOZ_ENABLE_LIBTHAI_COMPONENT=1
+
+ else
+
+ MOZ_ENABLE_LIBTHAI_COMPONENT=
+
+ fi
+
+fi
+
# Check whether --enable-view-source or --disable-view-source was given.
if test "${enable_view_source+set}" = set; then
enableval="$enable_view_source"
@@ -14817,7 +14852,7 @@
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14821: checking for $ac_word" >&5
+echo "configure:14856: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14853,7 +14888,7 @@
# Extract the first word of "jar", so it can be a program name with args.
set dummy jar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14857: checking for $ac_word" >&5
+echo "configure:14892: 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
@@ -15100,7 +15135,7 @@
gdiplus)
MOZ_SVG_RENDERER_GDIPLUS=1
echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
-echo "configure:15104: checking for Gdiplus.h" >&5
+echo "configure:15139: checking for Gdiplus.h" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -15110,7 +15145,7 @@
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <
#include
@@ -15119,7 +15154,7 @@
; return 0; }
EOF
-if { (eval echo configure:15123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -15199,7 +15234,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15203: checking for $ac_word" >&5
+echo "configure:15238: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15244,7 +15279,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15248: checking for $ac_word" >&5
+echo "configure:15283: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15313,13 +15348,13 @@
msvc*|mks*|cygwin*|mingw*|wince*)
if test -n "$MOZ_UPDATER"; then
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:15317: checking for iconv" >&5
+echo "configure:15352: checking for iconv" >&5
for ac_prog in $HOST_ICONV "iconv"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15323: checking for $ac_word" >&5
+echo "configure:15358: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15665,18 +15700,18 @@
if test -n "$MOZ_DEBUG"; then
echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
-echo "configure:15669: checking for valid debug flags" >&5
+echo "configure:15704: checking for valid debug flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
cat > conftest.$ac_ext <
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:15680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -15717,18 +15752,18 @@
if test "$COMPILE_ENVIRONMENT"; then
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
-echo "configure:15721: checking for valid optimization flags" >&5
+echo "configure:15756: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:15732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -15945,7 +15980,7 @@
if test -n "$_ENABLE_EFENCE"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
-echo "configure:15949: checking for malloc in -lefence" >&5
+echo "configure:15984: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15953,7 +15988,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:16003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16065,12 +16100,12 @@
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16069: checking for $ac_func" >&5
+echo "configure:16104: 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:16135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -16339,12 +16374,12 @@
for ac_func in __cxa_demangle
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16343: checking for $ac_func" >&5
+echo "configure:16378: 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:16409: \"$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
@@ -16449,6 +16484,13 @@
{ echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; }
fi
+if test "$MOZ_CHROME_FILE_FORMAT" = "jar" ||
+ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then
+ if test -z "$ZIP" || test "$ZIP" = ":"; then
+ { echo "configure: error: zip is required for chrome format $MOZ_CHROME_FILE_FORMAT" 1>&2; exit 1; }
+ fi
+fi
+
# Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given.
if test "${with_default_mozilla_five_home+set}" = set; then
withval="$with_default_mozilla_five_home"
@@ -16508,7 +16550,7 @@
# Compiler Options
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
-echo "configure:16512: checking for gcc -pipe support" >&5
+echo "configure:16554: checking for gcc -pipe support" >&5
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
echo '#include ' > dummy-hello.c
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
@@ -16523,14 +16565,14 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -pipe"
cat > conftest.$ac_ext <
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:16534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_res_gcc_pipe="yes"
else
@@ -16572,16 +16614,16 @@
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
-echo "configure:16576: checking whether compiler supports -Wno-long-long" >&5
+echo "configure:16618: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@@ -16602,16 +16644,16 @@
CFLAGS="$CFLAGS -fprofile-generate"
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:16606: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:16648: checking whether C compiler supports -fprofile-generate" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-generate"
result="yes"
@@ -16629,16 +16671,16 @@
else
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
-echo "configure:16633: checking whether C compiler supports -fprofile-arcs" >&5
+echo "configure:16675: checking whether C compiler supports -fprofile-arcs" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-arcs"
result="yes"
@@ -16684,16 +16726,16 @@
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
-echo "configure:16688: checking whether C++ compiler has -pedantic long long bug" >&5
+echo "configure:16730: checking whether C++ compiler has -pedantic long long bug" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="no"
else
@@ -16718,13 +16760,16 @@
fi
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
-echo "configure:16722: checking for correct temporary object destruction order" >&5
+echo "configure:16764: 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:16792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="yes"
else
@@ -16764,12 +16809,12 @@
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
-echo "configure:16768: checking for correct overload resolution with const and templates" >&5
+echo "configure:16813: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -16799,7 +16844,7 @@
; return 0; }
EOF
-if { (eval echo configure:16803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@@ -17091,7 +17136,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17095: checking for $ac_word" >&5
+echo "configure:17140: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17135,19 +17180,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
-echo "configure:17139: checking for libIDL-2.0 >= 0.8.0" >&5
+echo "configure:17184: checking for libIDL-2.0 >= 0.8.0" >&5
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
-echo "configure:17146: checking LIBIDL_CFLAGS" >&5
+echo "configure:17191: checking LIBIDL_CFLAGS" >&5
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
-echo "configure:17151: checking LIBIDL_LIBS" >&5
+echo "configure:17196: checking LIBIDL_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
@@ -17270,7 +17315,7 @@
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17274: checking for $ac_word" >&5
+echo "configure:17319: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17305,7 +17350,7 @@
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:17309: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:17354: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -17328,7 +17373,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -17404,7 +17449,7 @@
}
EOF
-if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17438,7 +17483,7 @@
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <
@@ -17448,7 +17493,7 @@
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:17452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -17492,7 +17537,7 @@
# Extract the first word of "libIDL-config", so it can be a program name with args.
set dummy libIDL-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17496: checking for $ac_word" >&5
+echo "configure:17541: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17527,7 +17572,7 @@
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:17531: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:17576: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -17554,7 +17599,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -17640,7 +17685,7 @@
}
EOF
-if { (eval echo configure:17644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17674,7 +17719,7 @@
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <
@@ -17685,7 +17730,7 @@
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
-if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
@@ -17813,7 +17858,7 @@
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17817: checking for $ac_word" >&5
+echo "configure:17862: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17848,7 +17893,7 @@
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:17852: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:17897: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -17871,7 +17916,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -17947,7 +17992,7 @@
}
EOF
-if { (eval echo configure:17951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17981,7 +18026,7 @@
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <
@@ -17991,7 +18036,7 @@
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:17995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -18035,7 +18080,7 @@
# Extract the first word of "libIDL-config", so it can be a program name with args.
set dummy libIDL-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18039: checking for $ac_word" >&5
+echo "configure:18084: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18070,7 +18115,7 @@
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:18074: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:18119: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -18097,7 +18142,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -18183,7 +18228,7 @@
}
EOF
-if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18217,7 +18262,7 @@
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <
@@ -18228,7 +18273,7 @@
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
-if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
@@ -18269,7 +18314,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18273: checking for $ac_word" >&5
+echo "configure:18318: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18313,19 +18358,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
-echo "configure:18317: checking for libIDL-2.0 >= 0.8.0" >&5
+echo "configure:18362: checking for libIDL-2.0 >= 0.8.0" >&5
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
-echo "configure:18324: checking LIBIDL_CFLAGS" >&5
+echo "configure:18369: checking LIBIDL_CFLAGS" >&5
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
-echo "configure:18329: checking LIBIDL_LIBS" >&5
+echo "configure:18374: checking LIBIDL_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
@@ -18361,7 +18406,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18365: checking for $ac_word" >&5
+echo "configure:18410: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18398,7 +18443,7 @@
if test -n "$ORBIT_CONFIG"; then
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
-echo "configure:18402: checking for ORBit libIDL usability" >&5
+echo "configure:18447: checking for ORBit libIDL usability" >&5
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
@@ -18415,7 +18460,7 @@
result="maybe"
else
cat > conftest.$ac_ext <
@@ -18430,7 +18475,7 @@
}
EOF
-if { (eval echo configure:18434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
_LIBIDL_FOUND=1
result="yes"
@@ -18487,7 +18532,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18491: checking for $ac_word" >&5
+echo "configure:18536: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18531,19 +18576,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6
-echo "configure:18535: checking for glib-2.0 >= 1.3.7" >&5
+echo "configure:18580: checking for glib-2.0 >= 1.3.7" >&5
if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
-echo "configure:18542: checking GLIB_CFLAGS" >&5
+echo "configure:18587: checking GLIB_CFLAGS" >&5
GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"`
echo "$ac_t""$GLIB_CFLAGS" 1>&6
echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
-echo "configure:18547: checking GLIB_LIBS" >&5
+echo "configure:18592: checking GLIB_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`"
@@ -18627,7 +18672,7 @@
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18631: checking for $ac_word" >&5
+echo "configure:18676: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18662,7 +18707,7 @@
min_glib_version=${GLIB_VERSION}
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:18666: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:18711: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -18685,7 +18730,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <
@@ -18761,7 +18806,7 @@
}
EOF
-if { (eval echo configure:18765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18795,7 +18840,7 @@
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <
@@ -18805,7 +18850,7 @@
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:18809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -18885,19 +18930,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:18889: checking for working alloca.h" >&5
+echo "configure:18934: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:18901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -18918,12 +18963,12 @@
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:18922: checking for alloca" >&5
+echo "configure:18967: 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:19000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -18983,12 +19028,12 @@
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:18987: checking whether alloca needs Cray hooks" >&5
+echo "configure:19032: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&6
-echo "configure:19017: checking for $ac_func" >&5
+echo "configure:19062: 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:19090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -19068,7 +19113,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:19072: checking stack direction for C alloca" >&5
+echo "configure:19117: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19076,7 +19121,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:19144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -19144,17 +19189,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19148: checking for $ac_hdr" >&5
+echo "configure:19193: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:19203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -19245,7 +19290,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19249: checking for $ac_word" >&5
+echo "configure:19294: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19289,19 +19334,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:19293: checking for cairo >= $CAIRO_VERSION" >&5
+echo "configure:19338: checking for cairo >= $CAIRO_VERSION" >&5
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
-echo "configure:19300: checking CAIRO_CFLAGS" >&5
+echo "configure:19345: checking CAIRO_CFLAGS" >&5
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
-echo "configure:19305: checking CAIRO_LIBS" >&5
+echo "configure:19350: checking CAIRO_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
@@ -19366,7 +19411,7 @@
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19370: checking for $ac_word" >&5
+echo "configure:19415: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19642,14 +19687,14 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <
int main() {
int x = 1; x++;
; return 0; }
EOF
-if { (eval echo configure:19653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -19833,6 +19878,7 @@
+
CFLAGS=`echo \
$_WARNINGS_CFLAGS \
$CFLAGS`
@@ -19956,7 +20002,7 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <
@@ -19972,7 +20018,7 @@
; return 0; }
EOF
-if { (eval echo configure:19976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -20190,34 +20236,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
@@ -20457,6 +20484,9 @@
s%@NSS_CONFIG@%$NSS_CONFIG%g
s%@NSS_CFLAGS@%$NSS_CFLAGS%g
s%@NSS_LIBS@%$NSS_LIBS%g
+s%@SYSTEM_MYSPELL@%$SYSTEM_MYSPELL%g
+s%@MOZ_MYSPELL_LIBS@%$MOZ_MYSPELL_LIBS%g
+s%@MOZ_MYSPELL_CFLAGS@%$MOZ_MYSPELL_CFLAGS%g
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
s%@GTK_LIBS@%$GTK_LIBS%g
@@ -20519,6 +20549,8 @@
s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g
s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g
s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g
+s%@MOZ_LIBTHAI_CFLAGS@%$MOZ_LIBTHAI_CFLAGS%g
+s%@MOZ_LIBTHAI_LIBS@%$MOZ_LIBTHAI_LIBS%g
s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g
s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g
s%@MOZ_NO_FAST_LOAD@%$MOZ_NO_FAST_LOAD%g
@@ -20694,6 +20726,7 @@
s%@ENABLE_TESTS@%$ENABLE_TESTS%g
s%@IBMBIDI@%$IBMBIDI%g
s%@SUNCTL@%$SUNCTL%g
+s%@MOZ_ENABLE_LIBTHAI_COMPONENT@%$MOZ_ENABLE_LIBTHAI_COMPONENT%g
s%@ACCESSIBILITY@%$ACCESSIBILITY%g
s%@MOZ_XPINSTALL@%$MOZ_XPINSTALL%g
s%@MOZ_VIEW_SOURCE@%$MOZ_VIEW_SOURCE%g
@@ -21156,7 +21189,7 @@
fi
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -21299,7 +21332,7 @@
fi
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
--- firefox-2.0.0.14+1nobinonly.orig/configure.in
+++ firefox-2.0.0.14+1nobinonly/configure.in
@@ -565,9 +565,6 @@
AC_PATH_PROG(AUTOCONF, autoconf, :)
AC_PATH_PROG(UNZIP, unzip, :)
AC_PATH_PROGS(ZIP, zip)
-if test -z "$ZIP" || test "$ZIP" = ":"; then
- AC_MSG_ERROR([zip not found in \$PATH])
-fi
AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
AC_PATH_PROG(XARGS, xargs)
if test -z "$XARGS" || test "$XARGS" = ":"; then
@@ -3914,6 +3911,22 @@
fi # SKIP_LIBRARY_CHECKS
+dnl system MySpell Support
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(system-myspell,
+[ --enable-system-myspell Use system myspell (located with pkgconfig)],
+ SYSTEM_MYSPELL=1 )
+
+if test -n "$SYSTEM_MYSPELL"; then
+ dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
+ MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
+ MOZ_MYSPELL_LIBS="-lhunspell"
+fi
+
+AC_SUBST(SYSTEM_MYSPELL)
+AC_SUBST(MOZ_MYSPELL_LIBS)
+AC_SUBST(MOZ_MYSPELL_CFLAGS)
+
dnl ========================================================
dnl Java SDK support
dnl ========================================================
@@ -4933,6 +4946,23 @@
SUNCTL= )
dnl ========================================================
+dnl mozlibthai word break component,
+dnl built on libthai existence
+dnl ========================================================
+MOZ_ENABLE_LIBTHAI_COMPONENT=
+MOZ_ARG_DISABLE_BOOL(libthai,
+[ --disable-libthai Disable Thai word break support with libthai],
+ MOZ_ENABLE_LIBTHAI_COMPONENT=,
+ MOZ_ENABLE_LIBTHAI_COMPONENT=1)
+if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then
+ PKG_CHECK_MODULES(MOZ_LIBTHAI, libthai,[
+ MOZ_ENABLE_LIBTHAI_COMPONENT=1
+ ],[
+ MOZ_ENABLE_LIBTHAI_COMPONENT=
+ ])
+fi
+
+dnl ========================================================
dnl view source support on by default
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(view-source,
@@ -6135,6 +6165,13 @@
AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, both, or symlink])
fi
+if test "$MOZ_CHROME_FILE_FORMAT" = "jar" ||
+ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then
+ if test -z "$ZIP" || test "$ZIP" = ":"; then
+ AC_MSG_ERROR([zip is required for chrome format $MOZ_CHROME_FILE_FORMAT])
+ fi
+fi
+
dnl ========================================================
dnl = Define default location for MOZILLA_FIVE_HOME
dnl ========================================================
@@ -7159,6 +7196,7 @@
AC_SUBST(ENABLE_TESTS)
AC_SUBST(IBMBIDI)
AC_SUBST(SUNCTL)
+AC_SUBST(MOZ_ENABLE_LIBTHAI_COMPONENT)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_XPINSTALL)
AC_SUBST(MOZ_VIEW_SOURCE)
--- firefox-2.0.0.14+1nobinonly.orig/allmakefiles.sh
+++ firefox-2.0.0.14+1nobinonly/allmakefiles.sh
@@ -225,6 +225,8 @@
intl/locale/src/windows/Makefile
intl/locale/tests/Makefile
intl/lwbrk/Makefile
+intl/lwbrk/components/Makefile
+intl/lwbrk/components/libthai/Makefile
intl/lwbrk/src/Makefile
intl/lwbrk/public/Makefile
intl/lwbrk/tests/Makefile
--- firefox-2.0.0.14+1nobinonly.orig/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/Makefile.in
@@ -290,6 +290,10 @@
endif
endif
+ifdef MOZ_ENABLE_LIBTHAI_COMPONENT
+tier_50_dirs += intl/lwbrk/components/libthai
+endif
+
ifdef MOZ_LEAKY
tier_50_dirs += tools/leaky
endif
@@ -447,6 +451,7 @@
GARBAGE_DIRS += dist
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
+ gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
unallmakefiles mozilla-config.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
--- firefox-2.0.0.14+1nobinonly.orig/config/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/config/Makefile.in
@@ -141,6 +141,8 @@
-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
$(INSTALL) system_wrappers $(DIST)/include
+
+GARBAGE_DIRS += system_wrappers
endif
# we don't use an explicit dependency here because then we would
--- firefox-2.0.0.14+1nobinonly.orig/config/autoconf.mk.in
+++ firefox-2.0.0.14+1nobinonly/config/autoconf.mk.in
@@ -57,13 +57,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/mozilla-firefox
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = @datadir@/idl/mozilla-firefox
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir = $(libdir)/firefox
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib
@@ -116,6 +116,9 @@
ENABLE_TESTS = @ENABLE_TESTS@
IBMBIDI = @IBMBIDI@
SUNCTL = @SUNCTL@
+MOZ_ENABLE_LIBTHAI_COMPONENT = @MOZ_ENABLE_LIBTHAI_COMPONENT@
+MOZ_LIBTHAI_CFLAGS = @MOZ_LIBTHAI_CFLAGS@
+MOZ_LIBTHAI_LIBS = @MOZ_LIBTHAI_LIBS@
ACCESSIBILITY = @ACCESSIBILITY@
MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
MOZ_XPINSTALL = @MOZ_XPINSTALL@
@@ -190,6 +193,10 @@
NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
NECKO_COOKIES = @NECKO_COOKIES@
+MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
+MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
+MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@
+
MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
MOZ_NATIVE_PNG = @SYSTEM_PNG@
--- firefox-2.0.0.14+1nobinonly.orig/config/config.mk
+++ firefox-2.0.0.14+1nobinonly/config/config.mk
@@ -461,10 +461,14 @@
# Flags passed to make-jars.pl
MAKE_JARS_FLAGS = \
- -s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \
+ -s $(srcdir) -t $(topsrcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl \
-f $(MOZ_CHROME_FILE_FORMAT) \
$(NULL)
+ifdef ZIP
+MAKE_JARS_FLAGS += -z $(ZIP)
+endif
+
ifdef NO_JAR_AUTO_REG
MAKE_JARS_FLAGS += -a
endif
--- firefox-2.0.0.14+1nobinonly.orig/config/make-jars.pl
+++ firefox-2.0.0.14+1nobinonly/config/make-jars.pl
@@ -137,7 +137,7 @@
$zipprog = $::opt_z;
}
-if ($zipprog eq "") {
+if (($fileformat eq "jar" || $fileformat eq "both") && $zipprog eq "") {
print "A valid zip program must be given via the -z option or the ZIP environment variable. Exiting.\n";
exit(1);
}
@@ -514,6 +514,7 @@
my $dest = $1;
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0);
+ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0) if ($fileformat eq "flat");
$args = "$args$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg &&
$dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
@@ -526,6 +527,7 @@
my $dest = $1;
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0);
+ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0) if ($fileformat eq "flat");
$overrides = "$overrides$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
{
@@ -538,6 +540,7 @@
my $dest = $1;
my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1);
+ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1) if ($fileformat eq "flat");
$overrides = "$overrides$dest ";
if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
{
--- firefox-2.0.0.14+1nobinonly.orig/config/rules.mk
+++ firefox-2.0.0.14+1nobinonly/config/rules.mk
@@ -1569,6 +1569,7 @@
install:: $(CHROME_DEPS)
ifndef NO_INSTALL
+ifndef XPI_NAME
@$(EXIT_ON_ERROR) \
if test -f $(JAR_MANIFEST); then \
if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \
@@ -1576,12 +1577,13 @@
$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
$(JAR_MANIFEST) | \
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
- -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \
+ -d $(MAKE_JARS_TARGET)/chrome -j $(DESTDIR)$(mozappdir)/chrome \
$(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
$(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
fi
endif
+endif
ifneq ($(DIST_FILES),)
libs:: $(DIST_FILES)
--- firefox-2.0.0.14+1nobinonly.orig/config/static-rules.mk
+++ firefox-2.0.0.14+1nobinonly/config/static-rules.mk
@@ -14,6 +14,8 @@
sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \
> $(_TARGET)
+GARBAGE += nsStaticComponents.cpp
+
ifeq ($(OS_ARCH),IRIX)
LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80
endif
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/idl/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/idl/Makefile.in
@@ -46,6 +46,7 @@
XPIDLSRCS = \
nsISemanticUnitScanner.idl \
+ nsIThaiLineBreaker.idl \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/idl/nsIThaiLineBreaker.idl
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/idl/nsIThaiLineBreaker.idl
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Theppitak Karoonboonyanan
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+%{C++
+// {5E1CD5F3-C757-45A5-BDA2-60D530236473}
+#define NS_THAILINEBREAKER_CID { 0x5e1cd5f3, 0xc757, 0x45a5, { 0xbd, 0xa2, 0x60, 0xd5, 0x30, 0x23, 0x64, 0x73}}
+#define NS_THAILINEBREAKER_CONTRACTID "@mozilla.org/intl/thailinebreaker;1"
+%}
+
+/**
+ * Provides Thai line breaker
+ */
+[scriptable, uuid(5e1cd5f3-c757-45a5-bda2-60d530236473)]
+interface nsIThaiLineBreaker : nsISupports {
+ boolean breakInBetween (in wstring aText1, in unsigned long aTextLen1,
+ in wstring aText2, in unsigned long aTextLen2);
+
+ void next (in wstring aText, in unsigned long aLen, in unsigned long aPos,
+ out unsigned long pos, out boolean needMoreText);
+
+ void prev (in wstring aText, in unsigned long aLen, in unsigned long aPos,
+ out unsigned long pos, out boolean needMoreText);
+};
+
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
@@ -49,6 +49,7 @@
#include "rulebrk.h"
#include "nsUnicharUtils.h"
+#include "nsIServiceManager.h"
/*
@@ -238,6 +239,12 @@
}
static inline int
+IS_THAI(PRUnichar u)
+{
+ return (0x0e01 <= (u) && (u) <= 0x0e5b);
+}
+
+static inline int
IS_SPACE(PRUnichar u)
{
return ((u) == 0x0020 || (u) == 0x0009 || (u) == 0x000a || (u) == 0x000d || (u)==0x200b);
@@ -254,7 +261,7 @@
{
c = GETCLASSFROMTABLE(gLBClass00, l);
}
- else if(th_isthai(u))
+ else if(IS_THAI(u))
{
c = CLASS_THAI;
}
@@ -342,11 +349,17 @@
return (0 == ((gPair[c1] >> c2 ) & 0x0001));
}
+nsCOMPtr nsJISx4051LineBreaker::GetThaiLineBreaker()
+{
+ if (!mThaiLineBreaker)
+ mThaiLineBreaker = do_GetService (NS_THAILINEBREAKER_CONTRACTID);
+ return mThaiLineBreaker;
+}
nsJISx4051LineBreaker::nsJISx4051LineBreaker(
const PRUnichar* aNoBegin, PRInt32 aNoBeginLen,
const PRUnichar* aNoEnd, PRInt32 aNoEndLen
-)
+) : mThaiLineBreaker(nsnull)
{
}
@@ -427,7 +440,7 @@
{
if (IS_SPACE(aText1[cur]))
break;
- if (IS_CJK_CHAR(aText1[cur]))
+ if (IS_CJK_CHAR(aText1[cur]) || IS_THAI(aText1[cur]))
goto ROUTE_CJK_BETWEEN;
}
@@ -435,7 +448,7 @@
{
if (IS_SPACE(aText2[cur]))
break;
- if (IS_CJK_CHAR(aText2[cur]))
+ if (IS_CJK_CHAR(aText2[cur]) || IS_THAI(aText2[cur]))
goto ROUTE_CJK_BETWEEN;
}
@@ -463,7 +476,12 @@
/* Handle cases for THAI */
if((CLASS_THAI == c1) && (CLASS_THAI == c2))
{
- *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
+ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker();
+ if (pThaiLineBreaker)
+ return pThaiLineBreaker->BreakInBetween(aText1, aTextLen1,
+ aText2, aTextLen2, oCanBreak);
+ else
+ *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
}
else
{
@@ -487,13 +505,16 @@
PRUint32 cur;
for (cur = aPos; cur < aLen; ++cur)
{
- if (IS_SPACE(aText[cur]))
+ if (IS_SPACE(GetUnichar(&aText[cur])))
{
*oNext = cur;
*oNeedMoreText = PR_FALSE;
return NS_OK;
}
- if (IS_CJK_CHAR(aText[cur]))
+ // [thep's version]:
+ // if (IS_CJK_CHAR(&aText[cur]) || IS_THAI(&aText[cur]))
+ // [with RISC unichar fix]:
+ if (IS_CJK_CHAR(GetUnichar(&aText[cur])) || IS_THAI(GetUnichar(&aText[cur])))
goto ROUTE_CJK_NEXT;
}
*oNext = aLen;
@@ -503,31 +524,36 @@
ROUTE_CJK_NEXT:
PRInt8 c1, c2;
cur = aPos;
- if(NEED_CONTEXTUAL_ANALYSIS(aText[cur]))
+ if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
{
- c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0,
- aText[cur],
- (cur<(aLen-1)) ?aText[cur+1]:0);
+ c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
+ GetUnichar(&aText[cur]),
+ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
} else {
- c1 = this->GetClass(aText[cur]);
+ c1 = this->GetClass(GetUnichar(&aText[cur]));
}
if(CLASS_THAI == c1)
{
- *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
- *oNeedMoreText = PR_FALSE;
- return NS_OK;
+ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker();
+ if (pThaiLineBreaker) {
+ return pThaiLineBreaker->Next(aText, aLen, aPos, oNext, oNeedMoreText);
+ } else {
+ *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
+ *oNeedMoreText = PR_FALSE;
+ return NS_OK;
+ }
}
for(cur++; cur ContextualAnalysis((cur>0)?aText[cur-1]:0,
- aText[cur],
- (cur<(aLen-1)) ?aText[cur+1]:0);
+ c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
+ GetUnichar(&aText[cur]),
+ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
} else {
- c2 = this->GetClass(aText[cur]);
+ c2 = this->GetClass(GetUnichar(&aText[cur]));
}
if(GetPair(c1, c2)) {
@@ -563,7 +589,7 @@
*oNeedMoreText = PR_FALSE;
return NS_OK;
}
- if (IS_CJK_CHAR(aText[cur]))
+ if (IS_CJK_CHAR(aText[cur]) || IS_THAI(aText[cur]))
goto ROUTE_CJK_PREV;
}
@@ -582,10 +608,26 @@
} else {
c2 = this->GetClass(aText[cur-1]);
}
- // To Do:
- //
- // Should handle CLASS_THAI here
- //
+
+ if(CLASS_THAI == c2)
+ {
+ nsCOMPtr pThaiLineBreaker = GetThaiLineBreaker();
+ if (pThaiLineBreaker) {
+ return pThaiLineBreaker->Prev(aText, aLen, aPos, oPrev, oNeedMoreText);
+ } else {
+ // TODO: do some fallback analysis instead
+ for (aPos--; aPos > 0; aPos--) {
+ if (!IS_THAI(aText[aPos])) {
+ *oPrev = aPos;
+ *oNeedMoreText = PR_FALSE;
+ return NS_OK;
+ }
+ }
+ *oNeedMoreText = PR_TRUE;
+ return NS_OK;
+ }
+ }
+
for(cur--; cur > 0; cur--)
{
if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1]))
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/src/nsJISx4501LineBreaker.h
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/src/nsJISx4501LineBreaker.h
@@ -40,6 +40,9 @@
#include "nsILineBreaker.h"
+#include "nsCOMPtr.h"
+#include "nsIThaiLineBreaker.h"
+
class nsJISx4051LineBreaker : public nsILineBreaker
{
NS_DECL_ISUPPORTS
@@ -66,6 +69,10 @@
PRInt8 ContextualAnalysis(PRUnichar prev, PRUnichar cur, PRUnichar next );
PRBool GetPair(PRInt8 c1, PRInt8 c2);
+ nsCOMPtr GetThaiLineBreaker();
+
+protected:
+ nsCOMPtr mThaiLineBreaker;
};
#endif /* nsJISx4501LineBreaker_h__ */
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/components/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/components/Makefile.in
@@ -0,0 +1,48 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = libthai
+
+include $(topsrcdir)/config/rules.mk
+
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/components/libthai/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/components/libthai/Makefile.in
@@ -0,0 +1,74 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla GNOME integration code.
+#
+# The Initial Developer of the Original Code is
+# IBM Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = mozlibthai
+MOZILLA_INTERNAL_API = 1
+
+ifeq ($(MOZ_ENABLE_LIBTHAI_COMPONENT), 1)
+
+LIBRARY_NAME = mozlibthai
+FORCE_SHARED_LIB = 1
+IS_COMPONENT = 1
+
+REQUIRES = \
+ xpcom \
+ unicharutil \
+ lwbrk \
+ $(NULL)
+
+CPPSRCS = \
+ nsLibThaiLineBreaker.cpp \
+ nsLibThaiModule.cpp \
+ $(NULL)
+
+CXXFLAGS += $(MOZ_LIBTHAI_CFLAGS)
+EXTRA_DSO_LDOPTS += \
+ $(MOZ_COMPONENT_LIBS) \
+ $(NSPR_LIBS) \
+ $(MOZ_LIBTHAI_LIBS) \
+ $(NULL)
+
+endif
+
+include $(topsrcdir)/config/rules.mk
+
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp
@@ -0,0 +1,221 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * - Theppitak Karoonboonyanan
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include
+#include
+
+#include "nsLibThaiLineBreaker.h"
+
+
+//// class BreakEntry implementation ////
+
+void BreakEntry::Set (const PRUnichar* pText, PRUint32 textLen,
+ int* pvPos, int posLen)
+{
+ Clear();
+
+ mText = new PRUnichar [textLen+1];
+ for (PRUnichar i = 0; i < textLen; i++)
+ mText[i] = pText[i];
+ mText[textLen] = 0;
+ mTextLen = textLen;
+
+ mPos = new int [posLen];
+ for (int j = 0; j < posLen; j++)
+ mPos[j] = pvPos[j];
+ mPosLen = posLen;
+}
+
+//// class BreakCache implementation ////
+
+static PRUint16 StringHash (const PRUnichar* pText, PRUint32 textLen)
+{
+ PRUint16 h = 0;
+ for (PRUint32 i = 0; i < textLen; i++) {
+ h = (h >> 12) ^ (h << 4) ^ pText[i];
+ }
+ return h;
+}
+
+BreakEntry& BreakCache::LookUp (const PRUnichar* pText, PRUint32 textLen)
+{
+ return mvBucket [StringHash (pText, textLen) % N_BUCKETS];
+}
+
+
+//// class nsLibThaiLineBreaker implementation ////
+
+static thchar_t* GetTISText (const PRUnichar* pText, PRUint32 textLen)
+{
+ thchar_t* pTISText = new thchar_t [textLen + 1];
+ PRUint32 i;
+ for (i = 0; i < textLen; i++)
+ pTISText[i] = th_uni2tis (pText[i]);
+ pTISText[i] = '\0';
+
+ return pTISText;
+}
+
+static void FreeTISText (thchar_t* pTISText)
+{
+ delete pTISText;
+}
+
+static PRBool IsStrEqual (const PRUnichar* pText1, PRUint32 len1,
+ const PRUnichar* pText2, PRUint32 len2)
+{
+ if (len1 != len2)
+ return PR_FALSE;
+
+ for (PRUint32 i = 0; i < len1; ++i)
+ if (pText1[i] != pText2[i])
+ return PR_FALSE;
+
+ return PR_TRUE;
+}
+
+int nsLibThaiLineBreaker::GetBreaks (
+ const PRUnichar* pText, PRUint32 textLen, int vPos[], int nPos)
+{
+ // Call the expensive th_brk() only if uncached
+ BreakEntry& breakEntry = mBreakCache.LookUp (pText, textLen);
+ if (!IsStrEqual (breakEntry.Text(), breakEntry.TextLength(), pText, textLen))
+ {
+ thchar_t* pTISText = GetTISText (pText, textLen);
+ int* pBreaks = new int [nPos];
+ int nBreaks = th_brk (pTISText, pBreaks, nPos);
+ FreeTISText (pTISText);
+
+ breakEntry.Set (pText, textLen, pBreaks, nBreaks);
+ delete pBreaks;
+ }
+
+ for (int i = 0; i < breakEntry.PosLength(); ++i)
+ vPos [i] = breakEntry.Pos (i);
+ return breakEntry.PosLength();
+}
+
+NS_IMPL_ISUPPORTS1 (nsLibThaiLineBreaker, nsIThaiLineBreaker)
+
+
+NS_IMETHODIMP nsLibThaiLineBreaker::BreakInBetween(
+ const PRUnichar* aText1 , PRUint32 aTextLen1,
+ const PRUnichar* aText2 , PRUint32 aTextLen2,
+ PRBool* oCanBreak)
+{
+ if (!aText1 || !aText2 || (0 == aTextLen1) || (0 == aTextLen2))
+ {
+ *oCanBreak = PR_FALSE;
+ return NS_OK;
+ }
+
+ PRBool result = PR_FALSE;
+
+ PRUnichar *pConcat = new PRUnichar [aTextLen1 + aTextLen2];
+ for (PRUint32 i = 0; i < aTextLen1; i++)
+ pConcat[i] = aText1[i];
+ for (PRUint32 i = 0; i < aTextLen2; i++)
+ pConcat[aTextLen1 + i] = aText2[i];
+
+ int* pBreaks = new int [aTextLen1 + aTextLen2 + 1];
+ int nBreaks = GetBreaks (pConcat, aTextLen1 + aTextLen2,
+ pBreaks, int (aTextLen1 + aTextLen2 + 1));
+ for (int i = 0; i < nBreaks; i++) {
+ if (PRUint32 (pBreaks[i]) == aTextLen1) {
+ result = PR_TRUE;
+ break;
+ }
+ }
+ delete pBreaks;
+
+ delete pConcat;
+
+ *oCanBreak = result;
+ return NS_OK;
+}
+
+
+NS_IMETHODIMP nsLibThaiLineBreaker::Next(
+ const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
+ PRUint32* oNext, PRBool* oNeedMoreText)
+{
+ NS_ASSERTION(aText, "aText shouldn't be null");
+ NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
+
+ *oNeedMoreText = PR_TRUE;
+ *oNext = aLen;
+
+ int* pBreaks = new int [aLen + 1];
+ int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
+ for (int i = 0; i < nBreaks; i++) {
+ if (PRUint32 (pBreaks[i]) > aPos) {
+ *oNext = pBreaks[i];
+ *oNeedMoreText = PR_FALSE;
+ break;
+ }
+ }
+ delete pBreaks;
+
+ return NS_OK;
+}
+
+
+NS_IMETHODIMP nsLibThaiLineBreaker::Prev(
+ const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
+ PRUint32* oPrev, PRBool* oNeedMoreText)
+{
+ NS_ASSERTION(aText, "aText shouldn't be null");
+ NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
+
+ *oNeedMoreText = PR_TRUE;
+ *oPrev = 0;
+
+ int* pBreaks = new int [aLen + 1];
+ int nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
+ for (int i = nBreaks - 1; i >= 0; i--) {
+ if (PRUint32 (pBreaks[i]) < aPos) {
+ *oPrev = pBreaks[i];
+ *oNeedMoreText = PR_FALSE;
+ break;
+ }
+ }
+ delete pBreaks;
+
+ return NS_OK;
+}
+
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * - Theppitak Karoonboonyanan
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsLibThaiLineBreaker_h__
+#define nsLibThaiLineBreaker_h__
+
+#include "nsIThaiLineBreaker.h"
+
+/*
+ * Break Positions Info Entry
+ */
+class BreakEntry {
+public:
+ BreakEntry();
+ ~BreakEntry();
+
+ void Set (const PRUnichar* pText, PRUint32 textLen, int* pvPos, int posLen);
+
+ const PRUnichar* Text() const;
+ PRUint32 TextLength() const;
+ int Pos(int index) const;
+ int PosLength() const;
+
+private:
+ void Clear();
+
+private:
+ PRUnichar* mText;
+ PRUint32 mTextLen;
+ int* mPos;
+ int mPosLen;
+};
+
+inline BreakEntry::BreakEntry()
+ : mText (nsnull), mTextLen (0), mPos (nsnull), mPosLen (0)
+{
+}
+
+inline BreakEntry::~BreakEntry()
+{
+ Clear();
+}
+
+inline void BreakEntry::Clear()
+{
+ if (mText)
+ delete mText;
+ if (mPos)
+ delete mPos;
+}
+
+inline const PRUnichar* BreakEntry::Text() const
+{
+ return mText;
+}
+
+inline PRUint32 BreakEntry::TextLength() const
+{
+ return mTextLen;
+}
+
+inline int BreakEntry::Pos (int index) const
+{
+ return (mPos && index < mPosLen) ? mPos[index] : -1;
+}
+
+inline int BreakEntry::PosLength() const
+{
+ return mPosLen;
+}
+
+
+/*
+ * Break Positions Info Cache
+ */
+class BreakCache
+{
+public:
+ BreakEntry& LookUp (const PRUnichar* pText, PRUint32 textLen);
+
+private:
+ enum { N_BUCKETS = 19 };
+ BreakEntry mvBucket[N_BUCKETS];
+};
+
+
+/*
+ * Thai Line Breaker using LibThai
+ */
+class nsLibThaiLineBreaker : public nsIThaiLineBreaker
+{
+ NS_DECL_ISUPPORTS
+
+public:
+ NS_IMETHOD BreakInBetween (const PRUnichar* aText1 , PRUint32 aTextLen1,
+ const PRUnichar* aText2 , PRUint32 aTextLen2,
+ PRBool* oCanBreak);
+
+ NS_IMETHOD Next (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
+ PRUint32* oNext, PRBool* oNeedMoreText);
+
+ NS_IMETHOD Prev (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
+ PRUint32* oPrev, PRBool* oNeedMoreText);
+
+protected:
+ int GetBreaks (const PRUnichar* pText, PRUint32 textLen,
+ int vPos[], int nPos);
+
+private:
+ BreakCache mBreakCache;
+};
+
+#endif /* nsLibThaiLineBreaker_h__ */
--- firefox-2.0.0.14+1nobinonly.orig/intl/lwbrk/components/libthai/nsLibThaiModule.cpp
+++ firefox-2.0.0.14+1nobinonly/intl/lwbrk/components/libthai/nsLibThaiModule.cpp
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla GNOME integration code.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Theppitak Karoonboonyanan
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsLibThaiLineBreaker.h"
+#include "nsIGenericFactory.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLibThaiLineBreaker)
+
+static const nsModuleComponentInfo components[] = {
+ { "LibThai Line Breaker",
+ NS_THAILINEBREAKER_CID,
+ NS_THAILINEBREAKER_CONTRACTID,
+ nsLibThaiLineBreakerConstructor }
+};
+
+NS_IMPL_NSGETMODULE(mozlibthai, components)
+
--- firefox-2.0.0.14+1nobinonly.orig/intl/unicharutil/util/nsUnicharUtils.cpp
+++ firefox-2.0.0.14+1nobinonly/intl/unicharutil/util/nsUnicharUtils.cpp
@@ -348,3 +348,26 @@
return result;
}
+PRUnichar
+GetUnichar(const void *ptr)
+{
+ PRUnichar result;
+#if NEED_STRICT_ALIGNMENT
+ *((char *) &result) = *((char *) ptr);
+ *((char *) &result + 1) = *((char *) ptr + 1);
+#else
+ result = *((PRUnichar *) ptr);
+#endif
+ return result;
+}
+
+void
+SetUnichar(void *ptr, PRUnichar aChar)
+{
+#if NEED_STRICT_ALIGNMENT
+ *((char *) ptr) = *((char *) &aChar);
+ *((char *) ptr + 1) = *((char *) &aChar + 1);
+#else
+ *((PRUnichar *) ptr) = aChar;
+#endif
+}
--- firefox-2.0.0.14+1nobinonly.orig/intl/unicharutil/util/nsUnicharUtils.h
+++ firefox-2.0.0.14+1nobinonly/intl/unicharutil/util/nsUnicharUtils.h
@@ -82,6 +82,11 @@
PRUnichar ToUpperCase(PRUnichar);
PRUnichar ToLowerCase(PRUnichar);
+#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__)
+
+PRUnichar GetUnichar(const void *);
+void SetUnichar(void *, PRUnichar);
+
inline PRBool IsUpperCase(PRUnichar c) {
return ToLowerCase(c) != c;
}
--- firefox-2.0.0.14+1nobinonly.orig/profile/dirserviceprovider/standalone/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/profile/dirserviceprovider/standalone/Makefile.in
@@ -65,3 +65,5 @@
export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)
$(INSTALL) $^ .
+
+GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS))
--- firefox-2.0.0.14+1nobinonly.orig/uriloader/exthandler/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/uriloader/exthandler/Makefile.in
@@ -103,7 +103,7 @@
LOCAL_INCLUDES = -I$(srcdir)
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-OSHELPER += nsGNOMERegistry.cpp
+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
--- firefox-2.0.0.14+1nobinonly.orig/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ firefox-2.0.0.14+1nobinonly/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -42,7 +42,6 @@
#include "nsString.h"
#include "nsIComponentManager.h"
#include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
#include "nsAutoPtr.h"
#include
@@ -56,12 +55,12 @@
typedef struct _GnomeProgram GnomeProgram;
typedef struct _GnomeModuleInfo GnomeModuleInfo;
-typedef struct {
+struct GnomeVFSMimeApplication {
char *id;
char *name;
char *command;
/* there is more here, but we don't need it */
-} GnomeVFSMimeApplication;
+};
typedef GConfClient * (*_gconf_client_get_default_fn)();
typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
@@ -264,7 +263,7 @@
}
-/* static */ already_AddRefed
+/* static */ already_AddRefed
nsGNOMERegistry::GetFromExtension(const char *aFileExt)
{
if (!gconfLib)
@@ -286,7 +285,7 @@
return GetFromType(mimeType);
}
-/* static */ already_AddRefed
+/* static */ already_AddRefed
nsGNOMERegistry::GetFromType(const char *aMIMEType)
{
if (!gconfLib)
@@ -296,7 +295,7 @@
if (!handlerApp)
return nsnull;
- nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+ nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType);
NS_ENSURE_TRUE(mimeInfo, nsnull);
// Get the list of extensions and append then to the mimeInfo.
@@ -320,11 +319,21 @@
return nsnull;
}
- gchar *commandPath = g_find_program_in_path(nativeCommand);
+ gchar **argv;
+ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
+ if (!res) {
+ NS_ERROR("Could not convert helper app command to filesystem encoding");
+ _gnome_vfs_mime_application_free(handlerApp);
+ return nsnull;
+ }
+
+ gchar *commandPath = g_find_program_in_path(argv[0]);
g_free(nativeCommand);
+ g_strfreev(argv);
if (!commandPath) {
+ NS_WARNING("could not find command in path");
_gnome_vfs_mime_application_free(handlerApp);
return nsnull;
}
@@ -342,7 +351,7 @@
_gnome_vfs_mime_application_free(handlerApp);
- nsMIMEInfoBase* retval;
+ nsMIMEInfoUnix* retval;
NS_ADDREF((retval = mimeInfo));
return retval;
}
--- firefox-2.0.0.14+1nobinonly.orig/uriloader/exthandler/unix/nsGNOMERegistry.h
+++ firefox-2.0.0.14+1nobinonly/uriloader/exthandler/unix/nsGNOMERegistry.h
@@ -35,10 +35,13 @@
*
* ***** END LICENSE BLOCK ***** */
+#ifndef nsGNOMERegistry_h__
+#define nsGNOMERegistry_h__
+
#include "nsIURI.h"
#include "nsCOMPtr.h"
-class nsMIMEInfoBase;
+#include "nsMIMEInfoUnix.h"
class nsGNOMERegistry
{
@@ -52,7 +55,9 @@
static void GetAppDescForScheme(const nsACString& aScheme,
nsAString& aDesc);
- static already_AddRefed GetFromExtension(const char *aFileExt);
+ static already_AddRefed GetFromExtension(const char *aFileExt);
- static already_AddRefed GetFromType(const char *aMIMEType);
+ static already_AddRefed GetFromType(const char *aMIMEType);
};
+
+#endif // nsGNOMERegistry_h__
--- firefox-2.0.0.14+1nobinonly.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ firefox-2.0.0.14+1nobinonly/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -0,0 +1,196 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Christopher Aillon (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMIMEInfoUnix.h"
+#include "prlink.h"
+#include "prmem.h"
+#include
+#include
+
+static PRLibrary *gnomeLib;
+static PRLibrary *vfsLib;
+
+typedef struct _GnomeProgram GnomeProgram;
+typedef struct _GnomeModuleInfo GnomeModuleInfo;
+
+typedef enum {
+ GNOME_VFS_OK // there's more but we don't care about them.
+} GnomeVFSResult;
+
+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
+ (GnomeVFSMimeApplication *app,
+ GList *uris);
+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
+ const GnomeModuleInfo *, int,
+ char **, const char *, ...);
+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
+typedef GnomeProgram * (*_gnome_program_get_fn)();
+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
+
+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
+
+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
+DECL_FUNC_PTR(gnome_program_init);
+DECL_FUNC_PTR(gnome_program_get);
+DECL_FUNC_PTR(libgnome_module_info_get);
+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
+
+static PRLibrary *
+LoadVersionedLibrary(const char* libName, const char* libVersion)
+{
+ char *platformLibName = PR_GetLibraryName(nsnull, libName);
+ nsCAutoString versionLibName(platformLibName);
+ versionLibName.Append(libVersion);
+ PR_Free(platformLibName);
+ return PR_LoadLibrary(versionLibName.get());
+}
+
+static void
+Cleanup()
+{
+ // Unload all libraries
+ if (gnomeLib)
+ PR_UnloadLibrary(gnomeLib);
+ if (vfsLib)
+ PR_UnloadLibrary(vfsLib);
+
+ gnomeLib = vfsLib = nsnull;
+}
+
+static void
+InitGnomeVFS()
+{
+ static PRBool initialized = PR_FALSE;
+
+ if (initialized)
+ return;
+
+ #define ENSURE_LIB(lib) \
+ PR_BEGIN_MACRO \
+ if (!lib) { \
+ Cleanup(); \
+ return; \
+ } \
+ PR_END_MACRO
+
+ #define GET_LIB_FUNCTION(lib, func, failure) \
+ PR_BEGIN_MACRO \
+ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
+ if (!_##func) { \
+ failure; \
+ } \
+ PR_END_MACRO
+
+ // Attempt to open libgnome
+ gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+ ENSURE_LIB(gnomeLib);
+
+ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
+ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
+ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
+
+ // Attempt to open libgnomevfs
+ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+ ENSURE_LIB(vfsLib);
+
+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
+ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
+
+ // Initialize GNOME, if it's not already initialized. It's not
+ // necessary to tell GNOME about our actual command line arguments.
+
+ if (!_gnome_program_get()) {
+ char *argv[1] = { "gecko" };
+ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
+ 1, argv, NULL);
+ }
+
+ // Note: after GNOME has been initialized, do not ever unload these
+ // libraries. They register atexit handlers, so if they are unloaded, we'll
+ // crash on exit.
+}
+
+void
+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
+{
+ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
+ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
+
+ mPreferredAction = nsIMIMEInfo::useSystemDefault;
+
+ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
+ if (name)
+ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
+ }
+}
+
+nsMIMEInfoUnix::~nsMIMEInfoUnix()
+{
+ if (mDefaultVFSApplication)
+ _gnome_vfs_mime_application_free(mDefaultVFSApplication);
+}
+
+nsresult
+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
+{
+ NS_ENSURE_ARG_POINTER(aFile);
+
+ InitGnomeVFS();
+
+ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
+ nsCAutoString nativePath;
+ aFile->GetNativePath(nativePath);
+
+ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
+
+ GList *uris = NULL;
+ uris = g_list_append(uris, uri);
+
+ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
+
+ g_free(uri);
+ g_list_free(uris);
+
+ if (result != GNOME_VFS_OK)
+ return NS_ERROR_FAILURE;
+
+ return NS_OK;
+ }
+
+ if (!mDefaultApplication)
+ return NS_ERROR_FILE_NOT_FOUND;
+
+ return LaunchWithIProcess(mDefaultApplication, aFile);
+}
--- firefox-2.0.0.14+1nobinonly.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.h
+++ firefox-2.0.0.14+1nobinonly/uriloader/exthandler/unix/nsMIMEInfoUnix.h
@@ -0,0 +1,48 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Christopher Aillon (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMimeInfoUnix_h__
+#define nsMimeInfoUnix_h__
+
+#include "nsMIMEInfoImpl.h"
+
+struct GnomeVFSMimeApplication;
+
+class nsMIMEInfoUnix : public nsMIMEInfoImpl
+{
+public:
+ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
+ virtual ~nsMIMEInfoUnix();
+
+ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
+
+protected:
+ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
+
+ GnomeVFSMimeApplication *mDefaultVFSApplication;
+};
+
+#endif // nsMimeInfoUnix_h__
--- firefox-2.0.0.14+1nobinonly.orig/xpcom/build/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/xpcom/build/Makefile.in
@@ -151,7 +151,7 @@
# UNIX98 iconv support
OS_LIBS += $(LIBICONV)
-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
+GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/xpcom/glue/standalone/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/xpcom/glue/standalone/Makefile.in
@@ -96,7 +96,7 @@
# Force use of PIC
FORCE_USE_PIC = 1
-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
+GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
SRCS_IN_OBJDIR = 1
--- firefox-2.0.0.14+1nobinonly.orig/xpcom/typelib/xpidl/xpidl.c
+++ firefox-2.0.0.14+1nobinonly/xpcom/typelib/xpidl/xpidl.c
@@ -260,7 +260,7 @@
xpidl_usage(argc, argv);
return 1;
}
- if (argc != i + 1) {
+ if (argc > i + 1) {
fprintf(stderr, "ERROR: extra arguments after input file\n");
}
@@ -268,7 +268,7 @@
* Don't try to process multiple files, given that we don't handle -o
* multiply.
*/
- if (xpidl_process_idl(argv[i], inc_head, file_basename, mode))
+ if ((i < argc) && xpidl_process_idl(argv[i], inc_head, file_basename, mode))
return 0;
return 1;
--- firefox-2.0.0.14+1nobinonly.orig/gfx/cairo/cairo/src/cairo-ft-font.c
+++ firefox-2.0.0.14+1nobinonly/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -1588,6 +1588,7 @@
_compute_transform (&sf, &scale);
FcPatternAddInteger (pattern, FC_PIXEL_SIZE, sf.y_scale);
+ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
cairo_ft_font_options_substitute (options, pattern);
--- firefox-2.0.0.14+1nobinonly.orig/gfx/src/gtk/fontEncoding.properties
+++ firefox-2.0.0.14+1nobinonly/gfx/src/gtk/fontEncoding.properties
@@ -70,8 +70,8 @@
# font, you do need them.
# Symbol font
-#encoding.symbol.ttf = Adobe-Symbol-Encoding
-#encoding.symbol.ftcmap = mac_roman
+encoding.symbol.ttf = Adobe-Symbol-Encoding
+encoding.symbol.ftcmap = mac_roman
# TeX's Computer Modern fonts (Roman, Math Italic, Symbol and Extension)
--- firefox-2.0.0.14+1nobinonly.orig/gfx/src/gtk/nsFontMetricsPango.cpp
+++ firefox-2.0.0.14+1nobinonly/gfx/src/gtk/nsFontMetricsPango.cpp
@@ -952,7 +952,6 @@
{
int trailing = 0;
int inx = 0;
- gboolean found = FALSE;
const gchar *curChar;
PRInt32 retval = 0;
@@ -978,22 +977,12 @@
pango_layout_set_text(layout, text, strlen(text));
FixupSpaceWidths(layout, text);
- found = pango_layout_xy_to_index(layout, localX, localY,
- &inx, &trailing);
+ pango_layout_xy_to_index(layout, localX, localY,
+ &inx, &trailing);
// Convert the index back to the utf-16 index
curChar = text;
- // Jump to the end if it's not found.
- if (!found) {
- if (inx == 0)
- retval = 0;
- else if (trailing)
- retval = aLength;
-
- goto loser;
- }
-
for (PRUint32 curOffset=0; curOffset < aLength;
curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {
--- firefox-2.0.0.14+1nobinonly.orig/gfx/src/gtk/nsFontMetricsXft.cpp
+++ firefox-2.0.0.14+1nobinonly/gfx/src/gtk/nsFontMetricsXft.cpp
@@ -1118,6 +1118,8 @@
FcPatternAddInteger(mPattern, FC_WEIGHT,
NS_CalculateWeight(mFont.weight));
+ FcPatternAddBool (mPattern, FC_ANY_METRICS, FcTrue);
+
// Set up the default substitutions for this font
FcConfigSubstitute(0, mPattern, FcMatchPattern);
XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
@@ -1280,6 +1282,8 @@
FcPatternAddInteger(pattern, FC_WEIGHT,
NS_CalculateWeight(mFont.weight));
+ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
+
FcConfigSubstitute(0, pattern, FcMatchPattern);
XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
pattern);
--- firefox-2.0.0.14+1nobinonly.orig/gfx/src/cairo/nsFontMetricsXft.cpp
+++ firefox-2.0.0.14+1nobinonly/gfx/src/cairo/nsFontMetricsXft.cpp
@@ -1059,6 +1059,8 @@
FcPatternAddInteger(mPattern, FC_WEIGHT,
NS_CalculateWeight(mFont.weight));
+ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
+
// Set up the default substitutions for this font
FcConfigSubstitute(0, mPattern, FcMatchPattern);
XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
@@ -1221,6 +1223,8 @@
FcPatternAddInteger(pattern, FC_WEIGHT,
NS_CalculateWeight(mFont.weight));
+ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
+
FcConfigSubstitute(0, pattern, FcMatchPattern);
XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
pattern);
--- firefox-2.0.0.14+1nobinonly.orig/gfx/src/ps/nsFontMetricsPS.cpp
+++ firefox-2.0.0.14+1nobinonly/gfx/src/ps/nsFontMetricsPS.cpp
@@ -950,6 +950,8 @@
// Add the weight
FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(aFont.weight));
+ FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
+
// Set up the default substitutions for this font
FcConfigSubstitute(0, pattern, FcMatchPattern);
FcDefaultSubstitute(pattern);
--- firefox-2.0.0.14+1nobinonly.orig/layout/build/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/layout/build/Makefile.in
@@ -107,7 +107,6 @@
CPPSRCS = \
nsLayoutModule.cpp \
- nsContentHTTPStartup.cpp \
nsContentDLF.cpp \
nsLayoutStatics.cpp \
$(NULL)
--- firefox-2.0.0.14+1nobinonly.orig/layout/build/nsLayoutModule.cpp
+++ firefox-2.0.0.14+1nobinonly/layout/build/nsLayoutModule.cpp
@@ -38,7 +38,6 @@
#include "nsLayoutStatics.h"
#include "nsContentCID.h"
-#include "nsContentHTTPStartup.h"
#include "nsContentDLF.h"
#include "nsContentPolicyUtils.h"
#include "nsDataDocumentContentPolicy.h"
@@ -447,7 +446,6 @@
#ifdef MOZ_SVG
MAKE_CTOR(CreateSVGRect, nsIDOMSVGRect, NS_NewSVGRect)
#endif
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentHTTPStartup)
MAKE_CTOR(CreateContentDLF, nsIDocumentLoaderFactory, NS_NewContentDocumentLoaderFactory)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSSOMFactory)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils)
@@ -1211,13 +1209,6 @@
CreateSVGRect },
#endif
- { "Content HTTP Startup Listener",
- NS_CONTENTHTTPSTARTUP_CID,
- NS_CONTENTHTTPSTARTUP_CONTRACTID,
- nsContentHTTPStartupConstructor,
- nsContentHTTPStartup::RegisterHTTPStartup,
- nsContentHTTPStartup::UnregisterHTTPStartup },
-
{ "Document Loader Factory",
NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID,
"@mozilla.org/content/document-loader-factory;1",
--- firefox-2.0.0.14+1nobinonly.orig/layout/generic/nsTextFrame.cpp
+++ firefox-2.0.0.14+1nobinonly/layout/generic/nsTextFrame.cpp
@@ -5132,8 +5132,8 @@
while (aNumChars-- > 0) {
// XXX: If you crash here then you may see the issue described
- // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44
- *cp2-- = PRUnichar(*cp1--);
+ // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826
+ SetUnichar(cp2--, PRUnichar(*cp1--));
}
}
@@ -6230,9 +6230,9 @@
{
PRUnichar* end = aBuffer + aWordLen;
for (; aBuffer < end; aBuffer++) {
- PRUnichar ch = *aBuffer;
+ PRUnichar ch = GetUnichar(aBuffer);
if (ch == ' ') {
- *aBuffer = CH_NBSP;
+ SetUnichar(aBuffer, CH_NBSP);
}
}
}
--- firefox-2.0.0.14+1nobinonly.orig/layout/style/html.css
+++ firefox-2.0.0.14+1nobinonly/layout/style/html.css
@@ -467,6 +467,13 @@
/* PRINT ONLY rules follow */
@media print {
+ body {
+ font-family: times, serif;
+ }
+ tt, pre, listing, xmp, plaintext, code, kbd, samp {
+ font-family: courier, monospace;
+ }
+
marquee { -moz-binding: none; }
/* XXX this should not be necessary, we should be stopping blinking
--- firefox-2.0.0.14+1nobinonly.orig/widget/src/gtk2/nsWindow.cpp
+++ firefox-2.0.0.14+1nobinonly/widget/src/gtk2/nsWindow.cpp
@@ -1665,6 +1665,9 @@
return;
switch (aEvent->button) {
+ case 1:
+ eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
+ break;
case 2:
eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN;
break;
@@ -1672,7 +1675,7 @@
eventType = NS_MOUSE_RIGHT_BUTTON_DOWN;
break;
default:
- eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
+ return;
break;
}
--- firefox-2.0.0.14+1nobinonly.orig/xpfe/browser/resources/locale/en-US/region.properties
+++ firefox-2.0.0.14+1nobinonly/xpfe/browser/resources/locale/en-US/region.properties
@@ -1,5 +1,5 @@
# navigator.properties
-homePageDefault=http://www.mozilla.org/
+homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html
keywordList=http://home.netscape.com/escapes/keywords
webmailKeyword=http://webmail.netscape.com
fallbackDefaultSearchURL=http://www.google.com/search?q=
@@ -7,8 +7,8 @@
#
# all.js
#
-browser.startup.homepage=http://www.seamonkey-project.org/start/
-browser.throbber.url=http://www.seamonkey-project.org/
+browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html
+browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
browser.search.defaulturl=http://www.google.com/search?q=
general.useragent.contentlocale=US
@@ -17,4 +17,4 @@
#config.js
#
-startup.homepage_override_url=http://www.seamonkey-project.org/start/
+startup.homepage_override_url=file:///usr/share/ubuntu-artwork/home/index.html
--- firefox-2.0.0.14+1nobinonly.orig/xpfe/components/filepicker/src/Makefile.in
+++ firefox-2.0.0.14+1nobinonly/xpfe/components/filepicker/src/Makefile.in
@@ -69,6 +69,7 @@
$(NULL)
EXTRA_COMPONENTS = nsFilePicker.js
+GARBAGE += nsFilePicker.js
include $(topsrcdir)/config/rules.mk
--- firefox-2.0.0.14+1nobinonly.orig/xpfe/global/resources/content/printdialog.js
+++ firefox-2.0.0.14+1nobinonly/xpfe/global/resources/content/printdialog.js
@@ -160,7 +160,12 @@
if (strDefaultPrinterName == "")
strDefaultPrinterName = printerNameStr;
- list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
+ // We strip PostScript/ from the front of displayed printer
+ // names. It's a bit kludgy to do this here but at least
+ // for Ubuntu all the printers come via CUPS.
+ var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
+
+ list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
}
if (strDefaultPrinterName != "") {
this.listElement.removeAttribute("disabled");
--- firefox-2.0.0.14+1nobinonly.orig/.cvsignore
+++ firefox-2.0.0.14+1nobinonly/.cvsignore
@@ -0,0 +1,14 @@
+dist
+Makefile
+config.log
+config.cache
+config.status
+.client-defs.mk
+config-defs.h
+.mozconfig
+.mozconfig.mk
+.mozconfig.out
+a.out
+unallmakefiles
+nss
+mozilla-config.h
--- firefox-2.0.0.14+1nobinonly.orig/debian/BBC-RSS-URL-promise.txt
+++ firefox-2.0.0.14+1nobinonly/debian/BBC-RSS-URL-promise.txt
@@ -0,0 +1,38 @@
+From: "Naomi Davis"
+To: