summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Goehre <chris@sigxcpu.org>2014-12-03 12:12:04 -0500
committerChristoph Goehre <chris@sigxcpu.org>2014-12-03 12:12:04 -0500
commite2572a7f5bd5691754039ca746d33a80b91c139e (patch)
treec523dadc93240e3c65add08c5e2561507a0e6032
parentae54a5c2bd3ff360b1b08d2a1008fb4168bba0fd (diff)
Imported Upstream version 31.3.0upstream/31.3.0
-rw-r--r--build/autoconf/check-sync-exceptions2
-rw-r--r--build/macosx/mozconfig.common6
-rw-r--r--build/mozconfig.automation32
-rw-r--r--build/mozconfig.cache57
-rw-r--r--build/mozconfig.common2
-rw-r--r--build/unix/mozconfig.linux5
-rw-r--r--calendar/providers/caldav/calDavCalendar.js9
-rw-r--r--chat/protocols/irc/irc.js3
-rw-r--r--chat/protocols/irc/ircWatchMonitor.jsm10
-rwxr-xr-xconfigure43
-rw-r--r--configure.in6
-rw-r--r--mail/base/content/msgMail3PaneWindow.js15
-rw-r--r--mail/base/content/systemIntegrationDialog.js17
-rw-r--r--mail/components/cloudfile/nsBox.js3
-rw-r--r--mail/components/compose/content/addressingWidgetOverlay.js4
-rw-r--r--mail/config/version.txt2
-rw-r--r--mail/configure.in1
-rw-r--r--mail/installer/package-manifest.in2
-rw-r--r--mailnews/addrbook/src/nsAbAutoCompleteSearch.js16
-rw-r--r--mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js14
-rw-r--r--mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js4
-rw-r--r--mailnews/base/util/OAuth2.jsm60
-rw-r--r--mailnews/base/util/nsMsgProtocol.cpp1
-rw-r--r--mozilla/Makefile.in27
-rw-r--r--mozilla/accessible/src/jsat/EventManager.jsm3
-rw-r--r--mozilla/browser/app/blocklist.xml2755
-rw-r--r--mozilla/browser/config/mozconfigs/linux32/debug2
-rw-r--r--mozilla/browser/config/mozconfigs/linux64/debug2
-rw-r--r--mozilla/browser/config/mozconfigs/linux64/debug-nonunified2
-rw-r--r--mozilla/browser/config/mozconfigs/linux64/debug-static-analysis-clang4
-rw-r--r--mozilla/browser/config/mozconfigs/linux64/nightly-nonunified3
-rw-r--r--mozilla/browser/config/mozconfigs/macosx-universal/nightly-nonunified2
-rw-r--r--mozilla/browser/config/mozconfigs/macosx64/debug-nonunified1
-rw-r--r--mozilla/browser/config/mozconfigs/win32/beta1
-rw-r--r--mozilla/browser/config/mozconfigs/win32/debug2
-rw-r--r--mozilla/browser/config/mozconfigs/win32/debug-nonunified3
-rw-r--r--mozilla/browser/config/mozconfigs/win32/nightly1
-rw-r--r--mozilla/browser/config/mozconfigs/win32/nightly-nonunified3
-rw-r--r--mozilla/browser/config/mozconfigs/win32/release1
-rw-r--r--mozilla/browser/config/mozconfigs/win64/beta1
-rw-r--r--mozilla/browser/config/mozconfigs/win64/debug2
-rw-r--r--mozilla/browser/config/mozconfigs/win64/nightly1
-rw-r--r--mozilla/browser/config/mozconfigs/win64/release1
-rw-r--r--mozilla/browser/config/version.txt2
-rw-r--r--mozilla/browser/confvars.sh2
-rw-r--r--mozilla/browser/installer/removed-files.in7
-rwxr-xr-xmozilla/browser/installer/windows/nsis/shared.nsh8
-rw-r--r--mozilla/build/autoconf/altoptions.m443
-rwxr-xr-xmozilla/build/autoconf/mozconfig-find76
-rwxr-xr-xmozilla/build/autoconf/mozconfig2client-mk76
-rwxr-xr-xmozilla/build/autoconf/mozconfig2configure103
-rw-r--r--mozilla/build/automation.py.in1
-rw-r--r--mozilla/build/automationutils.py14
-rw-r--r--mozilla/build/gen_mach_buildprops.py115
-rw-r--r--mozilla/build/mach_bootstrap.py65
-rw-r--r--mozilla/build/macosx/mozconfig.common6
-rw-r--r--mozilla/build/moz-automation.mk115
-rw-r--r--mozilla/build/mozconfig.automation32
-rw-r--r--mozilla/build/mozconfig.common2
-rw-r--r--mozilla/build/mozconfig.win-common9
-rw-r--r--mozilla/build/unix/mozconfig.asan2
-rw-r--r--mozilla/build/unix/mozconfig.linux5
-rw-r--r--mozilla/client.mk52
-rw-r--r--mozilla/config/milestone.txt2
-rwxr-xr-xmozilla/configure1959
-rw-r--r--mozilla/configure.in68
-rw-r--r--mozilla/content/base/src/nsDocument.cpp2
-rw-r--r--mozilla/content/base/src/nsXMLHttpRequest.h41
-rw-r--r--mozilla/content/base/test/echo.sjs21
-rw-r--r--mozilla/content/base/test/mochitest.ini2
-rw-r--r--mozilla/content/base/test/test_xhr_send.html83
-rw-r--r--mozilla/content/media/MediaCache.cpp33
-rw-r--r--mozilla/content/media/webm/WebMReader.cpp12
-rw-r--r--mozilla/dom/bindings/Bindings.conf2
-rw-r--r--mozilla/dom/plugins/ipc/PluginProcessChild.cpp25
-rw-r--r--mozilla/gfx/2d/DrawTargetCairo.cpp1
-rw-r--r--mozilla/gfx/angle/src/libEGL/libEGL.rc102
-rw-r--r--mozilla/gfx/angle/src/libEGL/resource.h14
-rw-r--r--mozilla/gfx/angle/src/libGLESv2/libGLESv2.rc102
-rw-r--r--mozilla/gfx/angle/src/libGLESv2/resource.h14
-rw-r--r--mozilla/gfx/layers/basic/BasicLayerManager.cpp11
-rw-r--r--mozilla/js/src/assembler/assembler/MacroAssemblerX86Common.cpp6
-rw-r--r--mozilla/js/src/builtin/Intl.cpp6
-rwxr-xr-xmozilla/js/src/configure95
-rw-r--r--mozilla/js/src/configure.in10
-rw-r--r--mozilla/js/src/js-config.h.in9
-rw-r--r--mozilla/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp4
-rw-r--r--mozilla/js/src/jsobj.cpp7
-rw-r--r--mozilla/js/src/vm/Shape.cpp3
-rw-r--r--mozilla/js/src/vm/Shape.h2
-rw-r--r--mozilla/js/xpconnect/src/XPCWrappedNativeJSOps.cpp2
-rwxr-xr-xmozilla/mach29
-rw-r--r--mozilla/media/libnestegg/include/nestegg-stdint.h3
-rw-r--r--mozilla/media/libnestegg/src/nestegg.c3
-rw-r--r--mozilla/media/mtransport/third_party/nICEr/src/stun/stun_codec.c4
-rw-r--r--mozilla/media/mtransport/third_party/nrappkit/src/util/byteorder.c6
-rw-r--r--mozilla/media/mtransport/third_party/nrappkit/src/util/byteorder.h4
-rwxr-xr-xmozilla/media/webrtc/signaling/src/sipcc/core/gsm/h/fsm.h2
-rw-r--r--mozilla/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c19
-rw-r--r--mozilla/media/webrtc/signaling/src/sipcc/core/sdp/sdp_main.c7
-rw-r--r--mozilla/media/webrtc/signaling/test/sdp_unittests.cpp27
-rw-r--r--mozilla/mobile/android/config/armv6_play_store_version_code.txt2
-rw-r--r--mozilla/mobile/android/config/mozconfigs/common2
-rw-r--r--mozilla/netwerk/base/public/security-prefs.js2
-rw-r--r--mozilla/netwerk/sctp/datachannel/DataChannel.cpp58
-rw-r--r--mozilla/netwerk/sctp/datachannel/DataChannelProtocol.h2
-rw-r--r--mozilla/netwerk/sctp/src/moz.build1
-rwxr-xr-xmozilla/netwerk/sctp/src/netinet/sctp_callout.c85
-rwxr-xr-xmozilla/netwerk/sctp/src/netinet/sctp_callout.h6
-rwxr-xr-xmozilla/netwerk/sctp/src/netinet/sctp_usrreq.c3
-rwxr-xr-xmozilla/netwerk/sctp/src/user_sctp_timer_iterate.c119
-rw-r--r--mozilla/other-licenses/nsis/Contrib/ApplicationID/ApplicationID.rc101
-rw-r--r--mozilla/other-licenses/nsis/Contrib/ApplicationID/resource.h14
-rw-r--r--mozilla/other-licenses/nsis/Contrib/ServicesHelper/ServicesHelper.rc99
-rw-r--r--mozilla/other-licenses/nsis/Contrib/ServicesHelper/resource.h14
-rw-r--r--mozilla/parser/html/nsHtml5Parser.cpp34
-rw-r--r--mozilla/parser/html/nsHtml5Parser.h2
-rw-r--r--mozilla/parser/html/nsHtml5StreamParser.cpp16
-rw-r--r--mozilla/parser/html/nsHtml5StreamParser.h2
-rw-r--r--mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h4
-rw-r--r--mozilla/parser/html/nsHtml5TreeBuilderHSupplement.h2
-rw-r--r--mozilla/parser/html/nsHtml5TreeOpExecutor.cpp20
-rw-r--r--mozilla/parser/html/nsHtml5TreeOpExecutor.h2
-rw-r--r--mozilla/parser/html/nsHtml5TreeOperation.cpp6
-rw-r--r--mozilla/parser/html/nsHtml5TreeOperation.h12
-rw-r--r--mozilla/python/mach/mach/main.py36
-rw-r--r--mozilla/python/mach/mach/test/test_conditions.py11
-rw-r--r--mozilla/python/mozbuild/mozbuild/base.py49
-rw-r--r--mozilla/python/mozbuild/mozbuild/controller/building.py7
-rw-r--r--mozilla/python/mozbuild/mozbuild/mach_commands.py214
-rw-r--r--mozilla/python/mozbuild/mozbuild/mozconfig.py101
-rwxr-xr-xmozilla/python/mozbuild/mozbuild/mozconfig_loader8
-rw-r--r--mozilla/python/mozbuild/mozbuild/test/backend/common.py8
-rw-r--r--mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py8
-rw-r--r--mozilla/python/mozbuild/mozbuild/test/test_base.py81
-rw-r--r--mozilla/python/mozbuild/mozbuild/test/test_mozconfig.py56
-rw-r--r--mozilla/security/build/Makefile.in4
-rw-r--r--mozilla/security/manager/boot/src/nsSTSPreloadList.errors43
-rw-r--r--mozilla/security/manager/boot/src/nsSTSPreloadList.inc49
-rw-r--r--mozilla/security/manager/ssl/src/nsNSSComponent.cpp7
-rw-r--r--mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp20
-rw-r--r--mozilla/security/nss/TAG-INFO2
-rw-r--r--mozilla/security/nss/coreconf/coreconf.dep1
-rw-r--r--mozilla/security/nss/lib/freebl/ec.c5
-rw-r--r--mozilla/security/nss/lib/nss/nss.h4
-rw-r--r--mozilla/security/nss/lib/softoken/pkcs11.c11
-rw-r--r--mozilla/security/nss/lib/softoken/softkver.h4
-rw-r--r--mozilla/security/nss/lib/ssl/SSLerrs.h4
-rw-r--r--mozilla/security/nss/lib/ssl/ssl.h3
-rw-r--r--mozilla/security/nss/lib/ssl/ssl3con.c36
-rw-r--r--mozilla/security/nss/lib/ssl/ssl3prot.h1
-rw-r--r--mozilla/security/nss/lib/ssl/sslerr.h2
-rw-r--r--mozilla/security/nss/lib/ssl/sslimpl.h2
-rw-r--r--mozilla/security/nss/lib/ssl/sslproto.h5
-rw-r--r--mozilla/security/nss/lib/ssl/sslsock.c16
-rw-r--r--mozilla/security/nss/lib/util/nssutil.h4
-rwxr-xr-x[-rw-r--r--]mozilla/security/nss/tests/chains/chains.sh0
-rw-r--r--mozilla/testing/config/mozharness/android_arm_config.py78
-rw-r--r--mozilla/testing/config/tooltool-manifests/androidarm/releng.manifest7
-rw-r--r--mozilla/testing/config/tooltool-manifests/androidx86/releng.manifest7
-rw-r--r--mozilla/testing/mozbase/mozrunner/mozrunner/local.py7
-rw-r--r--mozilla/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py14
-rw-r--r--mozilla/testing/testsuite-targets.mk1
-rw-r--r--mozilla/testing/xpcshell/selftest.py1
-rw-r--r--mozilla/toolkit/components/maintenanceservice/maintenanceservice.rc86
-rw-r--r--mozilla/toolkit/components/maintenanceservice/resource.h20
-rwxr-xr-xmozilla/toolkit/crashreporter/client/crashreporter.rc148
-rw-r--r--mozilla/toolkit/crashreporter/client/resource.h37
-rw-r--r--mozilla/toolkit/mozapps/extensions/test/browser/head.js2
-rw-r--r--mozilla/toolkit/mozapps/update/updater/resource.h28
-rw-r--r--mozilla/toolkit/mozapps/update/updater/updater.rc145
-rw-r--r--mozilla/toolkit/xre/nsAppRunner.cpp15
-rw-r--r--mozilla/tools/update-packaging/Makefile.in28
-rw-r--r--mozilla/widget/cocoa/nsAppShell.mm14
-rw-r--r--mozilla/widget/cocoa/nsChildView.mm2
-rw-r--r--mozilla/widget/cocoa/nsCocoaFeatures.h1
-rw-r--r--mozilla/widget/cocoa/nsCocoaFeatures.mm17
177 files changed, 5672 insertions, 3004 deletions
diff --git a/build/autoconf/check-sync-exceptions b/build/autoconf/check-sync-exceptions
new file mode 100644
index 0000000..005bb6b
--- /dev/null
+++ b/build/autoconf/check-sync-exceptions
@@ -0,0 +1,2 @@
+mozconfig-find
+mozconfig2client-mk
diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
index e258b0d..2dbf40b 100644
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -2,6 +2,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+MOZ_AUTOMATION_L10N_CHECK=0
+
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+ MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+ MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
. "$topsrcdir/build/mozconfig.common"
if [ -d "$topsrcdir/clang" ]; then
diff --git a/build/mozconfig.automation b/build/mozconfig.automation
new file mode 100644
index 0000000..b65f0fa
--- /dev/null
+++ b/build/mozconfig.automation
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Common mozconfig for automation builds.
+#
+# We export MOZ_AUTOMATION_* variables here to trigger various steps in
+# automation builds. For example, if MOZ_AUTOMATION_PACKAGE is set, then the
+# package step will run. This file contains the default settings, which can be
+# overridden by setting them earlier in the appropriate mozconfig.
+
+mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
+mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
+mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
+mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
+mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
+mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
+mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
+mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
+
+# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
+# stages.
+if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
+
+ # Note that we always build the update packaging with pretty names even if
+ # we don't build it without, so this is set to 1.
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING=1"
+fi
diff --git a/build/mozconfig.cache b/build/mozconfig.cache
new file mode 100644
index 0000000..028dc6f
--- /dev/null
+++ b/build/mozconfig.cache
@@ -0,0 +1,57 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Setup for build cache
+
+read branch platform master <<EOF
+$(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
+EOF
+
+bucket=
+if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache"; then
+ case "${branch}_${master}" in
+ try_*scl1.mozilla.com*|try_*.scl3.mozilla.com*)
+ bucket=mozilla-releng-ceph-cache-scl3-try
+ mk_add_options "export SCCACHE_NO_HTTPS=1"
+ ;;
+ try_*use1.mozilla.com*)
+ bucket=mozilla-releng-s3-cache-us-east-1-try
+ ;;
+ try_*usw2.mozilla.com*)
+ bucket=mozilla-releng-s3-cache-us-west-2-try
+ ;;
+ esac
+fi
+
+if test -z "$bucket"; then
+ case "$platform" in
+ win*) : ;;
+ *)
+ ac_add_options --with-ccache
+ esac
+else
+ mk_add_options "export SCCACHE_BUCKET=$bucket"
+ case "$master" in
+ *use1.mozilla.com*|*usw2.mozilla.com*)
+ mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
+ ;;
+ esac
+ ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py"
+ mk_add_options MOZ_PREFLIGHT+=build/sccache.mk
+ mk_add_options MOZ_POSTFLIGHT+=build/sccache.mk
+ case "$platform" in
+ win*)
+ # sccache supports a special flag to create depfiles.
+ export _DEPEND_CFLAGS='-deps$(MDDEPDIR)/$(@F).pp'
+ # Windows builds have a default wrapper that needs to be overridden
+ mk_add_options "export CC_WRAPPER="
+ mk_add_options "export CXX_WRAPPER="
+ # For now, sccache doesn't support separate PDBs so force debug info to be
+ # in object files.
+ mk_add_options "export COMPILE_PDB_FLAG="
+ mk_add_options "export HOST_PDB_FLAG="
+ mk_add_options "export MOZ_DEBUG_FLAGS=-Z7"
+ ;;
+ esac
+fi
diff --git a/build/mozconfig.common b/build/mozconfig.common
index edd7c40..3b49b81 100644
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -15,3 +15,5 @@ mk_add_options AUTOCLOBBER=1
ac_add_options --enable-crashreporter
ac_add_options --enable-release
+
+. "$topsrcdir/build/mozconfig.automation"
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
index dd6883d..dc9259f 100644
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -1,3 +1,8 @@
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+ MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+ MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
. "$topsrcdir/build/mozconfig.common"
# some b2g desktop builds still happen on i686 machines, and the tooltool
diff --git a/calendar/providers/caldav/calDavCalendar.js b/calendar/providers/caldav/calDavCalendar.js
index 7388bb4..038a24d 100644
--- a/calendar/providers/caldav/calDavCalendar.js
+++ b/calendar/providers/caldav/calDavCalendar.js
@@ -1597,10 +1597,15 @@ calDavCalendar.prototype = {
}
if (this.mUri.host == "apidata.googleusercontent.com") {
if (!this.oauth) {
- this.oauth = new OAuth2(OAUTH_BASE_URI, OAUTH_SCOPE,
- OAUTH_CLIENT_ID, OAUTH_HASH);
let sessionId = this.id;
let pwMgrId = "Google CalDAV v2";
+ let authTitle = cal.calGetString("commonDialogs", "EnterUserPasswordFor",
+ [this.name], "global");
+
+ this.oauth = new OAuth2(OAUTH_BASE_URI, OAUTH_SCOPE,
+ OAUTH_CLIENT_ID, OAUTH_HASH);
+ this.oauth.requestWindowTitle = authTitle;
+ this.oauth.requestWindowFeatures = "chrome,private,centerscreen,width=430,height=600";
Object.defineProperty(this.oauth, "refreshToken", {
get: function getRefreshToken() {
diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
index 9188dcc..c572f1b 100644
--- a/chat/protocols/irc/irc.js
+++ b/chat/protocols/irc/irc.js
@@ -833,10 +833,9 @@ ircAccount.prototype = {
maxMessageLength: 512, // 2.3 Messages
maxHostnameLength: 63, // 2.3.1 Message format in Augmented BNF
- // The default prefixes.
- userPrefixes: ["@", "!", "%", "+"],
// The default prefixes to modes.
userPrefixToModeMap: {"@": "o", "!": "n", "%": "h", "+": "v"},
+ get userPrefixes() Object.keys(this.userPrefixToModeMap),
// Modes that have a nickname parameter and affect a participant. See 4.1
// Member Status of RFC 2811.
memberStatuses: ["a", "h", "o", "O", "q", "v", "!"],
diff --git a/chat/protocols/irc/ircWatchMonitor.jsm b/chat/protocols/irc/ircWatchMonitor.jsm
index 22756d3..155a841 100644
--- a/chat/protocols/irc/ircWatchMonitor.jsm
+++ b/chat/protocols/irc/ircWatchMonitor.jsm
@@ -187,12 +187,16 @@ var ircWATCH = {
"598": function(aMessage) { // RPL_GONEAWAY
// <nickname> <username> <hostname> <awaysince> :<away reason>
- return setStatus(this, aMessage.params[1], "AWAY");
+ // We use a negative index as inspircd versions < 2.0.18 don't send
+ // the user's nick as the first parameter (see bug 1078223).
+ return setStatus(this, aMessage.params[aMessage.params.length - 5], "AWAY");
},
"599": function(aMessage) { // RPL_NOTAWAY
// <nickname> <username> <hostname> <awaysince> :is no longer away
- return setStatus(this, aMessage.params[1], "AVAILABLE");
+ // We use a negative index as inspircd versions < 2.0.18 don't send
+ // the user's nick as the first parameter (see bug 1078223).
+ return setStatus(this, aMessage.params[aMessage.params.length - 5], "AVAILABLE");
},
"600": function(aMessage) { // RPL_LOGON
@@ -217,7 +221,7 @@ var ircWATCH = {
},
"604": function(aMessage) { // RPL_NOWON
- // <<nickname> <username> <hostname> <lastnickchange> :is online
+ // <nickname> <username> <hostname> <lastnickchange> :is online
return setStatus(this, aMessage.params[1], "AVAILABLE");
},
diff --git a/configure b/configure
index 0a057f6..85842cd 100755
--- a/configure
+++ b/configure
@@ -114,10 +114,25 @@ fi
# configure.in: autoconf puts the argument parsing code above anything
# expanded from configure.in, and we need to get the configure options
# from .mozconfig in place before that argument parsing code.
-# Read in '.mozconfig' script to set the initial options.
-# See the mozconfig2configure script for more details.
-_AUTOCONF_TOOLS_DIR=`dirname $0`/mozilla/build/autoconf
-. $_AUTOCONF_TOOLS_DIR/mozconfig2configure
+inserted=
+failed_eval() {
+ echo "Failed eval'ing the following:"
+ $(dirname $0)/mozilla/mach environment --format=configure
+ exit 1
+}
+
+set -- dummy "$@"
+for ac_option
+do
+ if test -z "$inserted"; then
+ set --
+ eval "$($(dirname $0)/mozilla/mach environment --format=configure)" || failed_eval
+ inserted=1
+ else
+ set -- "$@" "$ac_option"
+ fi
+done
+
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -656,7 +671,7 @@ else
fi
-MOZILLA_SRCDIR=$topsrcdir/mozilla
+MOZILLA_SRCDIR=$srcdir/mozilla
ac_aux_dir=
for ac_dir in ${MOZILLA_SRCDIR}/build/autoconf $srcdir/${MOZILLA_SRCDIR}/build/autoconf; do
if test -f $ac_dir/install-sh; then
@@ -704,7 +719,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:708: checking host system type" >&5
+echo "configure:723: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -725,7 +740,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:729: checking target system type" >&5
+echo "configure:744: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -743,7 +758,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:747: checking build system type" >&5
+echo "configure:762: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -768,7 +783,7 @@ test "$host_alias" != "$target_alias" &&
COMM_BUILD=1
-MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
+MOZCONFIG=`$srcdir/build/autoconf/mozconfig-find $srcdir`
export MOZCONFIG
_topsrcdir=`cd \`dirname $0\`; pwd`
@@ -813,7 +828,7 @@ 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:817: checking for $ac_word" >&5
+echo "configure:832: 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
@@ -914,7 +929,7 @@ fi
echo $ac_n "checking Python environment is Mozilla virtualenv""... $ac_c" 1>&6
-echo "configure:918: checking Python environment is Mozilla virtualenv" >&5
+echo "configure:933: checking Python environment is Mozilla virtualenv" >&5
$PYTHON -c "import mozbuild.base"
if test "$?" != 0; then
{ echo "configure: error: Python environment does not appear to be sane." 1>&2; exit 1; }
@@ -979,7 +994,7 @@ fi
echo $ac_n "checking for application to build""... $ac_c" 1>&6
-echo "configure:983: checking for application to build" >&5
+echo "configure:998: checking for application to build" >&5
if test -z "$MOZ_BUILD_APP"; then
echo "$ac_t""mail" 1>&6
echo "Building Thunderbird by default. Set --enable-application to build a different application."
@@ -999,7 +1014,7 @@ fi
# still need this for MOZ_BRANDING_DIRECTORY.
echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6
-echo "configure:1003: checking if app-specific confvars.sh exists" >&5
+echo "configure:1018: checking if app-specific confvars.sh exists" >&5
if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6
. "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
@@ -1428,4 +1443,4 @@ fi
MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
# Build the comm-central files with config.status
-test "$no_create" = yes || ${PYTHON} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || WRITE_MOZINFO=1 ${PYTHON} $CONFIG_STATUS || exit 1
diff --git a/configure.in b/configure.in
index 566f79e..41d83d1 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ dnl ========================================================
AC_PREREQ(2.13)
AC_INIT(config/config.mk)
-MOZILLA_SRCDIR=$topsrcdir/mozilla
+MOZILLA_SRCDIR=$srcdir/mozilla
AC_CONFIG_AUX_DIR(${MOZILLA_SRCDIR}/build/autoconf)
AC_CANONICAL_SYSTEM
@@ -18,7 +18,7 @@ dnl (MOZILLA_SRCDIR would fit here, but is needed to find autoconf tools)
COMM_BUILD=1
dnl export this, so the var is set for mozilla/configure
-MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
+MOZCONFIG=`$srcdir/build/autoconf/mozconfig-find $srcdir`
export MOZCONFIG
dnl Do not allow a separate objdir build if a srcdir build exists.
@@ -274,4 +274,4 @@ AC_OUTPUT_SUBDIRS(mozilla)
MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
# Build the comm-central files with config.status
-test "$no_create" = yes || ${PYTHON} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || WRITE_MOZINFO=1 ${PYTHON} $CONFIG_STATUS || exit 1
diff --git a/mail/base/content/msgMail3PaneWindow.js b/mail/base/content/msgMail3PaneWindow.js
index 899d9a4..cf9264b 100644
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -1716,7 +1716,8 @@ let TabsInTitlebar = {
// Don't trust the initial value of the sizemode attribute; wait for the
// resize event.
this._readPref();
- Services.prefs.addObserver(this._prefName, this, false);
+ Services.prefs.addObserver(this._drawInTitlePref, this, false);
+ Services.prefs.addObserver(this._autoHidePref, this, false);
this.allowedBy("sizemode", false);
window.addEventListener("resize", function (event) {
@@ -1800,12 +1801,15 @@ let TabsInTitlebar = {
_initialized: false,
_disallowed: {},
- _prefName: "mail.tabs.drawInTitlebar",
+ _drawInTitlePref: "mail.tabs.drawInTitlebar",
+ _autoHidePref: "mail.tabs.autoHide",
_lastSizeMode: null,
_readPref: function () {
- this.allowedBy("pref",
- Services.prefs.getBoolPref(this._prefName));
+ // check is only true when drawInTitlebar=true and autoHide=false
+ let check = Services.prefs.getBoolPref(this._drawInTitlePref) &&
+ !Services.prefs.getBoolPref(this._autoHidePref);
+ this.allowedBy("pref", check);
},
_update: function (aForce=false) {
@@ -1972,7 +1976,8 @@ let TabsInTitlebar = {
uninit: function () {
#ifdef CAN_DRAW_IN_TITLEBAR
this._initialized = false;
- Services.prefs.removeObserver(this._prefName, this);
+ Services.prefs.removeObserver(this._drawInTitlePref, this);
+ Services.prefs.removeObserver(this._autoHidePref, this);
this._menuObserver.disconnect();
#endif
}
diff --git a/mail/base/content/systemIntegrationDialog.js b/mail/base/content/systemIntegrationDialog.js
index b29d304..de792d9 100644
--- a/mail/base/content/systemIntegrationDialog.js
+++ b/mail/base/content/systemIntegrationDialog.js
@@ -95,10 +95,20 @@ let gSystemIntegrationDialog = {
// In all cases, save the user's decision for "always check at startup".
this._shellSvc.shouldCheckDefaultClient = this._startupCheckbox.checked;
+ let searchIntegPossible = !this._searchCheckbox.hidden;
+ if (searchIntegPossible) {
+ this.SearchIntegration.firstRunDone = true;
+ }
+
// If the "skip integration" button was used do not set any defaults
// and close the dialog.
- if (!aSetAsDefault)
+ if (!aSetAsDefault) {
+ // Disable search integration in this case.
+ if (searchIntegPossible)
+ this.SearchIntegration.prefEnabled = false;
+
return true;
+ }
// For each checked item, if we aren't already the default client,
// make us the default.
@@ -121,11 +131,8 @@ let gSystemIntegrationDialog = {
// Set the search integration pref if it is changed.
// The integration will handle the rest.
- if (!this._searchCheckbox.hidden)
- {
+ if (searchIntegPossible)
this.SearchIntegration.prefEnabled = this._searchCheckbox.checked;
- this.SearchIntegration.firstRunDone = true;
- }
return true;
}
diff --git a/mail/components/cloudfile/nsBox.js b/mail/components/cloudfile/nsBox.js
index a417283..7e7d04a 100644
--- a/mail/components/cloudfile/nsBox.js
+++ b/mail/components/cloudfile/nsBox.js
@@ -29,7 +29,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "gProtocolService",
function nsBox() {
this.log = Log4Moz.getConfiguredLogger("BoxService");
- this._oauth = new OAuth2(kAuthBaseUrl, null, kClientId, kClientSecret, kAuthUrl);
+ this._oauth = new OAuth2(kAuthBaseUrl, null, kClientId, kClientSecret);
+ this._oauth.authURI = kAuthBaseUrl + kAuthUrl;
let account = this;
Object.defineProperty(this._oauth, "refreshToken", {
diff --git a/mail/components/compose/content/addressingWidgetOverlay.js b/mail/components/compose/content/addressingWidgetOverlay.js
index 85b6930..e681d77 100644
--- a/mail/components/compose/content/addressingWidgetOverlay.js
+++ b/mail/components/compose/content/addressingWidgetOverlay.js
@@ -785,7 +785,9 @@ function awSetAutoComplete(rowNumber)
function awRecipientTextCommand(enterEvent, element)
{
- awReturnHit(element);
+ // Only add new row when enter was hit (not for tab/autocomplete select).
+ if (enterEvent)
+ awReturnHit(element);
}
function awRecipientKeyPress(event, element)
diff --git a/mail/config/version.txt b/mail/config/version.txt
index 90b07d4..3e51532 100644
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1 +1 @@
-31.2.0
+31.3.0
diff --git a/mail/configure.in b/mail/configure.in
index bd36ad7..1e36c8f 100644
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -138,4 +138,3 @@ if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
AC_OUTPUT_SUBDIRS(../ldap/sdks/c-sdk)
ac_configure_args="$_save_ac_configure_args"
fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
-
diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
index a697fa3..30662f6 100644
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -532,6 +532,8 @@
@BINPATH@/components/TCPServerSocket.js
@BINPATH@/components/TCPSocketParentIntermediary.js
@BINPATH@/components/TCPSocket.manifest
+@BINPATH@/components/TelemetryStartup.js
+@BINPATH@/components/TelemetryStartup.manifest
#ifdef MOZ_WEBRTC
@BINPATH@/components/PeerConnection.js
@BINPATH@/components/PeerConnection.manifest
diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSearch.js b/mailnews/addrbook/src/nsAbAutoCompleteSearch.js
index e41f49f..e7636ea 100644
--- a/mailnews/addrbook/src/nsAbAutoCompleteSearch.js
+++ b/mailnews/addrbook/src/nsAbAutoCompleteSearch.js
@@ -241,13 +241,15 @@ nsAbAutoCompleteSearch.prototype = {
* it is the case. For mailing lists set it to true.
* @param result The result to add the new entry to.
*/
- _addToResult: function _addToResult(commentColumn, directory, card,
- emailToUse, isPrimaryEmail, result) {
- var emailAddress =
- this._parser.makeMailboxObject(card.displayName,
- card.isMailList ?
- card.getProperty("Notes", "") || card.displayName :
- emailToUse).toString();
+ _addToResult: function(commentColumn, directory, card,
+ emailToUse, isPrimaryEmail, result) {
+ let mbox = this._parser.makeMailboxObject(card.displayName,
+ card.isMailList ? card.getProperty("Notes", "") || card.displayName :
+ emailToUse);
+ if (!mbox.email)
+ return;
+
+ let emailAddress = mbox.toString();
// If it is a duplicate, then just return and don't add it. The
// _checkDuplicate function deals with it all for us.
diff --git a/mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js b/mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js
index a99ef60..df51cde 100644
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js
@@ -117,12 +117,14 @@ nsAbLDAPAutoCompleteSearch.prototype = {
});
},
- _addToResult: function _addToResult(card) {
- let emailAddress =
- this._parser.makeMailboxObject(card.displayName,
- card.isMailList ?
- card.getProperty("Notes", "") || card.displayName :
- card.primaryEmail).toString();
+ _addToResult: function(card) {
+ let mbox = this._parser.makeMailboxObject(card.displayName,
+ card.isMailList ? card.getProperty("Notes", "") || card.displayName :
+ card.primaryEmail);
+ if (!mbox.email)
+ return;
+
+ let emailAddress = mbox.toString();
// If it is a duplicate, then just return and don't add it. The
// _checkDuplicate function deals with it all for us.
diff --git a/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js b/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js
index 58075c9..5445a2a 100644
--- a/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js
+++ b/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js
@@ -32,7 +32,9 @@ const cards = [
{ email: "g@test.invalid", secondEmail: "f@test.invalid",
displayName: "3testsort", popularityIndex: 3 },
{ email: "j@test.invalid", secondEmail: "h@test.invalid",
- displayName: "3testsort", popularityIndex: 5 }
+ displayName: "3testsort", popularityIndex: 5 },
+ // Add a contact that matches, but has no email. Should not show up.
+ { displayName: "primaryX" }
];
// These are for the initial search
diff --git a/mailnews/base/util/OAuth2.jsm b/mailnews/base/util/OAuth2.jsm
index b79ee1f..67311ae 100644
--- a/mailnews/base/util/OAuth2.jsm
+++ b/mailnews/base/util/OAuth2.jsm
@@ -16,20 +16,20 @@ Cu.import("resource:///modules/gloda/log4moz.js");
function parseURLData(aData) {
let result = {};
- aData.split("?", 2)[1].split("&").forEach(function (aParam) {
+ aData.split(/[?#]/, 2)[1].split("&").forEach(function (aParam) {
let [key, value] = aParam.split("=");
result[key] = value;
});
return result;
}
-function OAuth2(aBaseURI, aScope, aAppKey, aAppSecret, aAuthURI="oauth2/auth") {
- this.baseURI = aBaseURI;
- this.authURI = aBaseURI + aAuthURI;
+function OAuth2(aBaseURI, aScope, aAppKey, aAppSecret) {
+ this.authURI = aBaseURI + "oauth2/auth";
this.tokenURI = aBaseURI + "oauth2/token";
this.consumerKey = aAppKey;
this.consumerSecret = aAppSecret;
this.scope = aScope;
+ this.extraAuthParams = [];
this.log = Log4Moz.getConfiguredLogger("TBOAuth");
}
@@ -44,8 +44,8 @@ OAuth2.prototype = {
consumerSecret: null,
completionURI: "http://localhost",
requestWindowURI: "chrome://messenger/content/browserRequest.xul",
- requestWindowHeight: 600,
- requestWindowWidth: 980,
+ requestWindowFeatures: "chrome,private,centerscreen,width=980,height=600",
+ requestWindowTitle: "",
scope: null,
accessToken: null,
@@ -86,11 +86,14 @@ OAuth2.prototype = {
if (this.scope) {
params.push(["scope", this.scope]);
}
- params = params.map(function(p) p[0] + "=" + encodeURIComponent(p[1]))
- .join("&");
+
+ // Add extra parameters
+ params.push(...this.extraAuthParams);
+
+ // Now map the parameters to a string
+ params = params.map(([k,v]) => k + "=" + encodeURIComponent(v)).join("&");
this._browserRequest = {
- promptText: "auth prompt",
account: this,
url: this.authURI + "?" + params,
_active: true,
@@ -145,27 +148,33 @@ OAuth2.prototype = {
};
aWebProgress.addProgressListener(this._listener,
Ci.nsIWebProgress.NOTIFY_ALL);
+ aWindow.document.title = this.account.requestWindowTitle;
}
};
this.wrappedJSObject = this._browserRequest;
- let features = "chrome,private,centerscreen,width=" + this.requestWindowWidth + "px,height=" + this.requestWindowHeight + "px";
- Services.ww.openWindow(null, this.requestWindowURI, null, features, this);
+ Services.ww.openWindow(null, this.requestWindowURI, null, this.requestWindowFeatures, this);
},
finishAuthorizationRequest: function() {
- if (!("_browserRequest" in this))
- return;
+ if (!("_browserRequest" in this)) {
+ return;
+ }
- this._browserRequest._active = false;
- if ("_listener" in this._browserRequest)
- this._browserRequest._listener._cleanUp();
- delete this._browserRequest;
+ this._browserRequest._active = false;
+ if ("_listener" in this._browserRequest) {
+ this._browserRequest._listener._cleanUp();
+ }
+ delete this._browserRequest;
},
onAuthorizationReceived: function(aData) {
- this.log.info("authorization received" + aData);
- let results = parseURLData(aData);
- this.requestAccessToken(results.code, OAuth2.CODE_AUTHORIZATION);
+ this.log.info("authorization received" + aData);
+ let results = parseURLData(aData);
+ if (this.responseType == "code") {
+ this.requestAccessToken(results.code, OAuth2.CODE_AUTHORIZATION);
+ } else if (this.responseType == "token") {
+ this.onAccessTokenReceived(JSON.stringify(results));
+ }
},
onAuthorizationFailed: function(aError, aData) {
@@ -174,7 +183,6 @@ OAuth2.prototype = {
},
requestAccessToken: function requestAccessToken(aCode, aType) {
-
let params = [
["client_id", this.consumerKey],
["client_secret", this.consumerSecret],
@@ -197,7 +205,9 @@ OAuth2.prototype = {
},
onAccessTokenFailed: function onAccessTokenFailed(aError, aData) {
- this.refreshToken = null;
+ if (aError != "offline") {
+ this.refreshToken = null;
+ }
this.connecting = false;
this.connectFailureCallback(aData);
},
@@ -209,7 +219,11 @@ OAuth2.prototype = {
if ("refresh_token" in result) {
this.refreshToken = result.refresh_token;
}
- this.tokenExpires = (new Date()).getTime() + (result.expires_in * 1000);
+ if ("expires_in" in result) {
+ this.tokenExpires = (new Date()).getTime() + (result.expires_in * 1000);
+ } else {
+ this.tokenExpires = Number.MAX_VALUE;
+ }
this.tokenType = result.token_type;
this.connecting = false;
diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp
index 6cd4896..9a855e6 100644
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -307,7 +307,6 @@ nsresult nsMsgProtocol::CloseSocket()
if (m_transport) {
nsCOMPtr<nsISocketTransport> strans = do_QueryInterface(m_transport);
if (strans) {
- strans->SetSecurityCallbacks(nullptr);
strans->SetEventSink(nullptr, nullptr); // break cyclic reference!
}
}
diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 9b8bf26..ad27e60 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -132,6 +132,7 @@ install-manifests: install-tests
install-tests: $(install_manifest_depends)
$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )_tests _build_manifests/install/tests)
+include $(topsrcdir)/build/moz-automation.mk
# _tests should be purged during cleaning. However, we don't want it purged
# during PGO builds because it contains some auto-generated files.
@@ -168,7 +169,7 @@ endif
endif
default all::
- $(call BUILDSTATUS,TIERS export $(if $(COMPILE_ENVIRONMENT),$(if $(MOZ_PSEUDO_DERECURSE),compile ))libs tools)
+ $(call BUILDSTATUS,TIERS export $(if $(COMPILE_ENVIRONMENT),$(if $(MOZ_PSEUDO_DERECURSE),compile ))libs tools $(if $(MOZ_AUTOMATION),$(MOZ_AUTOMATION_TIERS)))
include $(topsrcdir)/config/rules.mk
@@ -252,6 +253,30 @@ MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP)
export MOZ_SOURCE_STAMP
endif
+.PHONY: update-packaging
+update-packaging:
+ $(MAKE) -C tools/update-packaging
+
+.PHONY: pretty-package
+pretty-package:
+ unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
+
+.PHONY: pretty-package-tests
+pretty-package-tests:
+ unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
+
+.PHONY: pretty-l10n-check
+pretty-l10n-check:
+ unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
+
+.PHONY: pretty-update-packaging
+pretty-update-packaging:
+ unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
+
+.PHONY: pretty-installer
+pretty-installer:
+ unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
+
#XXX: this is a hack, since we don't want to clobber for MSVC
# PGO support, but we can't do this test in client.mk
ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
diff --git a/mozilla/accessible/src/jsat/EventManager.jsm b/mozilla/accessible/src/jsat/EventManager.jsm
index e0f258c..aab0592 100644
--- a/mozilla/accessible/src/jsat/EventManager.jsm
+++ b/mozilla/accessible/src/jsat/EventManager.jsm
@@ -285,6 +285,9 @@ this.EventManager.prototype = {
}
case Events.DOCUMENT_LOAD_COMPLETE:
{
+ if (aEvent.accessible === aEvent.accessibleDocument) {
+ break;
+ }
this.contentScope.contentControl.autoMove(
aEvent.accessible, { delay: 500 });
break;
diff --git a/mozilla/browser/app/blocklist.xml b/mozilla/browser/app/blocklist.xml
index e69de29..6ffe9a2 100644
--- a/mozilla/browser/app/blocklist.xml
+++ b/mozilla/browser/app/blocklist.xml
@@ -0,0 +1,2755 @@
+<?xml version="1.0"?>
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1416506840000">
+ <emItems>
+ <emItem blockID="i58" id="webmaster@buzzzzvideos.info">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i71" id="youtube@2youtube.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i640" id="jid0-l9BxpNUhx1UUgRfKigWzSfrZqAc@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i527" id="/^({bfec236d-e122-4102-864f-f5f19d897f5e}|{3f842035-47f4-4f10-846b-6199b07f09b8}|{92ed4bbd-83f2-4c70-bb4e-f8d3716143fe})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i105" id="{95ff02bc-ffc6-45f0-a5c8-619b8226a9de}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i400" id="{dd6b651f-dfb9-4142-b0bd-09912ad22674}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i488" id="jid1-4P0kohSJxU1qGg@jetpack">
+ <versionRange minVersion="1.2.50" maxVersion="1.2.50" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i578" id="jid1-XLjasWL55iEE1Q@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i529" id="/^(torntv@torntv\.com|trtv3@trtv\.com|torntv2@torntv\.com|e2fd07a6-e282-4f2e-8965-85565fcb6384@b69158e6-3c3b-476c-9d98-ae5838c5b707\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i64" id="royal@facebook.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i72" os="WINNT" id="{4ED1F68A-5463-4931-9384-8FFF5ED91D92}">
+ <versionRange minVersion="3.4.1" maxVersion="3.4.1.194" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i430" id="1chtw@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i238" id="/^pink@.*\.info$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="18.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i630" id="webbooster@iminent.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i582" id="discoverypro@discoverypro.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i670" id="/^({ad9a41d2-9a49-4fa6-a79e-71a0785364c8})|(ffxtlbr@mysearchdial\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i140" id="mozillahmpg@mozilla.org">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i500" id="{2aab351c-ad56-444c-b935-38bffe18ad26}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i467" id="plugin@analytic-s.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i5" id="support@daemon-tools.cc">
+ <versionRange minVersion=" " maxVersion="1.0.0.5">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i590" id="{94cd2cc3-083f-49ba-a218-4cda4b4829fd}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i62" id="jid0-EcdqvFOgWLKHNJPuqAnawlykCGZ@jetpack">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i624" id="/^({b95faac1-a3d7-4d69-8943-ddd5a487d966}|{ecce0073-a837-45a2-95b9-600420505f7e}|{2713b394-286f-4d7c-89ea-4174eeab9f5a}|{da7a20cf-bef4-4342-ad78-0240fdf87055})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i472" id="linksicle@linksicle.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i66" id="youtubeer@youtuber.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i758" id="toolbar10853@findwide.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i668" id="/^(matchersite(pro(srcs?)?)?\@matchersite(pro(srcs?)?)?\.com)|((pro)?sitematcher(_srcs?|pro|site|sitesrc|-generic)?\@(pro)?sitematcher(_srcs?|pro|site|sitesrc|-generic)?\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i526" id="/^({83a8ce1b-683c-4784-b86d-9eb601b59f38}|{ef1feedd-d8da-4930-96f1-0a1a598375c6}|{79ff1aae-701f-4ca5-aea3-74b3eac6f01b}|{8a184644-a171-4b05-bc9a-28d75ffc9505}|{bc09c55d-0375-4dcc-836e-0e3c8addfbda}|{cef81415-2059-4dd5-9829-1aef3cf27f4f})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i98" id="youtubeeing@youtuberie.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i442" id="pennerdu@faceobooks.ws">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i39" id="{c2d64ff7-0ab8-4263-89c9-ea3b0f8f050c}">
+ <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i93" id="{68b8676b-99a5-46d1-b390-22411d8bcd61}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i554" id="lightningnewtab@gmail.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i348" id="{13c9f1f9-2322-4d5c-81df-6d4bf8476ba4}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i352" id="vpyekkifgv@vpyekkifgv.org">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i258" id="helperbar@helperbar.com">
+ <versionRange minVersion="0" maxVersion="1.0" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}">
+ <versionRange minVersion="40.10.1" maxVersion="44.10.1" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i447" id="{B18B1E5C-4D81-11E1-9C00-AFEB4824019B}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i678" id="{C4A4F5A0-4B89-4392-AFAC-D58010E349AF}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i482" id="brasilescapeeight@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i370" id="happylyrics@hpyproductions.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i17" id="{3252b9ae-c69a-4eaf-9502-dc9c1f6c009e}">
+ <versionRange minVersion="2.2" maxVersion="2.2">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i446" id="{E90FA778-C2B7-41D0-9FA9-3FEC1CA54D66}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i507" id="4zffxtbr-bs@VideoDownloadConverter_4z.com">
+ <versionRange minVersion="0" maxVersion="5.75.3.25126" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i7" id="{2224e955-00e9-4613-a844-ce69fccaae91}">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i722" id="{9802047e-5a84-4da3-b103-c55995d147d1}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i778" id="{f2456568-e603-43db-8838-ffa7c4a685c7}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i52" id="ff-ext@youtube">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i504" id="aytac@abc.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i453" id="/^brasilescape.*\@facebook\.com$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i308" id="9518042e-7ad6-4dac-b377-056e28d00c8f@f1cc0a13-4df1-4d66-938f-088db8838882.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i560" id="adsremoval@adsremoval.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i48" id="admin@youtubespeedup.com">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i344" id="lrcsTube@hansanddeta.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i461" id="{8E9E3331-D360-4f87-8803-52DE43566502}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i83" id="flash@adobee.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i766" id="/^[a-z0-9]+@foxysecure[a-z0-9]*\.com$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i196" id="info@wxdownloadmanager.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i570" id="jid1-vW9nopuIAJiRHw@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i547" id="{87934c42-161d-45bc-8cef-ef18abe2a30c}">
+ <versionRange minVersion="0" maxVersion="3.7.9999999999" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i216" id="fdm_ffext@freedownloadmanager.org">
+ <versionRange minVersion="1.0" maxVersion="1.3.1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <versionRange minVersion="1.5.7.5" maxVersion="1.5.7.5" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i644" id="youtubeunblocker@unblocker.yt">
+ <versionRange minVersion="43.4.1" maxVersion="77.5.1" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i576" id="newmoz@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i424" id="{C7AE725D-FA5C-4027-BB4C-787EF9F8248A}">
+ <versionRange minVersion="0" maxVersion="1.0.0.2" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="23.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i3" id="langpack-vi-VN@firefox.mozilla.org">
+ <versionRange minVersion="2.0" maxVersion="2.0">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i106" os="WINNT" id="{97E22097-9A2F-45b1-8DAF-36AD648C7EF4}">
+ <versionRange minVersion="0" maxVersion="15.0.5" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i744" id="{84a93d51-b7a9-431e-8ff8-d60e5d7f5df1}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i431" id="chinaescapeone@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i469" id="OKitSpace@OKitSpace.es">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i439" id="{d2cf9842-af95-48cd-b873-bfbb48cd7f5e}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i346" id="{a6e67e6f-8615-4fe0-a599-34a73fc3fba5}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i220" id="pricepeep@getpricepeep.com">
+ <versionRange minVersion="0" maxVersion="2.1.0.19.99" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i172" id="info@bflix.info">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i517" id="/^({16e193c8-1706-40bf-b6f3-91403a9a22be}|{284fed43-2e13-4afe-8aeb-50827d510e20}|{5e3cc5d8-ed11-4bed-bc47-35b4c4bc1033}|{7429e64a-1fd4-4112-a186-2b5630816b91}|{8c9980d7-0f09-4459-9197-99b3e559660c}|{8f1d9545-0bb9-4583-bb3c-5e1ac1e2920c})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i356" id="{341f4dac-1966-47ff-aacf-0ce175f1498a}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i165" id="{EEF73632-A085-4fd3-A778-ECD82C8CB297}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i742" id="{f894a29a-f065-40c3-bb19-da6057778493}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i489" id="astrovia@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i541" id="/^({988919ff-0cd8-4d0c-bc7e-60d55a49eb64}|{494b9726-9084-415c-a499-68c07e187244}|{55b95864-3251-45e9-bb30-1a82589aaff1}|{eef3855c-fc2d-41e6-8d91-d368f51b3055}|{90a1b331-c2b4-4933-9f63-ba7b84d60d58}|{d2cf9842-af95-48cd-b873-bfbb48cd7f5e})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i68" id="flashupdate@adobe.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i45" id="{22119944-ED35-4ab1-910B-E619EA06A115}">
+ <versionRange minVersion="0.1" maxVersion="7.6.1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="8.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i380" id="{cc8f597b-0765-404e-a575-82aefbd81daf}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i378" id="{a7aae4f0-bc2e-a0dd-fb8d-68ce32c9261f}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i784" id="{41e5ef7a-171d-4ab5-8351-951c65a29908}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i374" id="update@firefox.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i502" id="{df6bb2ec-333b-4267-8c4f-3f27dc8c6e07}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i8" id="{B13721C7-F507-4982-B2E5-502A71474FED}">
+ <versionRange minVersion=" " severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i684" id="{9edd0ea8-2819-47c2-8320-b007d5996f8a}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i107" os="WINNT" id="{ABDE892B-13A8-4d1b-88E6-365A6E755758}">
+ <versionRange minVersion="0" maxVersion="15.0.5" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i688" id="firefox-extension@mozilla.org">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i162" id="{EB7508CA-C7B2-46E0-8C04-3E94A035BD49}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i732" id=" {e935dd68-f90d-46a6-b89e-c4657534b353}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i506" id="/^ext@bettersurfplus/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i536" id="{25D77636-38B1-1260-887C-2D4AFA92D6A4}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i770" id="{8dc5c42e-9204-2a64-8b97-fa94ff8a241f}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i40" id="{28387537-e3f9-4ed7-860c-11e69af4a8a0}">
+ <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i698" id="{6b2a75c8-6e2e-4267-b955-43e25b54e575}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i498" id="hoverst@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i78" id="socialnetworktools@mozilla.doslash.org">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i596" id="{b99c8534-7800-48fa-bd71-519a46cdc7e1}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i740" id="ascsurfingprotection@iobit.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i360" id="ytd@mybrowserbar.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i481" id="{B40794A0-7477-4335-95C5-8CB9BBC5C4A5}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i99" id="pfzPXmnzQRXX6@2iABkVe.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}">
+ <versionRange minVersion="0" maxVersion="15.0.5" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i136" id="Adobe@flash.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i515" id="/^({bf9194c2-b86d-4ebc-9b53-1c08b6ff779e}|{61a83e16-7198-49c6-8874-3e4e8faeb4f3}|{f0af464e-5167-45cf-9cf0-66b396d1918c}|{5d9968c3-101c-4944-ba71-72d77393322d}|{01e86e69-a2f8-48a0-b068-83869bdba3d0})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i549" id="/^firefox@(albrechto|swiftbrowse|springsmart|storimbo|squirrelweb|betterbrowse|lizardlink|rolimno|browsebeyond|clingclang|weblayers|kasimos|higher-aurum|xaven|bomlabio)\.(com?|net|org|info|biz)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i168" id="flashX@adobe.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i449" id="gystqfr@ylgga.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i63" id="youtube@youtuber.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i720" id="FXqG@xeeR.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i550" id="colmer@yopmail.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i46" id="{841468a1-d7f4-4bd3-84e6-bb0f13a06c64}">
+ <versionRange minVersion="0.1" maxVersion="*">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="9.0a1" maxVersion="9.0" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i479" id="mbrsepone@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i666" id="wecarereminder@bryan">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i376" id="{9e09ac65-43c0-4b9d-970f-11e2e9616c55}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem name="/Astromenda/" blockID="i738">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i22" id="ShopperReports@ShopperReports.com">
+ <versionRange minVersion="3.1.22.0" maxVersion="3.1.22.0">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i672" id="/^(saamazon@mybrowserbar\.com)|(saebay@mybrowserbar\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i218" id="ffxtlbr@claro.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i562" id="iobitapps@mybrowserbar.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i434" id="afurladvisor@anchorfree.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i736" id="{c5e48979-bd7f-4cf7-9b73-2482a67a4f37}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i682" id="f6682b47-e12f-400b-9bc0-43b3ccae69d1@39d6f481-b198-4349-9ebe-9a93a86f9267.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i471" id="firefox@luckyleap.net">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i495" id="kallow@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i43" id="supportaccessplugin@gmail.com">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i537" id="rally_toolbar_ff@bulletmedia.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i286" id="{58bd07eb-0ee0-4df0-8121-dc9b693373df}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i528" id="008abed2-b43a-46c9-9a5b-a771c87b82da@1ad61d53-2bdc-4484-a26b-b888ecae1906.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i533" id="extension@Fast_Free_Converter.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i362" id="addon@defaulttab.com">
+ <versionRange minVersion="0" maxVersion="1.4.4" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i622" id="/^({ebd898f8-fcf6-4694-bc3b-eabc7271eeb1}|{46008e0d-47ac-4daa-a02a-5eb69044431a}|{213c8ed6-1d78-4d8f-8729-25006aa86a76}|{fa23121f-ee7c-4bd8-8c06-123d087282c5}|{19803860-b306-423c-bbb5-f60a7d82cde5})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i382" id="{6926c7f7-6006-42d1-b046-eba1b3010315}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i262" id="{167d9323-f7cc-48f5-948a-6f012831a69f}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i782" id="safebrowse@safebrowse.co">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i654" id="{7b1bf0b6-a1b9-42b0-b75d-252036438bdc}">
+ <versionRange minVersion="27.8" maxVersion="27.9" severity="3">
+ </versionRange>
+ <versionRange minVersion="27.8" maxVersion="27.9" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i326" id="/^((support2_en@adobe14\.com)|(XN4Xgjw7n4@yUWgc\.com)|(C7yFVpIP@WeolS3acxgS\.com)|(Kbeu4h0z@yNb7QAz7jrYKiiTQ3\.com)|(aWQzX@a6z4gWdPu8FF\.com)|(CBSoqAJLYpCbjTP90@JoV0VMywCjsm75Y0toAd\.com)|(zZ2jWZ1H22Jb5NdELHS@o0jQVWZkY1gx1\.com))$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i490" id="now.msn.com@services.mozilla.org">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i545" id="superlrcs@svenyor.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i61" id="youtube@youtube3.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i696" id="/^({fa95f577-07cb-4470-ac90-e843f5f83c52}|ffxtlbr@speedial\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i690" id="{55dce8ba-9dec-4013-937e-adbf9317d990">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i306" id="{ADFA33FD-16F5-4355-8504-DF4D664CFE10}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i546" id="firefox@browsefox.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i538" id="{354dbb0a-71d5-4e9f-9c02-6c88b9d387ba}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i55" id="youtube@youtube7.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i497" id="{872b5b88-9db5-4310-bdd0-ac189557e5f5}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i76" id="crossriderapp3924@crossrider.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i82" id="{8f42fb8b-b6f6-45de-81c0-d6d39f54f971}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i73" id="a1g0a9g219d@a1.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i706" id="thefoxonlybetter@quicksaver">
+ <versionRange minVersion="1.10" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="0.*" severity="3">
+ </versionRange>
+ <versionRange minVersion="1.6.160" maxVersion="1.6.160" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i163" id="info@allpremiumplay.info">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i322" id="jid0-Y6TVIzs0r7r4xkOogmJPNAGFGBw@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i454" id="sqlmoz@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i402" id="{99079a25-328f-4bd4-be04-00955acaa0a7}">
+ <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i708" id="{849ded12-59e9-4dae-8f86-918b70d213dc}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i484" id="plugin@getwebcake.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i65" id="activity@facebook.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}">
+ <versionRange minVersion="1.1b1" maxVersion="1.1b1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i100" id="{394DCBA4-1F92-4f8e-8EC9-8D2CB90CB69B}">
+ <versionRange minVersion="2.5.0" maxVersion="2.5.0" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i674" id="crossriderapp12555@crossrider.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i710" id="{e0352044-1439-48ba-99b6-b05ed1a4d2de}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i20" id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}">
+ <versionRange minVersion="0.1" maxVersion="5.2.0.7164" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i514" id="/^(67314b39-24e6-4f05-99f3-3f88c7cddd17@6c5fa560-13a3-4d42-8e90-53d9930111f9\.com|ffxtlbr@visualbee\.com|{7aeae561-714b-45f6-ace3-4a8aed6e227b}|{7093ee04-f2e4-4637-a667-0f730797b3a0}|{53c4024f-5a2e-4f2a-b33e-e8784d730938})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i724" id="{1cdbda58-45f8-4d91-b566-8edce18f8d0a}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i494" id="/^({e9df9360-97f8-4690-afe6-996c80790da4}|{687578b9-7132-4a7a-80e4-30ee31099e03}|{46a3135d-3683-48cf-b94c-82655cbc0e8a}|{49c795c2-604a-4d18-aeb1-b3eba27e5ea2}|{7473b6bd-4691-4744-a82b-7854eb3d70b6}|{96f454ea-9d38-474f-b504-56193e00c1a5})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i436" id="/(\{7aeae561-714b-45f6-ace3-4a8aed6e227b\})|(\{01e86e69-a2f8-48a0-b068-83869bdba3d0\})|(\{77f5fe49-12e3-4cf5-abb4-d993a0164d9e\})/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i433" id="{c95a4e8e-816d-4655-8c79-d736da1adb6d}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i754" id="{bb7b7a60-f574-47c2-8a0b-4c56f2da9802}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i354" id="{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i499" id="{babb9931-ad56-444c-b935-38bffe18ad26}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i598" id="{29b136c9-938d-4d3d-8df8-d649d9b74d02}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i466" id="afext@anchorfree.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i320" id="torntv@torntv.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i568" os="Darwin" id="thunder@xunlei.com">
+ <versionRange minVersion="0" maxVersion="2.0.6" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i634" id="jid1-4vUehhSALFNqCw@jetpack">
+ <versionRange minVersion="100.7" maxVersion="100.7" severity="3">
+ </versionRange>
+ <versionRange minVersion="99.7" maxVersion="99.7" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i478" id="{7e8a1050-cf67-4575-92df-dcc60e7d952d}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i522" id="/^({976cd962-e0ca-4337-aea7-d93fae63a79c}|{525ba996-1ce4-4677-91c5-9fc4ead2d245}|{91659dab-9117-42d1-a09f-13ec28037717}|{c1211069-1163-4ba8-b8b3-32fc724766be})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i18" id="msntoolbar@msn.com">
+ <versionRange minVersion=" " maxVersion="6.*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i470" id="extension@FastFreeConverter.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i628" id="ffxtlbr@iminent.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i117" id="{ce7e73df-6a44-4028-8079-5927a588c948}">
+ <versionRange minVersion="0" maxVersion="1.0.8" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i465" id="trtv3@trtv.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i75" os="Darwin,Linux" id="firebug@software.joehewitt.com">
+ <versionRange minVersion="1.9.0" maxVersion="1.9.0" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="9.0a1" maxVersion="9.*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i127" id="plugin@youtubeplayer.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i338" id="{1FD91A9C-410C-4090-BBCC-55D3450EF433}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i222" id="dealcabby@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i468" id="05dd836e-2cbd-4204-9ff3-2f8a8665967d@a8876730-fb0c-4057-a2fc-f9c09d438e81.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i398" id="{377e5d4d-77e5-476a-8716-7e70a9272da0}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i618" id="toolbar@ask.com">
+ <versionRange minVersion="3.15.5" maxVersion="3.15.5.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1">
+ </versionRange>
+ <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i768" id="{f2548724-373f-45fe-be6a-3a85e87b7711}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i246" id="support@vide1flash2.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i104" id="yasd@youasdr3.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i451" id="{e44a1809-4d10-4ab8-b343-3326b64c7cdd}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i69" id="{977f3b97-5461-4346-92c8-a14c749b77c9}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i115" id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i692" id="/^(j003-lqgrmgpcekslhg|SupraSavings|j003-dkqonnnthqjnkq|j003-kaggrpmirxjpzh)@jetpack$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i525" id="/^({65f9f6b7-2dae-46fc-bfaf-f88e4af1beca}|{9ed31f84-c8b3-4926-b950-dff74047ff79}|{0134af61-7a0c-4649-aeca-90d776060cb3}|{02edb56b-9b33-435b-b7df-b2843273a694}|{da51d4f6-3e7e-4ef8-b400-9198e0874606}|{b24577db-155e-4077-bb37-3fdd3c302bb5})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i485" id="/^brasilescape.*\@facebook\.com$//">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i483" id="brasilescapefive@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i664" id="123456789@offeringmedia.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i658" id="low_quality_flash@pie2k.com">
+ <versionRange minVersion="46.2" maxVersion="47.1" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i1" id="mozilla_cc@internetdownloadmanager.com">
+ <versionRange minVersion="2.1" maxVersion="3.3">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <versionRange minVersion=" " maxVersion="6.9.8">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.7a1pre" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i13" id="{E8E88AB0-7182-11DF-904E-6045E0D72085}">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i426" id="addlyrics@addlyrics.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i448" id="{0134af61-7a0c-4649-aeca-90d776060cb3}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i524" id="/^({4e988b08-8c51-45c1-8d74-73e0c8724579}|{93ec97bf-fe43-4bca-a735-5c5d6a0a40c4}|{aed63b38-7428-4003-a052-ca6834d8bad3}|{0b5130a9-cc50-4ced-99d5-cda8cc12ae48}|{C4CFC0DE-134F-4466-B2A2-FF7C59A8BFAD})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i432" id="lugcla21@gmail.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i480" id="pluggets@gmail.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i680" id="jid1-bKSXgRwy1UQeRA@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i510" id="{3c9a72a0-b849-40f3-8c84-219109c27554}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i460" id="{845cab51-d8d2-472f-8bd9-2b44642d97c2}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i56" id="flash@adobe.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i6" id="{3f963a5b-e555-4543-90e2-c3908898db71}">
+ <versionRange minVersion=" " maxVersion="8.5">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i12" id="masterfiler@gmail.com">
+ <versionRange severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i444" id="fplayer@adobe.flash">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i47" id="youtube@youtube2.com">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i518" id="/^({d6e79525-4524-4707-9b97-1d70df8e7e59}|{ddb4644d-1a37-4e6d-8b6e-8e35e2a8ea6c}|{e55007f4-80c5-418e-ac33-10c4d60db01e}|{e77d8ca6-3a60-4ae9-8461-53b22fa3125b}|{e89a62b7-248e-492f-9715-43bf8c507a2f}|{5ce3e0cb-aa83-45cb-a7da-a2684f05b8f3})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i726" id="{d87d56b2-1379-49f4-b081-af2850c79d8e}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i505" id="extacylife@a.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i86" id="{45147e67-4020-47e2-8f7a-55464fb535aa}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i788" id="{729c9605-0626-4792-9584-4cbe65b243e6}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i750" id="{46eddf51-a4f6-4476-8d6c-31c5187b2a2f}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i523" id="/^({7e8a1050-cf67-4575-92df-dcc60e7d952d}|{b3420a9c-a397-4409-b90d-bcf22da1a08a}|{eca6641f-2176-42ba-bdbe-f3e327f8e0af}|{707dca12-3f99-4d94-afea-06dcc0ae0108}|{aea20431-87fc-40be-bc5b-18066fe2819c}|{30ee6676-1ba6-455a-a7e8-298fa863a546})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i656" id="hdv@vovcacik.addons.mozilla.org">
+ <versionRange minVersion="102.0" maxVersion="102.0" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i503" id="{9CE11043-9A15-4207-A565-0C94C42D590D}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i318" id="ffxtlbr@incredibar.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i450" id="{dff137ae-1ffd-11e3-8277-b8ac6f996f26}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i564" id="/^(firefox@vebergreat\.net|EFGLQA@78ETGYN-0W7FN789T87\.COM)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i746" id="{58d2a791-6199-482f-a9aa-9b725ec61362}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i509" id="contato@facefollow.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i60" id="youtb3@youtb3.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i730" id="25p@9eAkaLq.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i90" id="videoplugin@player.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i452" id="{77beece6-3997-403a-92fa-0055bfcf88e5}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i764" id="prositez@prz.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i780" id="{b6ef1336-69bb-45b6-8cba-e578fc0e4433}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i96" id="youtubeee@youtuber3.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i455" id="7d51fb17-b199-4d8f-894e-decaff4fc36a@a298838b-7f50-4c7c-9277-df6abbd42a0c.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i441" id="{49c53dce-afa0-49a1-a08b-2eb8e8444128}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i652" id="garg_sms@yahoo.in">
+ <versionRange minVersion="67.9" maxVersion="67.9" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i734" id="profsites@pr.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i88" id="anttoolbar@ant.com">
+ <versionRange minVersion="2.4.6.4" maxVersion="2.4.6.4" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i762" id="/^({2d7886a0-85bb-4bf2-b684-ba92b4b21d23}|{2fab2e94-d6f9-42de-8839-3510cef6424b}|{c02397f7-75b0-446e-a8fa-6ef70cfbf12b}|{8b337819-d1e8-48d3-8178-168ae8c99c36}|firefox@neurowise.info|firefox@allgenius.info)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i535" id="/^ext@WebexpEnhancedV1alpha[0-9]+\.net$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i626" id="{20AD702C-661E-4534-8CE9-BA4EC9AD6ECC}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i660" id="youplayer@addons.mozilla.org">
+ <versionRange minVersion="79.9.8" maxVersion="208.0.1" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i486" id="xz123@ya456.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i392" id="{EEE6C361-6118-11DC-9C72-001320C79847}">
+ <versionRange minVersion="0" maxVersion="1.7.999" severity="1">
+ </versionRange>
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i406" id="{bf7380fa-e3b4-4db2-af3e-9d8783a45bfc}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i492" id="{af95cc15-3b9b-45ae-8d9b-98d08eda3111}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i474" id="{906000a4-88d9-4d52-b209-7a772970d91f}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i516" id="/^({3f3cddf8-f74d-430c-bd19-d2c9147aed3d}|{515b2424-5911-40bd-8a2c-bdb20286d8f5}|{17464f93-137e-4646-a0c6-0dc13faf0113}|{d1b5aad5-d1ae-4b20-88b1-feeaeb4c1ebc}|{aad50c91-b136-49d9-8b30-0e8d3ead63d0})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i774" id="x77IjS@xU.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i174" id="info@thebflix.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i84" id="pink@rosaplugin.info">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i97" id="support3_en@adobe122.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i11" id="yslow@yahoo-inc.com">
+ <versionRange minVersion="2.0.5" maxVersion="2.0.5">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.5.7" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i584" id="{52b0f3db-f988-4788-b9dc-861d016f4487}">
+ <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i438" id="{02edb56b-9b33-435b-b7df-b2843273a694}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i521" id="/^({66b103a7-d772-4fcd-ace4-16f79a9056e0}|{6926c7f7-6006-42d1-b046-eba1b3010315}|{72cabc40-64b2-46ed-8648-26d831761150}|{73ee2cf2-7b76-4c49-b659-c3d8cf30825d}|{ca6446a5-73d5-4c35-8aa1-c71dc1024a18}|{5373a31d-9410-45e2-b299-4f61428f0be4})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i716" id="{cc6cc772-f121-49e0-b1f0-c26583cb0c5e}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i70" id="psid-vhvxQHMZBOzUZA@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i519" id="703db0db-5fe9-44b6-9f53-c6a91a0ad5bd@7314bc82-969e-4d2a-921b-e5edd0b02cf1.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i532" id="249911bc-d1bd-4d66-8c17-df533609e6d8@c76f3de9-939e-4922-b73c-5d7a3139375d.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i38" id="{B7082FAA-CB62-4872-9106-E42DD88EDE45}">
+ <versionRange minVersion="0.1" maxVersion="3.3.0.*">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.7a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <versionRange minVersion="3.3.1" maxVersion="*">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="5.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i530" id="{739df940-c5ee-4bab-9d7e-270894ae687a}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i476" id="mbroctone@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i42" id="{D19CA586-DD6C-4a0a-96F8-14644F340D60}">
+ <versionRange minVersion="0.1" maxVersion="14.4.0" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i760" id="toolbar11093@freshy.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i142" id="{a3a5c777-f583-4fef-9380-ab4add1bc2a8}">
+ <versionRange minVersion="2.0.3" maxVersion="2.0.3">
+ </versionRange>
+ <versionRange minVersion="4.2" maxVersion="4.2" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i437" id="{4933189D-C7F7-4C6E-834B-A29F087BFD23}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i228" id="crossriderapp5060@crossrider.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}">
+ <versionRange minVersion="1.2" maxVersion="1.2">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i364" id="{FE1DEEEA-DB6D-44b8-83F0-34FC0F9D1052}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i59" id="ghostviewer@youtube2.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i51" id="admin@youtubeplayer.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i650" id="jid1-qj0w91o64N7Eeg@jetpack">
+ <versionRange minVersion="39.5.1" maxVersion="47.0.4" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i256" id="/^[0-9a-f]+@[0-9a-f]+\.info/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i396" id="/@(ft|putlocker|clickmovie|m2k|sharerepo|smarter-?)downloader\.com$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i44" id="sigma@labs.mozilla">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i501" id="xivars@aol.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i109" id="{392e123b-b691-4a5e-b52f-c4c1027e749c}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i548" id="/^firefox@(jumpflip|webconnect|browsesmart|mybuzzsearch|outobox|greygray|lemurleap|divapton|secretsauce|batbrowse|whilokii|linkswift|qualitink|browsefox|kozaka|diamondata|glindorus|saltarsmart|bizzybolt|websparkle)\.(com?|net|org|info|biz)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i79" id="GifBlock@facebook.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i496" id="{ACAA314B-EEBA-48e4-AD47-84E31C44796C}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i23" id="firefox@bandoo.com">
+ <versionRange minVersion="5.0" maxVersion="5.0" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.7a1pre" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i718" id="G4Ce4@w.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i686" id="{a7f2cb14-0472-42a1-915a-8adca2280a2c}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i772" id="{72b98dbc-939a-4e0e-b5a9-9fdbf75963ef}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i588" id="quick_start@gmail.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i340" id="chiang@programmer.net">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i54" id="applebeegifts@mozilla.doslash.org">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i16" id="{27182e60-b5f3-411c-b545-b44205977502}">
+ <versionRange minVersion="1.0" maxVersion="1.0">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i92" id="play5@vide04flash.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i700" id="2bbadf1f-a5af-499f-9642-9942fcdb7c76@f05a14cc-8842-4eee-be17-744677a917ed.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}">
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i776" id="g@uzcERQ6ko.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ <pref>browser.search.defaultenginename</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i748" id="{32da2f20-827d-40aa-a3b4-2fc4a294352e}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i542" id="/^({bf67a47c-ea97-4caf-a5e3-feeba5331231}|{24a0cfe1-f479-4b19-b627-a96bf1ea3a56})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i493" id="12x3q@3244516.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i728" id="l@AdLJ7uz.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ <pref>browser.startup.homepage</pref>
+ </prefs>
+ </emItem>
+ <emItem blockID="i694" id="59D317DB041748fdB89B47E6F96058F3@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i91" id="crossriderapp4926@crossrider.com">
+ <versionRange minVersion="0" maxVersion="0.81.43" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i67" id="youtube2@youtube2.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i520" id="/^({7316e43a-3ebd-4bb4-95c1-9caf6756c97f}|{0cc09160-108c-4759-bab1-5c12c216e005}|{ef03e721-f564-4333-a331-d4062cee6f2b}|{465fcfbb-47a4-4866-a5d5-d12f9a77da00}|{7557724b-30a9-42a4-98eb-77fcb0fd1be3}|{b7c7d4b0-7a84-4b73-a7ef-48ef59a52c3b})$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i282" id="{33e0daa6-3af3-d8b5-6752-10e949c61516}">
+ <versionRange minVersion="0" maxVersion="1.1.999" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i676" id="SpecialSavings@SpecialSavings.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i440" id="{2d069a16-fca1-4e81-81ea-5d5086dcbd0c}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i786" id="{63eb5ed4-e1b3-47ec-a253-f8462f205350}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i342" id="lbmsrvfvxcblvpane@lpaezhjez.org">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i336" id="CortonExt@ext.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i103" id="kdrgun@gmail.com">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i539" id="ScorpionSaver@jetpack">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i358" id="lfind@nijadsoft.net">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i714" id="{25dd52dc-89a8-469d-9e8f-8d483095d1e8}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i15" id="personas@christopher.beard">
+ <versionRange minVersion="1.6" maxVersion="1.6">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.6" maxVersion="3.6.*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i304" id="{f0e59437-6148-4a98-b0a6-60d557ef57f4}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i531" id="/^(4cb61367-efbf-4aa1-8e3a-7f776c9d5763@cdece6e9-b2ef-40a9-b178-291da9870c59\.com|0efc9c38-1ec7-49ed-8915-53a48b6b7600@e7f17679-2a42-4659-83c5-7ba961fdf75a\.com|6be3335b-ef79-4b0b-a0ba-b87afbc6f4ad@6bbb4d2e-e33e-4fa5-9b37-934f4fb50182\.com)$/">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i312" id="extension21804@extension21804.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i324" id="/^((34qEOefiyYtRJT@IM5Munavn\.com)|(Mro5Fm1Qgrmq7B@ByrE69VQfZvZdeg\.com)|(KtoY3KGxrCe5ie@yITPUzbBtsHWeCdPmGe\.com)|(9NgIdLK5Dq4ZMwmRo6zk@FNt2GCCLGyUuOD\.com)|(NNux7bWWW@RBWyXdnl6VGls3WAwi\.com)|(E3wI2n@PEHTuuNVu\.com)|(2d3VuWrG6JHBXbQdbr@3BmSnQL\.com))$/">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i756" id="{5eeb83d0-96ea-4249-942c-beead6847053}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i108" id="{28bfb930-7620-11e1-b0c4-0800200c9a66}">
+ <versionRange minVersion="0" maxVersion="*">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}">
+ <versionRange minVersion="178.7.0" maxVersion="178.7.0" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i662" id="imbaty@taringamp3.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i167" id="{b64982b1-d112-42b5-b1e4-d3867c4533f8}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i226" id="{462be121-2b54-4218-bf00-b9bf8135b23f}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i372" id="5nc3QHFgcb@r06Ws9gvNNVRfH.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i543" id="{badea1ae-72ed-4f6a-8c37-4db9a4ac7bc9}">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i473" id="{81b13b5d-fba1-49fd-9a6b-189483ac548a}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i477" id="mbrnovone@facebook.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}">
+ <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i648" id="firefoxaddon@youtubeenhancer.com">
+ <versionRange minVersion="208.7.0" maxVersion="208.7.0" severity="3">
+ </versionRange>
+ <versionRange minVersion="199.7.0" maxVersion="199.7.0" severity="3">
+ </versionRange>
+ <versionRange minVersion="199.7.0" maxVersion="208.7.0" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i508" id="advance@windowsclient.com">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i314" id="crossriderapp8812@crossrider.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i712" id="{a2bfe612-4cf5-48ea-907c-f3fb25bc9d6b}">
+ <versionRange minVersion="0" maxVersion="*" severity="3">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i752" id="savingsslider@mybrowserbar.com">
+ <versionRange minVersion="0" maxVersion="*" severity="1">
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i24" id="{6E19037A-12E3-4295-8915-ED48BC341614}">
+ <versionRange minVersion="0.1" maxVersion="1.3.328.4" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.7a1pre" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <prefs>
+ </prefs>
+ </emItem>
+ <emItem blockID="i21" id="support@update-firefox.com">
+ <prefs>
+ </prefs>
+ </emItem>
+ </emItems>
+
+ <pluginItems>
+ <pluginItem blockID="p26">
+ <match name="name" exp="^Yahoo Application State Plugin$" /> <match name="description" exp="^Yahoo Application State Plugin$" /> <match name="filename" exp="npYState.dll" /> <versionRange >
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0a1" maxVersion="3.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p27">
+ <match name="name" exp="QuickTime Plug-in 7[.]1[.]" /> <match name="filename" exp="npqtplugin.?[.]dll" /> <versionRange >
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0a1" maxVersion="3.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p28">
+ <match name="filename" exp="NPFFAddOn.dll" /> </pluginItem>
+ <pluginItem blockID="p31">
+ <match name="filename" exp="NPMySrch.dll" /> </pluginItem>
+ <pluginItem blockID="p32">
+ <match name="filename" exp="npViewpoint.dll" /> <versionRange >
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p33">
+ <match name="name" exp="[0-6]\.0\.[01]\d{2}\.\d+" /> <match name="filename" exp="npdeploytk.dll" /> <versionRange severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p34">
+ <match name="filename" exp="[Nn][Pp][Jj][Pp][Ii]1[56]0_[0-9]+\.[Dd][Ll][Ll]" /> <versionRange >
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="3.6a1pre" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p80">
+ <match name="name" exp="\(TM\)" /> <match name="description" exp="[^\d\._]((0(\.\d+(\.\d+([_\.]\d+)?)?)?)|(1\.(([0-5](\.\d+([_\.]\d+)?)?)|(6(\.0([_\.](0?\d|1\d|2\d|30))?)?)|(7(\.0([_\.][0-2])?)?))))([^\d\._]|$)" /> <match name="filename" exp="(npjp2\.dll)|(libnpjp2\.so)" /> <versionRange severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p85">
+ <match name="filename" exp="JavaPlugin2_NPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="13.6.0" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem os="Darwin" blockID="p89">
+ <match name="filename" exp="AdobePDFViewerNPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="10.1.3" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p94">
+ <match name="filename" exp="Flash\ Player\.plugin" /> <versionRange minVersion="0" maxVersion="10.2.159.1" severity="0">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.0.1" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p102">
+ <match name="filename" exp="npmozax\.dll" /> <versionRange minVersion="0" maxVersion="*"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p113">
+ <match name="filename" exp="npuplaypc\.dll" /> <versionRange minVersion="0" maxVersion="1.0.0.0" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p119">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.(6\.0_(\d|[0-2]\d?|3[0-2])|7\.0(_0?([1-4]))?)([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p123">
+ <match name="filename" exp="JavaPlugin2_NPAPI\.plugin" /> <versionRange minVersion="0" maxVersion="14.2.0" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p125">
+ <match name="name" exp="Java\(TM\) Platform SE ((6( U(\d|([0-2]\d)|3[0-2]))?)|(7(\sU[0-4])?))(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p129">
+ <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="0" maxVersion="5.0.99999" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p132">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.7\.0(_0?([5-6]))?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p134">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U[5-6](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p138">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 01" maxVersion="Java 7 Update 06" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p152">
+ <match name="filename" exp="npctrl\.dll" /> <versionRange minVersion="0" maxVersion="4.1.10328.0" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p154">
+ <match name="filename" exp="npctrl\.dll" /> <versionRange minVersion="5.0" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p156">
+ <match name="filename" exp="nppdf32\.dll" /> <versionRange minVersion="0" maxVersion="9.5.1" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p158">
+ <match name="filename" exp="nppdf32\.dll" /> <versionRange minVersion="10.0" maxVersion="10.1.5.9999" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p160">
+ <match name="filename" exp="NPSWF32\.dll" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="4.0" maxVersion="16.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p176">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p176">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p178">
+ <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p178">
+ <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p180">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 0" maxVersion="Java 7 Update 11" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p182">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U([0-9]|(1[0-1]))(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p184">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.7\.0(_0?([0-9]|(1[0-1]))?)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p186">
+ <match name="name" exp="Java\(TM\) Platform SE 6 U3[1-8](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p188">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 0" maxVersion="Java 6 Update 38" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p190">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.6\.0_3[1-8]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p210">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.7\.0(_0?7)?([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p212">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 07" maxVersion="Java 7 Update 07" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p214">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U7(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="0.1" maxVersion="17.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p240">
+ <match name="filename" exp="DivXBrowserPlugin\.plugin" /> <versionRange minVersion="0" maxVersion="1.4" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem os="Darwin" blockID="p242">
+ <match name="description" exp="Flip4Mac" /> <versionRange minVersion="0" maxVersion="2.4.3.999" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="18.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p248">
+ <match name="filename" exp="Scorch\.plugin" /> <versionRange minVersion="0" maxVersion="6.2.0b88" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p250">
+ <match name="filename" exp="npFoxitReaderPlugin\.dll" /> <versionRange minVersion="0" maxVersion="2.2.1.530" severity="0" vulnerabilitystatus="2"></versionRange>
+ </pluginItem>
+ <pluginItem os="Darwin" blockID="p252">
+ <match name="filename" exp="AdobePDFViewerNPAPI\.plugin" /> <versionRange minVersion="11.0.0" maxVersion="11.0.01" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p254">
+ <match name="filename" exp="PDF Browser Plugin\.plugin" /> <versionRange minVersion="0" maxVersion="2.4.2" severity="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="18.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p260">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="18.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p260">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p290">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p290">
+ <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p292">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 12" maxVersion="Java 7 Update 15" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p294">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U1[2-5](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p296">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.7\.0_1[2-5]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p298">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 39" maxVersion="Java 6 Update 41" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p300">
+ <match name="name" exp="Java\(TM\) Platform SE 6 U(39|40|41)(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p302">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.6\.0_(39|40|41)([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p328">
+ <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="5.1" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p328">
+ <match name="filename" exp="Silverlight\.plugin" /> <versionRange minVersion="5.1" maxVersion="5.1.20124.9999" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p330">
+ <match name="description" exp="^Shockwave Flash (([1-9]\.[0-9]+)|(10\.([0-2]|(3 r(([0-9][0-9]?)|1(([0-7][0-9])|8[0-2]))))))( |$)" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p330">
+ <match name="description" exp="^Shockwave Flash (([1-9]\.[0-9]+)|(10\.([0-2]|(3 r(([0-9][0-9]?)|1(([0-7][0-9])|8[0-2]))))))( |$)" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p332">
+ <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="19.0a1" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p332">
+ <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0.4" maxVersion="17.0.*" />
+ </targetApplication>
+ </versionRange>
+ <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+ </pluginItem>
+ <pluginItem blockID="p366">
+ <match name="filename" exp="Scorch\.plugin" /> <versionRange minVersion="6.2.0" maxVersion="6.2.0" severity="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p408">
+ <match name="filename" exp="QuickTime Plugin\.plugin" /> <versionRange minVersion="0" maxVersion="7.6.5" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p410">
+ <match name="filename" exp="npqtplugin\.dll" /> <versionRange minVersion="0" maxVersion="7.7.3" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p412">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.6\.0_4[2-5]([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p414">
+ <match name="name" exp="Java\(TM\) Platform SE 6 U4[2-5](\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p416">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 6 Update 42" maxVersion="Java 6 Update 45" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p418">
+ <match name="name" exp="Java\(TM\) Plug-in 1\.7\.0_(1[6-9]|2[0-4])([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p420">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U(1[6-9]|2[0-4])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p422">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 16" maxVersion="Java 7 Update 24" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p428">
+ <match name="filename" exp="np[dD]eployJava1\.dll" /> <versionRange severity="0" vulnerabilitystatus="2"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p456">
+ <match name="filename" exp="npvlc\.dll" /> <versionRange minVersion="0" maxVersion="2.0.5" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p457">
+ <match name="name" exp="Java(\(TM\))? Plug-in ((1\.7\.0_(2[5-9]|3\d|4[0-4]))|(10\.4[0-4](\.[0-9]+)?))([^\d\._]|$)" /> <match name="filename" exp="libnpjp2\.so" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p458">
+ <match name="name" exp="Java\(TM\) Platform SE 7 U(2[5-9]|3\d|4[0-4])(\s[^\d\._U]|$)" /> <match name="filename" exp="npjp2\.dll" /> <versionRange severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p459">
+ <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 25" maxVersion="Java 7 Update 44" severity="0" vulnerabilitystatus="1">
+ <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+ <versionRange minVersion="17.0" maxVersion="*" />
+ </targetApplication>
+ </versionRange>
+ </pluginItem>
+ <pluginItem blockID="p556">
+ <match name="filename" exp="npUnity3D32\.dll" /> <versionRange minVersion="0" maxVersion="4.3.4.99999999" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p558">
+ <match name="description" exp="^($|Unity Web Player version ([0-3]|(4\.([0-2]|3(\.[0-4])?[^0-9.]))))" /> <match name="filename" exp="Unity Web Player\.plugin" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p572">
+ <match name="filename" exp="npdjvu\.dll" /> <versionRange minVersion="0" maxVersion="6.1.4.27993" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p574">
+ <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p592">
+ <match name="filename" exp="CiscoWebCommunicator\.plugin" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ <pluginItem blockID="p594">
+ <match name="filename" exp="npCiscoWebCommunicator\.dll" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange>
+ </pluginItem>
+ </pluginItems>
+
+ <gfxItems>
+ <gfxBlacklistEntry blockID="g35"> <os>WINNT 6.1</os> <vendor>0x10de</vendor> <devices>
+ <device>0x0a6c</device>
+ </devices>
+ <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.17.12.5896</driverVersion> <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g36"> <os>WINNT 6.1</os> <vendor>0x10de</vendor> <devices>
+ <device>0x0a6c</device>
+ </devices>
+ <feature>DIRECT3D_9_LAYERS</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.17.12.5896</driverVersion> <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g37"> <os>WINNT 5.1</os> <vendor>0x10de</vendor> <feature>DIRECT3D_9_LAYERS</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>7.0.0.0</driverVersion> <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g144"> <os>All</os> <vendor>0x1002</vendor> <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.982.0.0</driverVersion> <driverVersionComparator>EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g146"> <os>All</os> <vendor>0x1022</vendor> <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.982.0.0</driverVersion> <driverVersionComparator>EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g148"> <os>All</os> <vendor>0x1022</vendor> <feature>DIRECT3D_9_LAYERS</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.982.0.0</driverVersion> <driverVersionComparator>EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g150"> <os>All</os> <vendor>0x1002</vendor> <feature>DIRECT3D_9_LAYERS</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>8.982.0.0</driverVersion> <driverVersionComparator>EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g192"> <os>WINNT 6.2</os> <vendor>0x1002</vendor> <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>9.10.8.0</driverVersion> <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g194"> <os>WINNT 6.2</os> <vendor>0x1022</vendor> <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>9.10.8.0</driverVersion> <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g198"> <os>Darwin 10</os> <vendor>0x10de</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g200"> <os>Darwin 11</os> <vendor>0x10de</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g202"> <os>Darwin 12</os> <vendor>0x10de</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g204"> <os>Darwin 10</os> <vendor>0x8086</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g206"> <os>Darwin 11</os> <vendor>0x8086</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g208"> <os>Darwin 12</os> <vendor>0x8086</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g230"> <os>Darwin 10</os> <vendor>0x1002</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g232"> <os>Darwin 11</os> <vendor>0x1002</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g234"> <os>Darwin 12</os> <vendor>0x1002</vendor> <feature>WEBGL_MSAA</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g278"> <os>WINNT 6.1</os> <vendor>0x1002</vendor> <devices>
+ <device>0x9802</device>
+ <device>0x9803</device>
+ <device>0x9803</device>
+ <device>0x9804</device>
+ <device>0x9805</device>
+ <device>0x9806</device>
+ <device>0x9807</device>
+ </devices>
+ <feature>DIRECT2D</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g280"> <os>WINNT 6.1</os> <vendor>0x1002</vendor> <devices>
+ <device>0x9802</device>
+ <device>0x9803</device>
+ <device>0x9803</device>
+ <device>0x9804</device>
+ <device>0x9805</device>
+ <device>0x9806</device>
+ <device>0x9807</device>
+ </devices>
+ <feature>DIRECT3D_9_LAYERS</feature> <featureStatus>BLOCKED_DEVICE</featureStatus> </gfxBlacklistEntry>
+ <gfxBlacklistEntry blockID="g511"> <os>WINNT 5.1</os> <vendor>0x8086</vendor> <feature>DIRECT3D_9_LAYERS, WEBGL_ANGLE</feature> <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus> <driverVersion>6.14.10.5218</driverVersion> <driverVersionComparator>LESS_THAN</driverVersionComparator> </gfxBlacklistEntry>
+ </gfxItems>
+
+
+</blocklist> \ No newline at end of file
diff --git a/mozilla/browser/config/mozconfigs/linux32/debug b/mozilla/browser/config/mozconfigs/linux32/debug
index 199ef75..f516cfe 100644
--- a/mozilla/browser/config/mozconfigs/linux32/debug
+++ b/mozilla/browser/config/mozconfigs/linux32/debug
@@ -4,6 +4,8 @@ ac_add_options --enable-signmar
ac_add_options --disable-unified-compilation
+MOZ_AUTOMATION_L10N_CHECK=0
+
. $topsrcdir/build/unix/mozconfig.linux32
# Needed to enable breakpad in application.ini
diff --git a/mozilla/browser/config/mozconfigs/linux64/debug b/mozilla/browser/config/mozconfigs/linux64/debug
index fefcbf0..058073f 100644
--- a/mozilla/browser/config/mozconfigs/linux64/debug
+++ b/mozilla/browser/config/mozconfigs/linux64/debug
@@ -2,6 +2,8 @@ ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
+MOZ_AUTOMATION_L10N_CHECK=0
+
. $topsrcdir/build/unix/mozconfig.linux
# Needed to enable breakpad in application.ini
diff --git a/mozilla/browser/config/mozconfigs/linux64/debug-nonunified b/mozilla/browser/config/mozconfigs/linux64/debug-nonunified
index 2e7b433..0604e01 100644
--- a/mozilla/browser/config/mozconfigs/linux64/debug-nonunified
+++ b/mozilla/browser/config/mozconfigs/linux64/debug-nonunified
@@ -1,3 +1,5 @@
+MOZ_AUTOMATION_UPLOAD=0
+
. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/mozilla/browser/config/mozconfigs/linux64/debug-static-analysis-clang
index a7a64d2..2e59d73 100644
--- a/mozilla/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ b/mozilla/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -1,3 +1,7 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_PACKAGE_TESTS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+
. "$topsrcdir/build/mozconfig.common"
ac_add_options --enable-debug
diff --git a/mozilla/browser/config/mozconfigs/linux64/nightly-nonunified b/mozilla/browser/config/mozconfigs/linux64/nightly-nonunified
index 2dccd17..f9f7c17 100644
--- a/mozilla/browser/config/mozconfigs/linux64/nightly-nonunified
+++ b/mozilla/browser/config/mozconfigs/linux64/nightly-nonunified
@@ -1,3 +1,6 @@
+MOZ_AUTOMATION_UPLOAD=0
+MOZ_AUTOMATION_PRETTY=1
+
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/macosx-universal/nightly-nonunified b/mozilla/browser/config/mozconfigs/macosx-universal/nightly-nonunified
index 82ec5e9..c7d8ba9 100644
--- a/mozilla/browser/config/mozconfigs/macosx-universal/nightly-nonunified
+++ b/mozilla/browser/config/mozconfigs/macosx-universal/nightly-nonunified
@@ -1,3 +1,5 @@
+MOZ_AUTOMATION_PRETTY=1
+MOZ_AUTOMATION_UPLOAD=0
. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/macosx64/debug-nonunified b/mozilla/browser/config/mozconfigs/macosx64/debug-nonunified
index ad7e12c..2f95d2d 100644
--- a/mozilla/browser/config/mozconfigs/macosx64/debug-nonunified
+++ b/mozilla/browser/config/mozconfigs/macosx64/debug-nonunified
@@ -1,3 +1,4 @@
+MOZ_AUTOMATION_UPLOAD=0
. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/win32/beta b/mozilla/browser/config/mozconfigs/win32/beta
index 322af12..c86365b 100644
--- a/mozilla/browser/config/mozconfigs/win32/beta
+++ b/mozilla/browser/config/mozconfigs/win32/beta
@@ -1,3 +1,4 @@
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
mk_add_options MOZ_PGO=1
diff --git a/mozilla/browser/config/mozconfigs/win32/debug b/mozilla/browser/config/mozconfigs/win32/debug
index 23ea49f..9ecc254 100644
--- a/mozilla/browser/config/mozconfigs/win32/debug
+++ b/mozilla/browser/config/mozconfigs/win32/debug
@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/common"
ac_add_options --enable-debug
diff --git a/mozilla/browser/config/mozconfigs/win32/debug-nonunified b/mozilla/browser/config/mozconfigs/win32/debug-nonunified
index 653433a..cf5766e 100644
--- a/mozilla/browser/config/mozconfigs/win32/debug-nonunified
+++ b/mozilla/browser/config/mozconfigs/win32/debug-nonunified
@@ -1,3 +1,6 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_L10N_CHECK=0
+MOZ_AUTOMATION_UPLOAD=0
. "$topsrcdir/browser/config/mozconfigs/win32/debug"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/win32/nightly b/mozilla/browser/config/mozconfigs/win32/nightly
index f3b1fb4..be9ac45 100644
--- a/mozilla/browser/config/mozconfigs/win32/nightly
+++ b/mozilla/browser/config/mozconfigs/win32/nightly
@@ -1,3 +1,4 @@
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
ac_add_options --enable-signmar
diff --git a/mozilla/browser/config/mozconfigs/win32/nightly-nonunified b/mozilla/browser/config/mozconfigs/win32/nightly-nonunified
index 3de1dfe..9260d81 100644
--- a/mozilla/browser/config/mozconfigs/win32/nightly-nonunified
+++ b/mozilla/browser/config/mozconfigs/win32/nightly-nonunified
@@ -1,3 +1,6 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_PRETTY=1
+MOZ_AUTOMATION_UPLOAD=0
. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
ac_add_options --disable-unified-compilation
diff --git a/mozilla/browser/config/mozconfigs/win32/release b/mozilla/browser/config/mozconfigs/win32/release
index 7feb125..eb2f98f 100644
--- a/mozilla/browser/config/mozconfigs/win32/release
+++ b/mozilla/browser/config/mozconfigs/win32/release
@@ -1,5 +1,6 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
mk_add_options MOZ_PGO=1
diff --git a/mozilla/browser/config/mozconfigs/win64/beta b/mozilla/browser/config/mozconfigs/win64/beta
index 091593d..3ecd065 100644
--- a/mozilla/browser/config/mozconfigs/win64/beta
+++ b/mozilla/browser/config/mozconfigs/win64/beta
@@ -1,3 +1,4 @@
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
diff --git a/mozilla/browser/config/mozconfigs/win64/debug b/mozilla/browser/config/mozconfigs/win64/debug
index 0ca4e4f..d17a74d 100644
--- a/mozilla/browser/config/mozconfigs/win64/debug
+++ b/mozilla/browser/config/mozconfigs/win64/debug
@@ -1,3 +1,5 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/common"
ac_add_options --target=x86_64-pc-mingw32
diff --git a/mozilla/browser/config/mozconfigs/win64/nightly b/mozilla/browser/config/mozconfigs/win64/nightly
index 7a0762b..ad68a09 100644
--- a/mozilla/browser/config/mozconfigs/win64/nightly
+++ b/mozilla/browser/config/mozconfigs/win64/nightly
@@ -1,3 +1,4 @@
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
diff --git a/mozilla/browser/config/mozconfigs/win64/release b/mozilla/browser/config/mozconfigs/win64/release
index fc114fc..bdc20f2 100644
--- a/mozilla/browser/config/mozconfigs/win64/release
+++ b/mozilla/browser/config/mozconfigs/win64/release
@@ -1,5 +1,6 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
+. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
diff --git a/mozilla/browser/config/version.txt b/mozilla/browser/config/version.txt
index 101d06e..402590d 100644
--- a/mozilla/browser/config/version.txt
+++ b/mozilla/browser/config/version.txt
@@ -1 +1 @@
-31.2.0esr
+31.2.1esrpre
diff --git a/mozilla/browser/confvars.sh b/mozilla/browser/confvars.sh
index 2e2199e..aa1ad45 100644
--- a/mozilla/browser/confvars.sh
+++ b/mozilla/browser/confvars.sh
@@ -67,4 +67,4 @@ MOZ_ACTIVITIES=1
MOZ_JSDOWNLOADS=1
MOZ_WEBM_ENCODER=1
# Enable exact rooting on desktop.
-JSGC_USE_EXACT_ROOTING=1
+export JSGC_USE_EXACT_ROOTING=1
diff --git a/mozilla/browser/installer/removed-files.in b/mozilla/browser/installer/removed-files.in
index a81058b..b1b9f29 100644
--- a/mozilla/browser/installer/removed-files.in
+++ b/mozilla/browser/installer/removed-files.in
@@ -57,6 +57,13 @@
# Firefox 27
distribution/extensions/testpilot@labs.mozilla.com.xpi
+# Some users are ending up with unpacked chrome instead of omni.ja. This
+# causes updates to break badly, see bug 1063052. Removing the toplevel
+# chrome.manifest causes us to use the updated omni.ja.
+#ifndef MOZ_GTK
+chrome.manifest
+#endif
+
# Directory removals
chrome/
#ifdef XP_UNIX
diff --git a/mozilla/browser/installer/windows/nsis/shared.nsh b/mozilla/browser/installer/windows/nsis/shared.nsh
index d91c357..97480e2 100755
--- a/mozilla/browser/installer/windows/nsis/shared.nsh
+++ b/mozilla/browser/installer/windows/nsis/shared.nsh
@@ -1036,6 +1036,14 @@ FunctionEnd
; Removes various directories and files for reasons noted below.
!macro RemoveDeprecatedFiles
+ ; Some users are ending up with unpacked chrome instead of omni.ja. This
+ ; causes Firefox to break badly after upgrading from Firefox 31, see bug
+ ; 1063052. Removing the chrome.manifest from the install directory causes
+ ; Firefox to use the updated omni.ja so it won't crash.
+ ${If} ${FileExists} "$INSTDIR\chrome.manifest"
+ Delete "$INSTDIR\chrome.manifest"
+ ${EndIf}
+
; Remove talkback if it is present (remove after bug 386760 is fixed)
${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org"
RmDir /r /REBOOTOK "$INSTDIR\extensions\talkback@mozilla.org"
diff --git a/mozilla/build/autoconf/altoptions.m4 b/mozilla/build/autoconf/altoptions.m4
index 3dc8c6e..6c40ad6 100644
--- a/mozilla/build/autoconf/altoptions.m4
+++ b/mozilla/build/autoconf/altoptions.m4
@@ -116,7 +116,42 @@ echo "
dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
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.
-_AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
-. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
+inserted=
+dnl Shell is hard, so here is what the following does:
+dnl - Reset $@ (command line arguments)
+dnl - Add the configure options from mozconfig to $@ one by one
+dnl - Add the original command line arguments after that, one by one
+dnl
+dnl There are several tricks involved:
+dnl - It is not possible to preserve the whitespaces in $@ by assigning to
+dnl another variable, so the two first steps above need to happen in the first
+dnl iteration of the third step.
+dnl - We always want the configure options to be added, so the loop must be
+dnl iterated at least once, so we add a dummy argument first, and discard it.
+dnl - something | while read line ... makes the while run in a subshell, meaning
+dnl that anything it does is not propagated to the main shell, so we can't do
+dnl set -- foo there. As a consequence, what the while loop reading mach
+dnl environment output does is output a set of shell commands for the main shell
+dnl to eval.
+dnl - Extra care is due when lines from mach environment output contain special
+dnl shell characters, so we use ' for quoting and ensure no ' end up in between
+dnl the quoting mark unescaped.
+dnl Some of the above is directly done in mach environment --format=configure.
+failed_eval() {
+ echo "Failed eval'ing the following:"
+ $(dirname [$]0)/[$1]/mach environment --format=configure
+ exit 1
+}
+
+set -- dummy "[$]@"
+for ac_option
+do
+ if test -z "$inserted"; then
+ set --
+ eval "$($(dirname [$]0)/[$1]/mach environment --format=configure)" || failed_eval
+ inserted=1
+ else
+ set -- "[$]@" "$ac_option"
+ fi
+done
+])
diff --git a/mozilla/build/autoconf/mozconfig-find b/mozilla/build/autoconf/mozconfig-find
deleted file mode 100755
index 97dd90c..0000000
--- a/mozilla/build/autoconf/mozconfig-find
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# mozconfigfind - Loads options from .mozconfig onto configure's
-# command-line. The .mozconfig file is searched for in the
-# order:
-# If $MOZCONFIG is set, use that.
-# If one of $TOPSRCDIR/.mozconfig or $TOPSRCDIR/mozconfig exists, use it.
-# If both exist, or if various legacy locations contain a mozconfig, error.
-# Otherwise, use the default build options.
-#
-topsrcdir=$1
-
-abspath() {
- if uname -s | grep -q MINGW; then
- # We have no way to figure out whether we're in gmake or pymake right
- # now. gmake gives us Unix-style paths while pymake gives us Windows-style
- # paths, so attempt to handle both.
- regexes='^\([A-Za-z]:\|\\\\\|\/\) ^\/'
- else
- regexes='^\/'
- fi
-
- for regex in $regexes; do
- if echo $1 | grep -q $regex; then
- echo $1
- return
- fi
- done
-
- # If we're at this point, we have a relative path
- echo `pwd`/$1
-}
-
-if [ -n "$MOZCONFIG" ] && ! [ -f "$MOZCONFIG" ]; then
- echo "Specified MOZCONFIG \"$MOZCONFIG\" does not exist!" 1>&2
- exit 1
-fi
-
-if [ -n "$MOZ_MYCONFIG" ]; then
- echo "Your environment currently has the MOZ_MYCONFIG variable set to \"$MOZ_MYCONFIG\". MOZ_MYCONFIG is no longer supported. Please use MOZCONFIG instead." 1>&2
- exit 1
-fi
-
-if [ -z "$MOZCONFIG" ] && [ -f "$topsrcdir/.mozconfig" ] && [ -f "$topsrcdir/mozconfig" ]; then
- echo "Both \$topsrcdir/.mozconfig and \$topsrcdir/mozconfig are supported, but you must choose only one. Please remove the other." 1>&2
- exit 1
-fi
-
-for _config in "$MOZCONFIG" \
- "$topsrcdir/.mozconfig" \
- "$topsrcdir/mozconfig"
-do
- if test -f "$_config"; then
- abspath $_config
- exit 0
- fi
-done
-
-# We used to support a number of other implicit .mozconfig locations. We now
-# detect if we were about to use any of these locations and issue an error if we
-# find any.
-for _config in "$topsrcdir/mozconfig.sh" \
- "$topsrcdir/myconfig.sh" \
- "$HOME/.mozconfig" \
- "$HOME/.mozconfig.sh" \
- "$HOME/.mozmyconfig.sh"
-do
- if test -f "$_config"; then
- echo "You currently have a mozconfig at \"$_config\". This implicit location is no longer supported. Please move it to $topsrcdir/.mozconfig or specify it explicitly via \$MOZCONFIG." 1>&2
- exit 1
- fi
-done
diff --git a/mozilla/build/autoconf/mozconfig2client-mk b/mozilla/build/autoconf/mozconfig2client-mk
deleted file mode 100755
index aaf8de1..0000000
--- a/mozilla/build/autoconf/mozconfig2client-mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# mozconfig2client-mk - Translates .mozconfig into options for client.mk.
-# Prints defines to stdout.
-#
-# See mozconfig2configure for more details
-
-print_header() {
- cat <<EOF
-# gmake
-# This file is automatically generated for client.mk.
-# Do not edit. Edit $FOUND_MOZCONFIG instead.
-
-EOF
-}
-
-ac_add_options() {
- for _opt
- do
- case "$_opt" in
- --target=*)
- echo $_opt | sed s/--target/CONFIG_GUESS/
- ;;
- *)
- echo "# $_opt is used by configure (not client.mk)"
- ;;
- esac
- done
-}
-
-ac_add_app_options() {
- echo "# $* is used by configure (not client.mk)"
-}
-
-mk_add_options() {
- for _opt
- do
- # Escape shell characters, space, tab, dollar, quote, backslash,
- # and substitute '@<word>@' with '$(<word>)'.
- _opt=`echo "$_opt" | sed -e 's/\([\"\\]\)/\\\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
- echo $_opt;
- done
-}
-
-# Main
-#--------------------------------------------------
-
-scriptdir=`dirname $0`
-topsrcdir=$1
-
-# If the path changes, configure should be rerun
-echo "# PATH=$PATH"
-
-# If FOUND_MOZCONFIG isn't set, look for it and make sure the script doesn't error out
-isfoundset=${FOUND_MOZCONFIG+yes}
-if [ -z $isfoundset ]; then
- FOUND_MOZCONFIG=`$scriptdir/mozconfig-find $topsrcdir`
- if [ $? -ne 0 ]; then
- echo '$(error Fix above errors before continuing.)'
- else
- isfoundset=yes
- fi
-fi
-
-if [ -n $isfoundset ]; then
- if [ "$FOUND_MOZCONFIG" ]
- then
- print_header
- . "$FOUND_MOZCONFIG"
- echo "FOUND_MOZCONFIG := $FOUND_MOZCONFIG"
- fi
-fi
diff --git a/mozilla/build/autoconf/mozconfig2configure b/mozilla/build/autoconf/mozconfig2configure
deleted file mode 100755
index 99623b6..0000000
--- a/mozilla/build/autoconf/mozconfig2configure
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# mozconfig2configure - Loads options from .mozconfig onto configure's
-# command-line. See mozconfig-find for how the config file is
-# found
-#
-# The options from .mozconfig are inserted into the command-line
-# before the real command-line options. This way the real options
-# will override any .mozconfig options.
-#
-# .mozconfig is a shell script. To add an option to configure's
-# command-line use the pre-defined function, ac_add_options,
-#
-# ac_add_options <configure-option> [<configure-option> ... ]
-#
-# For example,
-#
-# ac_add_options --with-pthreads --enable-debug
-#
-# ac_add_options can be called multiple times in .mozconfig.
-# Each call adds more options to configure's command-line.
-
-# Note: $_AUTOCONF_TOOLS_DIR must be defined in the script that includes this.
-
-ac_add_options() {
- for _opt
- do
- # Escape shell characters, space, tab, dollar, quote, backslash, parentheses.
- _opt=`echo $_opt | sed -e 's/\([\ \ \$\"\\\(\)]\)/\\\\\1/g;s/@\([^@]*\)@/\$\1/g;'`
- _opt=`echo $_opt | sed -e 's/@\([^@]*\)@/\$(\1)/g'`
-
- # Avoid adding duplicates
- case "$ac_options" in
- # Note that all options in $ac_options are enclosed in quotes,
- # so there will always be a last character to match [^-A-Za-z0-9_]
- *"\"$_opt[^-A-Za-z0-9_]"* ) ;;
- * ) mozconfig_ac_options="$mozconfig_ac_options $_opt" ;;
- esac
- done
-}
-
-ac_add_app_options() {
- APP=$1
- shift;
- if [ "$APP" = "$MOZ_BUILD_APP" ]; then
- ac_add_options "$*";
- fi
-}
-
-mk_add_options() {
- # These options are for client.mk
- # configure can safely ignore them.
- :
-}
-
-ac_echo_options() {
- echo "Adding configure options from $FOUND_MOZCONFIG:"
- eval "set -- $mozconfig_ac_options"
- for _opt
- do
- echo " $_opt"
- done
-}
-
-# Main
-#--------------------------------------------------
-topsrcdir=$(cd `dirname $0`; pwd -W 2>/dev/null || pwd)
-ac_options=
-mozconfig_ac_options=
-
-# Save the real command-line options
-for _opt
-do
- # Escape shell characters, space, tab, dollar, quote, backslash.
- _opt=`echo $_opt | sed -e 's/\([\ \ \$\"\\]\)/\\\\\1/g;'`
- ac_options="$ac_options \"$_opt\""
-done
-
-
-# If FOUND_MOZCONFIG isn't set, look for it and make sure the script doesn't error out
-isfoundset=${FOUND_MOZCONFIG+yes}
-if [ -z $isfoundset ]; then
- FOUND_MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
- if [ $? -ne 0 ]; then
- echo "Fix above errors before continuing." 1>&2
- exit 1
- fi
-fi
-
-if [ "$FOUND_MOZCONFIG" ]; then
- . "$FOUND_MOZCONFIG"
-fi
-export FOUND_MOZCONFIG
-
-if [ "$mozconfig_ac_options" ]; then
- ac_echo_options 1>&2
-fi
-
-eval "set -- $mozconfig_ac_options $ac_options"
diff --git a/mozilla/build/automation.py.in b/mozilla/build/automation.py.in
index b7a9cf2..12953d8 100644
--- a/mozilla/build/automation.py.in
+++ b/mozilla/build/automation.py.in
@@ -217,7 +217,6 @@ class Automation(object):
universal_newlines=False,
startupinfo=None,
creationflags=0):
- args = automationutils.wrapCommand(args)
_log.info("INFO | automation.py | Launching: %s", subprocess.list2cmdline(args))
subprocess.Popen.__init__(self, args, bufsize, executable,
stdin, stdout, stderr,
diff --git a/mozilla/build/automationutils.py b/mozilla/build/automationutils.py
index 15f9b4f..eb3fcfe 100644
--- a/mozilla/build/automationutils.py
+++ b/mozilla/build/automationutils.py
@@ -43,7 +43,6 @@ __all__ = [
"getDebuggerInfo",
"DEBUGGER_INFO",
"replaceBackSlashes",
- "wrapCommand",
'KeyValueParseError',
'parseKeyValue',
'systemMemory',
@@ -407,19 +406,6 @@ def processLeakLog(leakLogFile, leakThreshold = 0):
def replaceBackSlashes(input):
return input.replace('\\', '/')
-def wrapCommand(cmd):
- """
- If running on OS X 10.5 or older, wrap |cmd| so that it will
- be executed as an i386 binary, in case it's a 32-bit/64-bit universal
- binary.
- """
- if platform.system() == "Darwin" and \
- hasattr(platform, 'mac_ver') and \
- platform.mac_ver()[0][:4] < '10.6':
- return ["arch", "-arch", "i386"] + cmd
- # otherwise just execute the command normally
- return cmd
-
class KeyValueParseError(Exception):
"""error when parsing strings of serialized key-values"""
def __init__(self, msg, errors=()):
diff --git a/mozilla/build/gen_mach_buildprops.py b/mozilla/build/gen_mach_buildprops.py
new file mode 100644
index 0000000..9c0b175
--- /dev/null
+++ b/mozilla/build/gen_mach_buildprops.py
@@ -0,0 +1,115 @@
+#!/usr/bin/python
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import sys
+import os
+import hashlib
+import json
+import re
+import errno
+from argparse import ArgumentParser
+
+def getFileHashAndSize(filename):
+ sha512Hash = 'UNKNOWN'
+ size = 'UNKNOWN'
+
+ try:
+ # open in binary mode to make sure we get consistent results
+ # across all platforms
+ f = open(filename, "rb")
+ shaObj = hashlib.sha512(f.read())
+ sha512Hash = shaObj.hexdigest()
+
+ size = os.path.getsize(filename)
+ except:
+ pass
+
+ return (sha512Hash, size)
+
+def getMarProperties(filename, partial=False):
+ if not os.path.exists(filename):
+ return {}
+ (mar_hash, mar_size) = getFileHashAndSize(filename)
+ martype = 'partial' if partial else 'complete'
+ return {
+ '%sMarFilename' % martype: os.path.basename(filename),
+ '%sMarSize' % martype: mar_size,
+ '%sMarHash' % martype: mar_hash,
+ }
+
+def getUrlProperties(filename):
+ # let's create a switch case using name-spaces/dict
+ # rather than a long if/else with duplicate code
+ property_conditions = [
+ # key: property name, value: condition
+ ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or
+ m.endswith('crashreporter-symbols-full.zip')),
+ ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))),
+ ('unsignedApkUrl', lambda m: m.endswith('apk') and
+ 'unsigned-unaligned' in m),
+ ('robocopApkUrl', lambda m: m.endswith('apk') and 'robocop' in m),
+ ('jsshellUrl', lambda m: 'jsshell-' in m and m.endswith('.zip')),
+ ('completeMarUrl', lambda m: m.endswith('.complete.mar')),
+ ('partialMarUrl', lambda m: m.endswith('.mar') and '.partial.' in m),
+ # packageUrl must be last!
+ ('packageUrl', lambda m: True),
+ ]
+ url_re = re.compile(r'''^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar|tar\.gz))$''')
+ properties = {}
+
+ try:
+ with open(filename) as f:
+ for line in f:
+ m = url_re.match(line)
+ if m:
+ m = m.group(1)
+ for prop, condition in property_conditions:
+ if condition(m):
+ properties.update({prop: m})
+ break
+ except IOError as e:
+ if e.errno != errno.ENOENT:
+ raise
+ properties = {prop: 'UNKNOWN' for prop, condition in property_conditions}
+ return properties
+
+def getPartialInfo(props):
+ return [{
+ "from_buildid": props.get("previous_buildid"),
+ "size": props.get("partialMarSize"),
+ "hash": props.get("partialMarHash"),
+ "url": props.get("partialMarUrl"),
+ }]
+
+if __name__ == '__main__':
+ parser = ArgumentParser(description='Generate mach_build_properties.json for automation builds.')
+ parser.add_argument("--complete-mar-file", required=True,
+ action="store", dest="complete_mar_file",
+ help="Path to the complete MAR file, relative to the objdir.")
+ parser.add_argument("--partial-mar-file", required=False,
+ action="store", dest="partial_mar_file",
+ help="Path to the partial MAR file, relative to the objdir.")
+ parser.add_argument("--upload-output", required=True,
+ action="store", dest="upload_output",
+ help="Path to the text output of 'make upload'")
+ args = parser.parse_args()
+
+ json_data = getMarProperties(args.complete_mar_file)
+ json_data.update(getUrlProperties(args.upload_output))
+ if args.partial_mar_file:
+ json_data.update(getMarProperties(args.partial_mar_file, partial=True))
+
+ # Pull the previous buildid from the partial mar filename.
+ res = re.match(r'.*\.([0-9]+)-[0-9]+.mar', args.partial_mar_file)
+ if res:
+ json_data['previous_buildid'] = res.group(1)
+
+ # Set partialInfo to be a collection of the partial mar properties
+ # useful for balrog.
+ json_data['partialInfo'] = getPartialInfo(json_data)
+
+ with open('mach_build_properties.json', 'w') as outfile:
+ json.dump(json_data, outfile, indent=4)
diff --git a/mozilla/build/mach_bootstrap.py b/mozilla/build/mach_bootstrap.py
index ff7c0d1..bf222f8 100644
--- a/mozilla/build/mach_bootstrap.py
+++ b/mozilla/build/mach_bootstrap.py
@@ -144,42 +144,47 @@ def bootstrap(topsrcdir, mozilla_dir=None):
# case. For default behavior, we educate users and give them an opportunity
# to react. We always exit after creating the directory because users don't
# like surprises.
- state_user_dir = os.path.expanduser('~/.mozbuild')
- state_env_dir = os.environ.get('MOZBUILD_STATE_PATH', None)
- if state_env_dir:
- if not os.path.exists(state_env_dir):
- print('Creating global state directory from environment variable: %s'
- % state_env_dir)
- os.makedirs(state_env_dir, mode=0o770)
- print('Please re-run mach.')
- sys.exit(1)
- state_dir = state_env_dir
- else:
- if not os.path.exists(state_user_dir):
- print(STATE_DIR_FIRST_RUN.format(userdir=state_user_dir))
- try:
- for i in range(20, -1, -1):
- time.sleep(1)
- sys.stdout.write('%d ' % i)
- sys.stdout.flush()
- except KeyboardInterrupt:
- sys.exit(1)
-
- print('\nCreating default state directory: %s' % state_user_dir)
- os.mkdir(state_user_dir)
- print('Please re-run mach.')
- sys.exit(1)
- state_dir = state_user_dir
-
try:
import mach.main
except ImportError:
sys.path[0:0] = [os.path.join(mozilla_dir, path) for path in SEARCH_PATHS]
import mach.main
- def populate_context(context):
- context.state_dir = state_dir
- context.topdir = topsrcdir
+ def populate_context(context, key=None):
+ if key is None:
+ return
+ if key == 'state_dir':
+ state_user_dir = os.path.expanduser('~/.mozbuild')
+ state_env_dir = os.environ.get('MOZBUILD_STATE_PATH', None)
+ if state_env_dir:
+ if not os.path.exists(state_env_dir):
+ print('Creating global state directory from environment variable: %s'
+ % state_env_dir)
+ os.makedirs(state_env_dir, mode=0o770)
+ print('Please re-run mach.')
+ sys.exit(1)
+ state_dir = state_env_dir
+ else:
+ if not os.path.exists(state_user_dir):
+ print(STATE_DIR_FIRST_RUN.format(userdir=state_user_dir))
+ try:
+ for i in range(20, -1, -1):
+ time.sleep(1)
+ sys.stdout.write('%d ' % i)
+ sys.stdout.flush()
+ except KeyboardInterrupt:
+ sys.exit(1)
+
+ print('\nCreating default state directory: %s' % state_user_dir)
+ os.mkdir(state_user_dir)
+ print('Please re-run mach.')
+ sys.exit(1)
+ state_dir = state_user_dir
+
+ return state_dir
+ if key == 'topdir':
+ return topsrcdir
+ raise AttributeError(key)
mach = mach.main.Mach(os.getcwd())
mach.populate_context_handler = populate_context
diff --git a/mozilla/build/macosx/mozconfig.common b/mozilla/build/macosx/mozconfig.common
index e258b0d..2dbf40b 100644
--- a/mozilla/build/macosx/mozconfig.common
+++ b/mozilla/build/macosx/mozconfig.common
@@ -2,6 +2,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+MOZ_AUTOMATION_L10N_CHECK=0
+
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+ MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+ MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
. "$topsrcdir/build/mozconfig.common"
if [ -d "$topsrcdir/clang" ]; then
diff --git a/mozilla/build/moz-automation.mk b/mozilla/build/moz-automation.mk
new file mode 100644
index 0000000..d031eff
--- /dev/null
+++ b/mozilla/build/moz-automation.mk
@@ -0,0 +1,115 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ifneq (,$(filter automation/%,$(MAKECMDGOALS)))
+ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
+MAKEFLAGS += --output-sync=target
+else
+.NOTPARALLEL:
+endif
+endif
+
+include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
+
+# Log file from the 'make upload' step. We need this to parse out the URLs of
+# the uploaded files.
+AUTOMATION_UPLOAD_OUTPUT = $(DIST)/automation-upload.txt
+
+# Helper variables to convert from MOZ_AUTOMATION_* variables to the
+# corresponding the make target
+tier_BUILD_SYMBOLS = buildsymbols
+tier_L10N_CHECK = l10n-check
+tier_PRETTY_L10N_CHECK = pretty-l10n-check
+tier_INSTALLER = installer
+tier_PRETTY_INSTALLER = pretty-installer
+tier_PACKAGE = package
+tier_PRETTY_PACKAGE = pretty-package
+tier_PACKAGE_TESTS = package-tests
+tier_PRETTY_PACKAGE_TESTS = pretty-package-tests
+tier_UPDATE_PACKAGING = update-packaging
+tier_PRETTY_UPDATE_PACKAGING = pretty-update-packaging
+tier_UPLOAD_SYMBOLS = uploadsymbols
+tier_UPLOAD = upload
+
+# Automation build steps. Everything in MOZ_AUTOMATION_TIERS also gets used in
+# TIERS for mach display. As such, the MOZ_AUTOMATION_TIERS are roughly sorted
+# here in the order that they will be executed (since mach doesn't know of the
+# dependencies between them).
+moz_automation_symbols = \
+ PACKAGE_TESTS \
+ PRETTY_PACKAGE_TESTS \
+ BUILD_SYMBOLS \
+ UPLOAD_SYMBOLS \
+ PACKAGE \
+ PRETTY_PACKAGE \
+ INSTALLER \
+ PRETTY_INSTALLER \
+ UPDATE_PACKAGING \
+ PRETTY_UPDATE_PACKAGING \
+ L10N_CHECK \
+ PRETTY_L10N_CHECK \
+ UPLOAD \
+ $(NULL)
+MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym))))
+
+# Dependencies between automation build steps
+automation/uploadsymbols: automation/buildsymbols
+
+automation/update-packaging: automation/package
+automation/pretty-update-packaging: automation/pretty-package
+automation/pretty-update-packaging: automation/pretty-installer
+
+automation/l10n-check: automation/package
+automation/l10n-check: automation/installer
+automation/pretty-l10n-check: automation/pretty-package
+automation/pretty-l10n-check: automation/pretty-installer
+
+automation/upload: automation/installer
+automation/upload: automation/package
+automation/upload: automation/package-tests
+automation/upload: automation/buildsymbols
+automation/upload: automation/update-packaging
+
+# automation/{pretty-}package should depend on build (which is implicit due to
+# the way client.mk invokes automation/build), but buildsymbols changes the
+# binaries/libs, and that's what we package/test.
+automation/pretty-package: automation/buildsymbols
+
+# The 'pretty' versions of targets run before the regular ones to avoid
+# conflicts in writing to the same files.
+automation/installer: automation/pretty-installer
+automation/package: automation/pretty-package
+automation/package-tests: automation/pretty-package-tests
+automation/l10n-check: automation/pretty-l10n-check
+automation/update-packaging: automation/pretty-update-packaging
+
+automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
+ $(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT)
+
+# We need the log from make upload to grep it for urls in order to set
+# properties.
+AUTOMATION_EXTRA_CMDLINE-upload = 2>&1 | tee $(AUTOMATION_UPLOAD_OUTPUT)
+
+# Note: We have to force -j1 here, at least until bug 1036563 is fixed.
+AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1
+AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1
+
+# And force -j1 here until bug 1077670 is fixed.
+AUTOMATION_EXTRA_CMDLINE-package-tests = -j1
+AUTOMATION_EXTRA_CMDLINE-pretty-package-tests = -j1
+
+# The commands only run if the corresponding MOZ_AUTOMATION_* variable is
+# enabled. This means, for example, if we enable MOZ_AUTOMATION_UPLOAD, then
+# 'buildsymbols' will only run if MOZ_AUTOMATION_BUILD_SYMBOLS is also set.
+# However, the target automation/buildsymbols will still be executed in this
+# case because it is a prerequisite of automation/upload.
+define automation_commands
+$(call BUILDSTATUS,TIER_START $1)
+@$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1)
+$(call BUILDSTATUS,TIER_FINISH $1)
+endef
+
+automation/%:
+ $(if $(filter $*,$(MOZ_AUTOMATION_TIERS)),$(call automation_commands,$*))
diff --git a/mozilla/build/mozconfig.automation b/mozilla/build/mozconfig.automation
new file mode 100644
index 0000000..b65f0fa
--- /dev/null
+++ b/mozilla/build/mozconfig.automation
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Common mozconfig for automation builds.
+#
+# We export MOZ_AUTOMATION_* variables here to trigger various steps in
+# automation builds. For example, if MOZ_AUTOMATION_PACKAGE is set, then the
+# package step will run. This file contains the default settings, which can be
+# overridden by setting them earlier in the appropriate mozconfig.
+
+mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
+mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
+mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
+mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
+mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
+mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
+mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
+mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
+
+# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
+# stages.
+if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
+
+ # Note that we always build the update packaging with pretty names even if
+ # we don't build it without, so this is set to 1.
+ mk_add_options "export MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING=1"
+fi
diff --git a/mozilla/build/mozconfig.common b/mozilla/build/mozconfig.common
index edd7c40..3b49b81 100644
--- a/mozilla/build/mozconfig.common
+++ b/mozilla/build/mozconfig.common
@@ -15,3 +15,5 @@ mk_add_options AUTOCLOBBER=1
ac_add_options --enable-crashreporter
ac_add_options --enable-release
+
+. "$topsrcdir/build/mozconfig.automation"
diff --git a/mozilla/build/mozconfig.win-common b/mozilla/build/mozconfig.win-common
new file mode 100644
index 0000000..396f0e6
--- /dev/null
+++ b/mozilla/build/mozconfig.win-common
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+ MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+ MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+MOZ_AUTOMATION_INSTALLER=1
diff --git a/mozilla/build/unix/mozconfig.asan b/mozilla/build/unix/mozconfig.asan
index 8bd9e2d..7abc4f6 100644
--- a/mozilla/build/unix/mozconfig.asan
+++ b/mozilla/build/unix/mozconfig.asan
@@ -1,3 +1,5 @@
+MOZ_AUTOMATION_L10N_CHECK=0
+
. "$topsrcdir/build/mozconfig.common"
# Use Clang as specified in manifest
diff --git a/mozilla/build/unix/mozconfig.linux b/mozilla/build/unix/mozconfig.linux
index dd6883d..dc9259f 100644
--- a/mozilla/build/unix/mozconfig.linux
+++ b/mozilla/build/unix/mozconfig.linux
@@ -1,3 +1,8 @@
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+ MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+ MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
. "$topsrcdir/build/mozconfig.common"
# some b2g desktop builds still happen on i686 machines, and the tooltool
diff --git a/mozilla/client.mk b/mozilla/client.mk
index d546d0f..5cbaf6ba 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -50,7 +50,6 @@ endif
ifndef TOPSRCDIR
ifeq (,$(wildcard client.mk))
TOPSRCDIR := $(patsubst %/,%,$(dir $(MAKEFILE_LIST)))
-MOZ_OBJDIR = .
else
TOPSRCDIR := $(CWD)
endif
@@ -99,8 +98,6 @@ endif
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
-MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
-
define CR
@@ -111,7 +108,9 @@ endef
# before evaluation. $(shell) replacing newlines with spaces, || is always
# followed by a space (since sed doesn't remove newlines), except on the
# last line, so replace both '|| ' and '||'.
-MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
+# Also, make MOZ_PGO available to mozconfig when passed on make command line.
+# Likewise for MOZ_CURRENT_PROJECT.
+MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell $(addprefix MOZ_CURRENT_PROJECT=,$(MOZ_CURRENT_PROJECT)) MOZ_PGO=$(MOZ_PGO) $(TOPSRCDIR)/mach environment --format=client.mk | sed 's/$$/||/')))
$(eval $(MOZCONFIG_CONTENT))
export FOUND_MOZCONFIG
@@ -142,41 +141,24 @@ ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS)))
endif
-ifndef MOZ_OBJDIR
- MOZ_OBJDIR = obj-$(CONFIG_GUESS)
-else
-# On Windows Pymake builds check MOZ_OBJDIR doesn't start with "/"
- ifneq (,$(findstring mingw,$(CONFIG_GUESS)))
- ifeq (1_a,$(.PYMAKE)_$(firstword a$(subst /, ,$(MOZ_OBJDIR))))
- $(error For Windows Pymake builds, MOZ_OBJDIR must be a Windows [and not MSYS] style path.)
- endif
- endif
-endif
-
ifdef MOZ_BUILD_PROJECTS
ifdef MOZ_CURRENT_PROJECT
- OBJDIR = $(MOZ_OBJDIR)/$(MOZ_CURRENT_PROJECT)
- MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
BUILD_PROJECT_ARG = MOZ_BUILD_APP=$(MOZ_CURRENT_PROJECT)
+ export MOZ_CURRENT_PROJECT
else
- OBJDIR = $(error Cannot find the OBJDIR when MOZ_CURRENT_PROJECT is not set.)
MOZ_MAKE = $(error Cannot build in the OBJDIR when MOZ_CURRENT_PROJECT is not set.)
endif
+endif # MOZ_BUILD_PROJECTS
-else # MOZ_BUILD_PROJECTS
-
-OBJDIR = $(MOZ_OBJDIR)
MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
-endif # MOZ_BUILD_PROJECTS
-
# 'configure' scripts generated by autoconf.
CONFIGURES := $(TOPSRCDIR)/configure
CONFIGURES += $(TOPSRCDIR)/js/src/configure
# Make targets that are going to be passed to the real build system
-OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check
+OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check automation/build
#######################################################################
# Rules
@@ -202,7 +184,7 @@ WANT_MOZCONFIG_MK = 1
endif
ifdef WANT_MOZCONFIG_MK
-# For now, only output "export" lines from mozconfig2client-mk output.
+# For now, only output "export" lines from mach environment --format=client.mk output.
MOZCONFIG_MK_LINES := $(filter export||%,$(MOZCONFIG_OUT_LINES))
$(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) $(OBJDIR)/CLOBBER
$(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo '$(subst ||, ,$(line))';) )) > $@
@@ -235,17 +217,11 @@ everything: clean build
# This is up here, outside of the MOZ_CURRENT_PROJECT logic so that this
# is usable in multi-pass builds, where you might not have a runnable
# application until all the build passes and postflight scripts have run.
-ifdef MOZ_OBJDIR
- PGO_OBJDIR = $(MOZ_OBJDIR)
-else
- PGO_OBJDIR := $(TOPSRCDIR)
-endif
-
profiledbuild::
$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
- $(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
- rm -f ${PGO_OBJDIR}/jarlog/en-US.log
- MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run
+ $(MAKE) -C $(OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
+ rm -f $(OBJDIR)/jarlog/en-US.log
+ MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(OBJDIR) pgo-profile-run
$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1
@@ -326,6 +302,7 @@ CONFIG_STATUS_DEPS := \
$(TOPSRCDIR)/build/virtualenv_packages.txt \
$(TOPSRCDIR)/python/mozbuild/mozbuild/virtualenv.py \
$(TOPSRCDIR)/testing/mozbase/packages.txt \
+ $(OBJDIR)/.mozconfig.json \
$(NULL)
CONFIGURE_ENV_ARGS += \
@@ -353,8 +330,13 @@ configure-preqs = \
$(call mkdir_deps,$(OBJDIR)) \
$(if $(MOZ_BUILD_PROJECTS),$(call mkdir_deps,$(MOZ_OBJDIR))) \
save-mozconfig \
+ $(OBJDIR)/.mozconfig.json \
$(NULL)
+CREATE_MOZCONFIG_JSON := $(shell $(TOPSRCDIR)/mach environment --format=json -o $(OBJDIR)/.mozconfig.json)
+$(OBJDIR)/.mozconfig.json: $(call mkdir_deps,$(OBJDIR))
+ @$(TOPSRCDIR)/mach environment --format=json -o $@
+
save-mozconfig: $(FOUND_MOZCONFIG)
-cp $(FOUND_MOZCONFIG) $(OBJDIR)/.mozconfig
@@ -373,7 +355,7 @@ $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
else
$(OBJDIR)/Makefile: $(CONFIG_STATUS_DEPS)
endif
- @$(MAKE) -f $(TOPSRCDIR)/client.mk configure
+ @$(MAKE) -f $(TOPSRCDIR)/client.mk configure CREATE_MOZCONFIG_JSON=
ifneq (,$(CONFIG_STATUS))
$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
diff --git a/mozilla/config/milestone.txt b/mozilla/config/milestone.txt
index e9f2234..983d565 100644
--- a/mozilla/config/milestone.txt
+++ b/mozilla/config/milestone.txt
@@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-31.2.0
+31.3.0
diff --git a/mozilla/configure b/mozilla/configure
index 5420c91..96ea77c 100755
--- a/mozilla/configure
+++ b/mozilla/configure
@@ -141,10 +141,25 @@ fi
# configure.in: autoconf puts the argument parsing code above anything
# expanded from configure.in, and we need to get the configure options
# from .mozconfig in place before that argument parsing code.
-# Read in '.mozconfig' script to set the initial options.
-# See the mozconfig2configure script for more details.
-_AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf
-. $_AUTOCONF_TOOLS_DIR/mozconfig2configure
+inserted=
+failed_eval() {
+ echo "Failed eval'ing the following:"
+ $(dirname $0)/./mach environment --format=configure
+ exit 1
+}
+
+set -- dummy "$@"
+for ac_option
+do
+ if test -z "$inserted"; then
+ set --
+ eval "$($(dirname $0)/./mach environment --format=configure)" || failed_eval
+ inserted=1
+ else
+ set -- "$@" "$ac_option"
+ fi
+done
+
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -543,16 +558,6 @@ ac_help="$ac_help
--enable-js-diagnostics
Enable JS diagnostic assertions and breakpad data"
ac_help="$ac_help
- --disable-gcincremental Disable incremental GC"
-ac_help="$ac_help
- --disable-exact-rooting Enable use of conservative stack scanning for GC"
-ac_help="$ac_help
- --enable-gcgenerational Enable generational GC"
-ac_help="$ac_help
- --enable-gczeal Enable zealous JavaScript GCing"
-ac_help="$ac_help
- --enable-root-analysis Enable moving GC stack root analysis"
-ac_help="$ac_help
--with-ccache[=path/to/ccache]
Enable compiling with ccache"
ac_help="$ac_help
@@ -1203,7 +1208,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; echo "configure
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1207: checking host system type" >&5
+echo "configure:1212: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1224,7 +1229,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1228: checking target system type" >&5
+echo "configure:1233: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -1242,7 +1247,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1246: checking build system type" >&5
+echo "configure:1251: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1317,7 +1322,7 @@ 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:1321: checking for $ac_word" >&5
+echo "configure:1326: 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
@@ -1402,7 +1407,7 @@ 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:1406: checking for $ac_word" >&5
+echo "configure:1411: 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
@@ -1512,7 +1517,7 @@ fi
echo $ac_n "checking Python environment is Mozilla virtualenv""... $ac_c" 1>&6
-echo "configure:1516: checking Python environment is Mozilla virtualenv" >&5
+echo "configure:1521: checking Python environment is Mozilla virtualenv" >&5
$PYTHON -c "import mozbuild.base"
if test "$?" != 0; then
{ echo "configure: error: Python environment does not appear to be sane." 1>&2; echo "configure: error: Python environment does not appear to be sane." 1>&5; exit 1; }
@@ -1579,7 +1584,7 @@ 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:1583: checking for $ac_word" >&5
+echo "configure:1588: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1634,7 +1639,7 @@ 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:1638: checking for $ac_word" >&5
+echo "configure:1643: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1733,7 +1738,7 @@ 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:1737: checking for $ac_word" >&5
+echo "configure:1742: 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
@@ -2058,7 +2063,7 @@ case "$target" in
if test -z "$android_toolchain" ; then
echo $ac_n "checking for android toolchain directory""... $ac_c" 1>&6
-echo "configure:2062: checking for android toolchain directory" >&5
+echo "configure:2067: checking for android toolchain directory" >&5
kernel_name=`uname -s | tr "[:upper:]" "[:lower:]"`
@@ -2110,7 +2115,7 @@ echo "configure:2062: checking for android toolchain directory" >&5
NSPR_CONFIGURE_ARGS="$NSPR_CONFIGURE_ARGS --with-android-version=$android_version"
echo $ac_n "checking for android platform directory""... $ac_c" 1>&6
-echo "configure:2114: checking for android platform directory" >&5
+echo "configure:2119: checking for android platform directory" >&5
case "$target_cpu" in
arm)
@@ -2208,7 +2213,7 @@ esac
# Extract the first word of "objcopy", so it can be a program name with args.
set dummy objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2212: checking for $ac_word" >&5
+echo "configure:2217: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2262,13 +2267,13 @@ _SAVE_CFLAGS="$CFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
-echo "configure:2266: checking for host c compiler" >&5
+echo "configure:2271: checking for host c compiler" >&5
for ac_prog in cc gcc clang cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2272: checking for $ac_word" >&5
+echo "configure:2277: 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
@@ -2303,13 +2308,13 @@ if test -z "$HOST_CC"; then
fi
echo "$ac_t""$HOST_CC" 1>&6
echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
-echo "configure:2307: checking for host c++ compiler" >&5
+echo "configure:2312: checking for host c++ compiler" >&5
for ac_prog in c++ g++ clang++ cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2313: checking for $ac_word" >&5
+echo "configure:2318: 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
@@ -2361,7 +2366,7 @@ 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:2365: checking for $ac_word" >&5
+echo "configure:2370: 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
@@ -2396,7 +2401,7 @@ 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:2400: checking for $ac_word" >&5
+echo "configure:2405: 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
@@ -2431,16 +2436,16 @@ CFLAGS="$HOST_CFLAGS"
LDFLAGS="$HOST_LDFLAGS"
echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2435: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:2440: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2442 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:2444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2449: \"$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
@@ -2454,16 +2459,16 @@ rm -f conftest*
CC="$HOST_CXX"
CFLAGS="$HOST_CXXFLAGS"
echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2458: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:2463: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
cat > conftest.$ac_ext <<EOF
-#line 2460 "configure"
+#line 2465 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:2467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2472: \"$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
@@ -2483,7 +2488,7 @@ 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:2487: checking for $ac_word" >&5
+echo "configure:2492: 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
@@ -2517,7 +2522,7 @@ unset ac_cv_prog_CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2521: checking for $ac_word" >&5
+echo "configure:2526: 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
@@ -2547,7 +2552,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2551: checking for $ac_word" >&5
+echo "configure:2556: 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
@@ -2598,7 +2603,7 @@ fi
# 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:2602: checking for $ac_word" >&5
+echo "configure:2607: 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
@@ -2630,7 +2635,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2634: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2639: 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.
@@ -2641,12 +2646,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 2645 "configure"
+#line 2650 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2655: \"$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
@@ -2672,12 +2677,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2681: 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:2681: checking whether we are using GNU C" >&5
+echo "configure:2686: 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
@@ -2686,7 +2691,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2690: \"$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:2695: \"$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
@@ -2705,7 +2710,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2709: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2714: 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
@@ -2741,7 +2746,7 @@ 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:2745: checking for $ac_word" >&5
+echo "configure:2750: 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
@@ -2777,7 +2782,7 @@ 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:2781: checking for $ac_word" >&5
+echo "configure:2786: 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
@@ -2809,7 +2814,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2813: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2818: 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.
@@ -2820,12 +2825,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 2824 "configure"
+#line 2829 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:2829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2834: \"$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
@@ -2851,12 +2856,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2860: 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:2860: checking whether we are using GNU C++" >&5
+echo "configure:2865: 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
@@ -2865,7 +2870,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2869: \"$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:2874: \"$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
@@ -2884,7 +2889,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2888: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2893: 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
@@ -2925,7 +2930,7 @@ for ac_declaration in \
'void exit (int);'
do
cat > conftest.$ac_ext <<EOF
-#line 2929 "configure"
+#line 2934 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -2933,7 +2938,7 @@ int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -2943,14 +2948,14 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 2947 "configure"
+#line 2952 "configure"
#include "confdefs.h"
$ac_declaration
int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:2954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
break
else
@@ -2972,7 +2977,7 @@ 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:2976: checking for $ac_word" >&5
+echo "configure:2981: 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
@@ -3007,7 +3012,7 @@ 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:3011: checking for $ac_word" >&5
+echo "configure:3016: 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
@@ -3042,7 +3047,7 @@ 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:3046: checking for $ac_word" >&5
+echo "configure:3051: 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
@@ -3096,7 +3101,7 @@ 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:3100: checking for $ac_word" >&5
+echo "configure:3105: 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
@@ -3131,7 +3136,7 @@ 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:3135: checking for $ac_word" >&5
+echo "configure:3140: 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
@@ -3166,7 +3171,7 @@ 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:3170: checking for $ac_word" >&5
+echo "configure:3175: 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
@@ -3211,7 +3216,7 @@ else
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3215: checking for $ac_word" >&5
+echo "configure:3220: 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
@@ -3241,7 +3246,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3245: checking for $ac_word" >&5
+echo "configure:3250: 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
@@ -3292,7 +3297,7 @@ fi
# 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:3296: checking for $ac_word" >&5
+echo "configure:3301: 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
@@ -3324,7 +3329,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3328: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:3333: 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.
@@ -3335,12 +3340,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 3339 "configure"
+#line 3344 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:3344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3349: \"$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
@@ -3366,12 +3371,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:3370: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3375: 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:3375: checking whether we are using GNU C" >&5
+echo "configure:3380: 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
@@ -3380,7 +3385,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3384: \"$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:3389: \"$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
@@ -3399,7 +3404,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:3403: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:3408: 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
@@ -3440,7 +3445,7 @@ 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:3444: checking for $ac_word" >&5
+echo "configure:3449: 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
@@ -3472,7 +3477,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3476: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:3481: 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.
@@ -3483,12 +3488,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 3487 "configure"
+#line 3492 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3497: \"$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
@@ -3514,12 +3519,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:3518: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3523: 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:3523: checking whether we are using GNU C++" >&5
+echo "configure:3528: 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
@@ -3528,7 +3533,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3532: \"$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:3537: \"$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
@@ -3547,7 +3552,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:3551: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:3556: 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
@@ -3588,7 +3593,7 @@ for ac_declaration in \
'void exit (int);'
do
cat > conftest.$ac_ext <<EOF
-#line 3592 "configure"
+#line 3597 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -3596,7 +3601,7 @@ int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -3606,14 +3611,14 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 3610 "configure"
+#line 3615 "configure"
#include "confdefs.h"
$ac_declaration
int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:3617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
break
else
@@ -3632,7 +3637,7 @@ 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:3636: checking for $ac_word" >&5
+echo "configure:3641: 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
@@ -3664,7 +3669,7 @@ 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:3668: checking for $ac_word" >&5
+echo "configure:3673: 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
@@ -3718,7 +3723,7 @@ 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:3722: checking for $ac_word" >&5
+echo "configure:3727: 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
@@ -3753,7 +3758,7 @@ 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:3757: checking for $ac_word" >&5
+echo "configure:3762: 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
@@ -3788,7 +3793,7 @@ 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:3792: checking for $ac_word" >&5
+echo "configure:3797: 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
@@ -3823,7 +3828,7 @@ 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:3827: checking for $ac_word" >&5
+echo "configure:3832: 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
@@ -4052,7 +4057,7 @@ 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:4056: checking for $ac_word" >&5
+echo "configure:4061: 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
@@ -4094,14 +4099,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 4098 "configure"
+#line 4103 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:4105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -4119,14 +4124,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 4123 "configure"
+#line 4128 "configure"
#include "confdefs.h"
#include <new.h>
int main() {
unsigned *test = new unsigned(42);
; return 0; }
EOF
-if { (eval echo configure:4130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -4208,13 +4213,13 @@ EOF
if test -n "$MOZ_METRO"; then
echo $ac_n "checking for makepri""... $ac_c" 1>&6
-echo "configure:4212: checking for makepri" >&5
+echo "configure:4217: checking for makepri" >&5
for ac_prog in makepri
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:4218: checking for $ac_word" >&5
+echo "configure:4223: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MAKEPRI'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4288,7 +4293,7 @@ test -n "$MAKEPRI" || MAKEPRI=""""
unset _MSVC_VER_FILTER
echo $ac_n "checking for std::_Throw""... $ac_c" 1>&6
-echo "configure:4292: checking for std::_Throw" >&5
+echo "configure:4297: checking for std::_Throw" >&5
if eval "test \"`echo '$''{'ac_cv_have_std__Throw'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4304,14 +4309,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0"
cat > conftest.$ac_ext <<EOF
-#line 4308 "configure"
+#line 4313 "configure"
#include "confdefs.h"
#include <exception>
int main() {
std::_Throw(std::exception()); return 0;
; return 0; }
EOF
-if { (eval echo configure:4315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_std__Throw="yes"
else
@@ -4336,7 +4341,7 @@ echo "$ac_t""$ac_cv_have_std__Throw" 1>&6
if test "$ac_cv_have_std__Throw" = "yes"; then
echo $ac_n "checking for |class __declspec(dllimport) exception| bug""... $ac_c" 1>&6
-echo "configure:4340: checking for |class __declspec(dllimport) exception| bug" >&5
+echo "configure:4345: checking for |class __declspec(dllimport) exception| bug" >&5
if eval "test \"`echo '$''{'ac_cv_have_dllimport_exception_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4352,14 +4357,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0"
cat > conftest.$ac_ext <<EOF
-#line 4356 "configure"
+#line 4361 "configure"
#include "confdefs.h"
#include <vector>
int main() {
std::vector<int> v; return v.at(1);
; return 0; }
EOF
-if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_dllimport_exception_bug="no"
else
@@ -4394,7 +4399,7 @@ EOF
fi
else
echo $ac_n "checking for overridable _RAISE""... $ac_c" 1>&6
-echo "configure:4398: checking for overridable _RAISE" >&5
+echo "configure:4403: checking for overridable _RAISE" >&5
if eval "test \"`echo '$''{'ac_cv_have__RAISE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4410,7 +4415,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0"
cat > conftest.$ac_ext <<EOF
-#line 4414 "configure"
+#line 4419 "configure"
#include "confdefs.h"
#include <xstddef>
#undef _RAISE
@@ -4421,7 +4426,7 @@ int main() {
std::vector<int> v; return v.at(1);
; return 0; }
EOF
-if { (eval echo configure:4425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have__RAISE="no"
else
@@ -4466,9 +4471,9 @@ EOF
_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:4470: checking for w32api version >= $W32API_VERSION" >&5
+echo "configure:4475: checking for w32api version >= $W32API_VERSION" >&5
cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4477 "configure"
#include "confdefs.h"
#include <w32api.h>
int main() {
@@ -4480,7 +4485,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
res=yes
else
@@ -4496,7 +4501,7 @@ rm -f conftest*
fi
# Check windres version
echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
-echo "configure:4500: checking for windres version >= $WINDRES_VERSION" >&5
+echo "configure:4505: 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 }'`
@@ -4520,7 +4525,7 @@ 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:4524: checking for $ac_word" >&5
+echo "configure:4529: 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
@@ -4580,12 +4585,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4584: checking for $ac_hdr" >&5
+echo "configure:4589: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4589 "configure"
+#line 4594 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -4593,7 +4598,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -4624,7 +4629,7 @@ EOF
if test "$ac_cv_header_winsdkver_h" = "yes"; then
echo $ac_n "checking for highest Windows version supported by this SDK""... $ac_c" 1>&6
-echo "configure:4628: checking for highest Windows version supported by this SDK" >&5
+echo "configure:4633: checking for highest Windows version supported by this SDK" >&5
if eval "test \"`echo '$''{'ac_cv_winsdk_maxver'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4679,7 +4684,7 @@ EOF
# If the maximum version supported by this SDK is lower than the target
# version, error out
echo $ac_n "checking for Windows SDK being recent enough""... $ac_c" 1>&6
-echo "configure:4683: checking for Windows SDK being recent enough" >&5
+echo "configure:4688: checking for Windows SDK being recent enough" >&5
if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then
echo "$ac_t"""yes"" 1>&6
else
@@ -4714,7 +4719,7 @@ EOF
esac
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:4718: checking how to run the C preprocessor" >&5
+echo "configure:4723: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -4729,13 +4734,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 4733 "configure"
+#line 4738 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4744: \"$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
:
@@ -4746,13 +4751,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4755 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4761: \"$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
:
@@ -4763,13 +4768,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 4767 "configure"
+#line 4772 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4778: \"$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
:
@@ -4794,7 +4799,7 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:4798: checking how to run the C++ preprocessor" >&5
+echo "configure:4803: 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
@@ -4807,12 +4812,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 4811 "configure"
+#line 4816 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4821: \"$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
:
@@ -4896,7 +4901,7 @@ fi # COMPILE_ENVIRONMENT
# 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:4900: checking for a BSD compatible install" >&5
+echo "configure:4905: 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
@@ -4949,7 +4954,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:4953: checking whether ln -s works" >&5
+echo "configure:4958: 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
@@ -4972,7 +4977,7 @@ fi
if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then
echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
-echo "configure:4976: checking for minimum required perl version >= $PERL_VERSION" >&5
+echo "configure:4981: 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
@@ -4983,7 +4988,7 @@ fi
fi
echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
-echo "configure:4987: checking for full perl installation" >&5
+echo "configure:4992: 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
@@ -5001,7 +5006,7 @@ fi
# Extract the first word of "doxygen", so it can be a program name with args.
set dummy doxygen; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5005: checking for $ac_word" >&5
+echo "configure:5010: 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
@@ -5050,7 +5055,7 @@ fi
# Extract the first word of "autoconf", so it can be a program name with args.
set dummy autoconf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5054: checking for $ac_word" >&5
+echo "configure:5059: 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
@@ -5101,7 +5106,7 @@ 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:5105: checking for $ac_word" >&5
+echo "configure:5110: 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
@@ -5157,7 +5162,7 @@ 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:5161: checking for $ac_word" >&5
+echo "configure:5166: 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
@@ -5211,7 +5216,7 @@ fi
# Extract the first word of "xargs", so it can be a program name with args.
set dummy xargs; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5215: checking for $ac_word" >&5
+echo "configure:5220: 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
@@ -5263,7 +5268,7 @@ fi
# Extract the first word of "rpmbuild", so it can be a program name with args.
set dummy rpmbuild; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5267: checking for $ac_word" >&5
+echo "configure:5272: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RPMBUILD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5406,7 +5411,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&5; exit 1;
echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
-echo "configure:5410: checking for valid compiler/Mac OS X SDK combination" >&5
+echo "configure:5415: 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'
@@ -5415,14 +5420,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 5419 "configure"
+#line 5424 "configure"
#include "confdefs.h"
#include <new>
int main() {
; return 0; }
EOF
-if { (eval echo configure:5426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result=yes
else
@@ -5449,7 +5454,7 @@ fi
fi # COMPILE_ENVIRONMENT
echo $ac_n "checking compiler version""... $ac_c" 1>&6
-echo "configure:5453: checking compiler version" >&5
+echo "configure:5458: checking compiler version" >&5
# Just print it so it shows up in the logs.
cc_version=$($CC --version)
echo "$ac_t""$cc_version" 1>&6
@@ -5467,7 +5472,7 @@ 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:5471: checking for $ac_word" >&5
+echo "configure:5476: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5523,7 +5528,7 @@ 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:5527: checking for $ac_word" >&5
+echo "configure:5532: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5590,7 +5595,7 @@ if test "$COMPILE_ENVIRONMENT"; then
# 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:5594: checking for X" >&5
+echo "configure:5599: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -5652,12 +5657,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5656 "configure"
+#line 5661 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5666: \"$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*
@@ -5726,14 +5731,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5730 "configure"
+#line 5735 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:5737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5742: \"$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.
@@ -5842,17 +5847,17 @@ else
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:5846: checking whether -R must be followed by a space" >&5
+echo "configure:5851: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5849 "configure"
+#line 5854 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -5868,14 +5873,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5872 "configure"
+#line 5877 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -5907,7 +5912,7 @@ rm -f conftest*
# 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:5911: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5916: 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
@@ -5915,7 +5920,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5919 "configure"
+#line 5924 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5926,7 +5931,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5935: \"$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
@@ -5948,7 +5953,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5952: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5957: 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
@@ -5956,7 +5961,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5960 "configure"
+#line 5965 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5967,7 +5972,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5976: \"$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
@@ -5996,12 +6001,12 @@ fi
# 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:6000: checking for gethostbyname" >&5
+echo "configure:6005: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6005 "configure"
+#line 6010 "configure"
#define gethostbyname innocuous_gethostbyname
#include "confdefs.h"
#undef gethostbyname
@@ -6028,7 +6033,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6037: \"$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
@@ -6049,7 +6054,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6053: checking for gethostbyname in -lnsl" >&5
+echo "configure:6058: 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
@@ -6057,7 +6062,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6066 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6068,7 +6073,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6077: \"$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
@@ -6098,12 +6103,12 @@ fi
# -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:6102: checking for connect" >&5
+echo "configure:6107: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6107 "configure"
+#line 6112 "configure"
#define connect innocuous_connect
#include "confdefs.h"
#undef connect
@@ -6130,7 +6135,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:6134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6139: \"$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
@@ -6151,7 +6156,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:6155: checking for connect in -lsocket" >&5
+echo "configure:6160: 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
@@ -6159,7 +6164,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6163 "configure"
+#line 6168 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6170,7 +6175,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:6174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6179: \"$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
@@ -6194,12 +6199,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6198: checking for remove" >&5
+echo "configure:6203: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6203 "configure"
+#line 6208 "configure"
#define remove innocuous_remove
#include "confdefs.h"
#undef remove
@@ -6226,7 +6231,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6235: \"$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
@@ -6247,7 +6252,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6251: checking for remove in -lposix" >&5
+echo "configure:6256: 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
@@ -6255,7 +6260,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6259 "configure"
+#line 6264 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6266,7 +6271,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:6270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6275: \"$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
@@ -6290,12 +6295,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6294: checking for shmat" >&5
+echo "configure:6299: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6299 "configure"
+#line 6304 "configure"
#define shmat innocuous_shmat
#include "confdefs.h"
#undef shmat
@@ -6322,7 +6327,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:6326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6331: \"$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
@@ -6343,7 +6348,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6347: checking for shmat in -lipc" >&5
+echo "configure:6352: 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
@@ -6351,7 +6356,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6355 "configure"
+#line 6360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6362,7 +6367,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:6366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6371: \"$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
@@ -6395,7 +6400,7 @@ fi
# 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:6399: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:6404: 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
@@ -6403,7 +6408,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6407 "configure"
+#line 6412 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6414,7 +6419,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:6418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6423: \"$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
@@ -6824,14 +6829,14 @@ no)
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$arch_flag"
cat > conftest.$ac_ext <<EOF
-#line 6828 "configure"
+#line 6833 "configure"
#include "confdefs.h"
int main() {
return sizeof(__thumb2__);
; return 0; }
EOF
-if { (eval echo configure:6835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_THUMB2=1
else
@@ -6914,16 +6919,16 @@ if test -n "$align_flag"; then
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $align_flag"
echo $ac_n "checking whether alignment flag ($align_flag) is supported""... $ac_c" 1>&6
-echo "configure:6918: checking whether alignment flag ($align_flag) is supported" >&5
+echo "configure:6923: checking whether alignment flag ($align_flag) is supported" >&5
cat > conftest.$ac_ext <<EOF
-#line 6920 "configure"
+#line 6925 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -6940,16 +6945,16 @@ if test -n "$all_flags"; then
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$all_flags"
echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6
-echo "configure:6944: checking whether the chosen combination of compiler flags ($all_flags) works" >&5
+echo "configure:6949: checking whether the chosen combination of compiler flags ($all_flags) works" >&5
cat > conftest.$ac_ext <<EOF
-#line 6946 "configure"
+#line 6951 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:6953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -6972,18 +6977,18 @@ fi
if test "$CPU_ARCH" = "arm"; then
echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6
-echo "configure:6976: checking for ARM SIMD support in compiler" >&5
+echo "configure:6981: checking for ARM SIMD support in compiler" >&5
# We try to link so that this also fails when
# building with LTO.
cat > conftest.$ac_ext <<EOF
-#line 6980 "configure"
+#line 6985 "configure"
#include "confdefs.h"
int main() {
asm("uqadd8 r1, r1, r2");
; return 0; }
EOF
-if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
result="yes"
else
@@ -7006,23 +7011,23 @@ EOF
fi
echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-echo "configure:7010: checking ARM version support in compiler" >&5
+echo "configure:7015: checking ARM version support in compiler" >&5
ARM_ARCH=`${CC-cc} ${CFLAGS} -dM -E - < /dev/null | sed -n 's/.*__ARM_ARCH_\([0-9][0-9]*\).*/\1/p'`
echo "$ac_t"""$ARM_ARCH"" 1>&6
echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6
-echo "configure:7015: checking for ARM NEON support in compiler" >&5
+echo "configure:7020: checking for ARM NEON support in compiler" >&5
# We try to link so that this also fails when
# building with LTO.
cat > conftest.$ac_ext <<EOF
-#line 7019 "configure"
+#line 7024 "configure"
#include "confdefs.h"
int main() {
asm(".fpu neon\n vadd.i8 d0, d0, d0");
; return 0; }
EOF
-if { (eval echo configure:7026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
result="yes"
else
@@ -7085,7 +7090,7 @@ configure_static_assert_macros='
'
echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
-echo "configure:7089: checking that static assertion macros used in autoconf tests work" >&5
+echo "configure:7094: 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
@@ -7099,14 +7104,14 @@ cross_compiling=$ac_cv_prog_cc_cross
ac_cv_static_assertion_macros_work="yes"
cat > conftest.$ac_ext <<EOF
-#line 7103 "configure"
+#line 7108 "configure"
#include "confdefs.h"
$configure_static_assert_macros
int main() {
CONFIGURE_STATIC_ASSERT(1)
; return 0; }
EOF
-if { (eval echo configure:7110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -7116,14 +7121,14 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 7120 "configure"
+#line 7125 "configure"
#include "confdefs.h"
$configure_static_assert_macros
int main() {
CONFIGURE_STATIC_ASSERT(0)
; return 0; }
EOF
-if { (eval echo configure:7127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_static_assertion_macros_work="no"
else
@@ -7139,14 +7144,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 7143 "configure"
+#line 7148 "configure"
#include "confdefs.h"
$configure_static_assert_macros
int main() {
CONFIGURE_STATIC_ASSERT(1)
; return 0; }
EOF
-if { (eval echo configure:7150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -7156,14 +7161,14 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 7160 "configure"
+#line 7165 "configure"
#include "confdefs.h"
$configure_static_assert_macros
int main() {
CONFIGURE_STATIC_ASSERT(0)
; return 0; }
EOF
-if { (eval echo configure:7167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_static_assertion_macros_work="no"
else
@@ -7269,7 +7274,7 @@ EOF
# Extract the first word of "llvm-symbolizer", so it can be a program name with args.
set dummy llvm-symbolizer; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7273: checking for $ac_word" >&5
+echo "configure:7278: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7358,18 +7363,18 @@ if test "$GNU_CC"; then
DSO_PIC_CFLAGS='-fPIC'
ASFLAGS="$ASFLAGS -fPIC"
echo $ac_n "checking for --noexecstack option to as""... $ac_c" 1>&6
-echo "configure:7362: checking for --noexecstack option to as" >&5
+echo "configure:7367: checking for --noexecstack option to as" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Wa,--noexecstack"
cat > conftest.$ac_ext <<EOF
-#line 7366 "configure"
+#line 7371 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
ASFLAGS="$ASFLAGS -Wa,--noexecstack"
@@ -7382,18 +7387,18 @@ fi
rm -f conftest*
CFLAGS=$_SAVE_CFLAGS
echo $ac_n "checking for -z noexecstack option to ld""... $ac_c" 1>&6
-echo "configure:7386: checking for -z noexecstack option to ld" >&5
+echo "configure:7391: checking for -z noexecstack option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
cat > conftest.$ac_ext <<EOF
-#line 7390 "configure"
+#line 7395 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -7406,18 +7411,18 @@ fi
rm -f conftest*
echo $ac_n "checking for -z text option to ld""... $ac_c" 1>&6
-echo "configure:7410: checking for -z text option to ld" >&5
+echo "configure:7415: checking for -z text option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-z,text"
cat > conftest.$ac_ext <<EOF
-#line 7414 "configure"
+#line 7419 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,-z,text"
@@ -7431,18 +7436,18 @@ fi
rm -f conftest*
echo $ac_n "checking for --build-id option to ld""... $ac_c" 1>&6
-echo "configure:7435: checking for --build-id option to ld" >&5
+echo "configure:7440: checking for --build-id option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--build-id"
cat > conftest.$ac_ext <<EOF
-#line 7439 "configure"
+#line 7444 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"
@@ -7456,19 +7461,19 @@ fi
rm -f conftest*
echo $ac_n "checking for --ignore-unresolved-symbol option to ld""... $ac_c" 1>&6
-echo "configure:7460: checking for --ignore-unresolved-symbol option to ld" >&5
+echo "configure:7465: checking for --ignore-unresolved-symbol option to ld" >&5
HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--ignore-unresolved-symbol,environ"
cat > conftest.$ac_ext <<EOF
-#line 7465 "configure"
+#line 7470 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=1
@@ -7483,19 +7488,19 @@ rm -f conftest*
# Check for -mssse3 on $CC
echo $ac_n "checking if toolchain supports -mssse3 option""... $ac_c" 1>&6
-echo "configure:7487: checking if toolchain supports -mssse3 option" >&5
+echo "configure:7492: checking if toolchain supports -mssse3 option" >&5
HAVE_TOOLCHAIN_SUPPORT_MSSSE3=
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -mssse3"
cat > conftest.$ac_ext <<EOF
-#line 7492 "configure"
+#line 7497 "configure"
#include "confdefs.h"
asm ("pmaddubsw %xmm2,%xmm3");
int main() {
; return 0; }
EOF
-if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1
@@ -7510,19 +7515,19 @@ rm -f conftest*
# Check for -msse4.1 on $CC
echo $ac_n "checking if toolchain supports -msse4.1 option""... $ac_c" 1>&6
-echo "configure:7514: checking if toolchain supports -msse4.1 option" >&5
+echo "configure:7519: checking if toolchain supports -msse4.1 option" >&5
HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -msse4.1"
cat > conftest.$ac_ext <<EOF
-#line 7519 "configure"
+#line 7524 "configure"
#include "confdefs.h"
asm ("pmulld %xmm6,%xmm0");
int main() {
; return 0; }
EOF
-if { (eval echo configure:7526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1
@@ -7538,16 +7543,16 @@ rm -f conftest*
case "${CPU_ARCH}" in
x86 | x86_64)
echo $ac_n "checking for x86 AVX2 asm support in compiler""... $ac_c" 1>&6
-echo "configure:7542: checking for x86 AVX2 asm support in compiler" >&5
+echo "configure:7547: checking for x86 AVX2 asm support in compiler" >&5
cat > conftest.$ac_ext <<EOF
-#line 7544 "configure"
+#line 7549 "configure"
#include "confdefs.h"
int main() {
asm volatile ("vpermq \$0xd8,%ymm0,%ymm0 \n");
; return 0; }
EOF
-if { (eval echo configure:7551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes"
else
@@ -7606,7 +7611,7 @@ EOF
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -Wpointer-arith -Wdeclaration-after-statement"
echo $ac_n "checking whether the C compiler supports -Werror=return-type""... $ac_c" 1>&6
-echo "configure:7610: checking whether the C compiler supports -Werror=return-type" >&5
+echo "configure:7615: checking whether the C compiler supports -Werror=return-type" >&5
if eval "test \"`echo '$''{'ac_c_has_werror_return_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7622,14 +7627,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Werror=return-type"
cat > conftest.$ac_ext <<EOF
-#line 7626 "configure"
+#line 7631 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_werror_return_type="yes"
else
@@ -7657,7 +7662,7 @@ echo "$ac_t""$ac_c_has_werror_return_type" 1>&6
echo $ac_n "checking whether the C compiler supports -Werror=int-to-pointer-cast""... $ac_c" 1>&6
-echo "configure:7661: checking whether the C compiler supports -Werror=int-to-pointer-cast" >&5
+echo "configure:7666: checking whether the C compiler supports -Werror=int-to-pointer-cast" >&5
if eval "test \"`echo '$''{'ac_c_has_werror_int_to_pointer_cast'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7673,14 +7678,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Werror=int-to-pointer-cast"
cat > conftest.$ac_ext <<EOF
-#line 7677 "configure"
+#line 7682 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_werror_int_to_pointer_cast="yes"
else
@@ -7708,7 +7713,7 @@ echo "$ac_t""$ac_c_has_werror_int_to_pointer_cast" 1>&6
echo $ac_n "checking whether the C compiler supports -Wtype-limits""... $ac_c" 1>&6
-echo "configure:7712: checking whether the C compiler supports -Wtype-limits" >&5
+echo "configure:7717: checking whether the C compiler supports -Wtype-limits" >&5
if eval "test \"`echo '$''{'ac_c_has_wtype_limits'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7724,14 +7729,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wtype-limits"
cat > conftest.$ac_ext <<EOF
-#line 7728 "configure"
+#line 7733 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_wtype_limits="yes"
else
@@ -7759,7 +7764,7 @@ echo "$ac_t""$ac_c_has_wtype_limits" 1>&6
echo $ac_n "checking whether the C compiler supports -Wempty-body""... $ac_c" 1>&6
-echo "configure:7763: checking whether the C compiler supports -Wempty-body" >&5
+echo "configure:7768: checking whether the C compiler supports -Wempty-body" >&5
if eval "test \"`echo '$''{'ac_c_has_wempty_body'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7775,14 +7780,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wempty-body"
cat > conftest.$ac_ext <<EOF
-#line 7779 "configure"
+#line 7784 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_wempty_body="yes"
else
@@ -7810,7 +7815,7 @@ echo "$ac_t""$ac_c_has_wempty_body" 1>&6
echo $ac_n "checking whether the C compiler supports -Wsign-compare""... $ac_c" 1>&6
-echo "configure:7814: checking whether the C compiler supports -Wsign-compare" >&5
+echo "configure:7819: checking whether the C compiler supports -Wsign-compare" >&5
if eval "test \"`echo '$''{'ac_c_has_sign_compare'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7826,14 +7831,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wsign-compare"
cat > conftest.$ac_ext <<EOF
-#line 7830 "configure"
+#line 7835 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_sign_compare="yes"
else
@@ -7922,7 +7927,7 @@ if test "$GNU_CXX"; then
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual"
echo $ac_n "checking whether the C++ compiler supports -Werror=return-type""... $ac_c" 1>&6
-echo "configure:7926: checking whether the C++ compiler supports -Werror=return-type" >&5
+echo "configure:7931: checking whether the C++ compiler supports -Werror=return-type" >&5
if eval "test \"`echo '$''{'ac_cxx_has_werror_return_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7938,14 +7943,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Werror=return-type"
cat > conftest.$ac_ext <<EOF
-#line 7942 "configure"
+#line 7947 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:7949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_werror_return_type="yes"
else
@@ -7973,7 +7978,7 @@ echo "$ac_t""$ac_cxx_has_werror_return_type" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Werror=int-to-pointer-cast""... $ac_c" 1>&6
-echo "configure:7977: checking whether the C++ compiler supports -Werror=int-to-pointer-cast" >&5
+echo "configure:7982: checking whether the C++ compiler supports -Werror=int-to-pointer-cast" >&5
if eval "test \"`echo '$''{'ac_cxx_has_werror_int_to_pointer_cast'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7989,14 +7994,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Werror=int-to-pointer-cast"
cat > conftest.$ac_ext <<EOF
-#line 7993 "configure"
+#line 7998 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_werror_int_to_pointer_cast="yes"
else
@@ -8024,7 +8029,7 @@ echo "$ac_t""$ac_cxx_has_werror_int_to_pointer_cast" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wtype-limits""... $ac_c" 1>&6
-echo "configure:8028: checking whether the C++ compiler supports -Wtype-limits" >&5
+echo "configure:8033: checking whether the C++ compiler supports -Wtype-limits" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wtype_limits'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8040,14 +8045,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wtype-limits"
cat > conftest.$ac_ext <<EOF
-#line 8044 "configure"
+#line 8049 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wtype_limits="yes"
else
@@ -8075,7 +8080,7 @@ echo "$ac_t""$ac_cxx_has_wtype_limits" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wempty-body""... $ac_c" 1>&6
-echo "configure:8079: checking whether the C++ compiler supports -Wempty-body" >&5
+echo "configure:8084: checking whether the C++ compiler supports -Wempty-body" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wempty_body'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8091,14 +8096,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wempty-body"
cat > conftest.$ac_ext <<EOF
-#line 8095 "configure"
+#line 8100 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wempty_body="yes"
else
@@ -8126,7 +8131,7 @@ echo "$ac_t""$ac_cxx_has_wempty_body" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wsign-compare""... $ac_c" 1>&6
-echo "configure:8130: checking whether the C++ compiler supports -Wsign-compare" >&5
+echo "configure:8135: checking whether the C++ compiler supports -Wsign-compare" >&5
if eval "test \"`echo '$''{'ac_cxx_has_sign_compare'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8142,14 +8147,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wsign-compare"
cat > conftest.$ac_ext <<EOF
-#line 8146 "configure"
+#line 8151 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_sign_compare="yes"
else
@@ -8184,7 +8189,7 @@ echo "$ac_t""$ac_cxx_has_sign_compare" 1>&6
#
echo $ac_n "checking whether the C++ compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6
-echo "configure:8188: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5
+echo "configure:8193: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wno_invalid_offsetof'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8200,14 +8205,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Winvalid-offsetof"
cat > conftest.$ac_ext <<EOF
-#line 8204 "configure"
+#line 8209 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wno_invalid_offsetof="yes"
else
@@ -8235,7 +8240,7 @@ echo "$ac_t""$ac_cxx_has_wno_invalid_offsetof" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wno-inline-new-delete""... $ac_c" 1>&6
-echo "configure:8239: checking whether the C++ compiler supports -Wno-inline-new-delete" >&5
+echo "configure:8244: checking whether the C++ compiler supports -Wno-inline-new-delete" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wno_inline_new_delete'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8251,14 +8256,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Winline-new-delete"
cat > conftest.$ac_ext <<EOF
-#line 8255 "configure"
+#line 8260 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wno_inline_new_delete="yes"
else
@@ -8310,7 +8315,7 @@ echo "$ac_t""$ac_cxx_has_wno_inline_new_delete" 1>&6
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-c++0x-extensions"
echo $ac_n "checking whether the C++ compiler supports -Wno-extended-offsetof""... $ac_c" 1>&6
-echo "configure:8314: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5
+echo "configure:8319: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wno_extended_offsetof'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8326,14 +8331,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wextended-offsetof"
cat > conftest.$ac_ext <<EOF
-#line 8330 "configure"
+#line 8335 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:8337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wno_extended_offsetof="yes"
else
@@ -8371,7 +8376,7 @@ MKSHLIB_UNFORCE_ALL=
if test "$COMPILE_ENVIRONMENT"; then
if test "$GNU_CC"; then
echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
-echo "configure:8375: checking whether ld has archive extraction flags" >&5
+echo "configure:8380: 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
@@ -8388,14 +8393,14 @@ LOOP_INPUT
LDFLAGS=$force
LIBS=$unforce
cat > conftest.$ac_ext <<EOF
-#line 8392 "configure"
+#line 8397 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8404: \"$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
@@ -8430,16 +8435,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
-echo "configure:8434: checking for 64-bit OS" >&5
+echo "configure:8439: checking for 64-bit OS" >&5
cat > conftest.$ac_ext <<EOF
-#line 8436 "configure"
+#line 8441 "configure"
#include "confdefs.h"
$configure_static_assert_macros
int main() {
CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8)
; return 0; }
EOF
-if { (eval echo configure:8443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes"
else
@@ -8529,12 +8534,12 @@ fi
if test -n "$MOZ_VALGRIND"; then
ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6
-echo "configure:8533: checking for valgrind/valgrind.h" >&5
+echo "configure:8538: checking for valgrind/valgrind.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8538 "configure"
+#line 8543 "configure"
#include "confdefs.h"
#include <valgrind/valgrind.h>
@@ -8542,7 +8547,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:8546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -8784,7 +8789,7 @@ case "$host" in
esac
echo $ac_n "checking for custom <inttypes.h> implementation""... $ac_c" 1>&6
-echo "configure:8788: checking for custom <inttypes.h> implementation" >&5
+echo "configure:8793: checking for custom <inttypes.h> implementation" >&5
if test "$MOZ_CUSTOM_INTTYPES_H"; then
cat >> confdefs.pytmp <<EOF
(''' MOZ_CUSTOM_INTTYPES_H ''', r''' "$MOZ_CUSTOM_INTTYPES_H" ''')
@@ -8885,9 +8890,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for IBM XLC/C++ compiler version >= 9.0.0.7""... $ac_c" 1>&6
-echo "configure:8889: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5
+echo "configure:8894: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5
cat > conftest.$ac_ext <<EOF
-#line 8891 "configure"
+#line 8896 "configure"
#include "confdefs.h"
int main() {
@@ -8896,7 +8901,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:8900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_BAD_COMPILER=
else
@@ -8934,12 +8939,12 @@ cross_compiling=$ac_cv_prog_cc_cross
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8938: checking for $ac_hdr" >&5
+echo "configure:8943: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8943 "configure"
+#line 8948 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -8947,7 +8952,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:8951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -8999,12 +9004,12 @@ EOF
STRIP_FLAGS="$STRIP_FLAGS -x -S"
# Check whether we're targeting OS X or iOS
echo $ac_n "checking for iOS target""... $ac_c" 1>&6
-echo "configure:9003: checking for iOS target" >&5
+echo "configure:9008: checking for iOS target" >&5
if eval "test \"`echo '$''{'ac_cv_ios_target'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9008 "configure"
+#line 9013 "configure"
#include "confdefs.h"
#include <TargetConditionals.h>
#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
@@ -9014,7 +9019,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:9018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_ios_target="yes"
else
@@ -9072,18 +9077,18 @@ EOF
echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
else
echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
-echo "configure:9076: checking for -dead_strip option to ld" >&5
+echo "configure:9081: checking for -dead_strip option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-dead_strip"
cat > conftest.$ac_ext <<EOF
-#line 9080 "configure"
+#line 9085 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
_HAVE_DEAD_STRIP=1
else
@@ -9104,18 +9109,18 @@ rm -f conftest*
fi
echo $ac_n "checking for -allow_heap_execute option to ld""... $ac_c" 1>&6
-echo "configure:9108: checking for -allow_heap_execute option to ld" >&5
+echo "configure:9113: checking for -allow_heap_execute option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-allow_heap_execute"
cat > conftest.$ac_ext <<EOF
-#line 9112 "configure"
+#line 9117 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
_HAVE_ALLOW_HEAP_EXECUTE=1
else
@@ -9281,7 +9286,7 @@ EOF
# warnings are useless on mingw.
echo $ac_n "checking whether the C compiler supports -Wno-format""... $ac_c" 1>&6
-echo "configure:9285: checking whether the C compiler supports -Wno-format" >&5
+echo "configure:9290: checking whether the C compiler supports -Wno-format" >&5
if eval "test \"`echo '$''{'ac_c_has_wno_format'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9297,14 +9302,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wformat"
cat > conftest.$ac_ext <<EOF
-#line 9301 "configure"
+#line 9306 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:9308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_wno_format="yes"
else
@@ -9332,7 +9337,7 @@ echo "$ac_t""$ac_c_has_wno_format" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wno-format""... $ac_c" 1>&6
-echo "configure:9336: checking whether the C++ compiler supports -Wno-format" >&5
+echo "configure:9341: checking whether the C++ compiler supports -Wno-format" >&5
if eval "test \"`echo '$''{'ac_cxx_has_wno_format'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9348,14 +9353,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wformat"
cat > conftest.$ac_ext <<EOF
-#line 9352 "configure"
+#line 9357 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:9359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_wno_format="yes"
else
@@ -9679,14 +9684,14 @@ EOF
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 9683 "configure"
+#line 9688 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:9690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -9714,7 +9719,7 @@ rm -f conftest*
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 Sun C++ compiler version >= 5.9""... $ac_c" 1>&6
-echo "configure:9718: checking for Sun C++ compiler version >= 5.9" >&5
+echo "configure:9723: checking for Sun C++ compiler version >= 5.9" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -9724,7 +9729,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 9728 "configure"
+#line 9733 "configure"
#include "confdefs.h"
int main() {
@@ -9733,7 +9738,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:9737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_BAD_COMPILER=
else
@@ -9750,7 +9755,7 @@ rm -f conftest*
_res="yes"
fi
cat > conftest.$ac_ext <<EOF
-#line 9754 "configure"
+#line 9759 "configure"
#include "confdefs.h"
int main() {
@@ -9759,7 +9764,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:9763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_ABOVE_SS12U1=
else
@@ -9967,18 +9972,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED"
if test -n "$MOZ_DEBUG"; then
echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
-echo "configure:9971: checking for valid debug flags" >&5
+echo "configure:9976: checking for valid debug flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
cat > conftest.$ac_ext <<EOF
-#line 9975 "configure"
+#line 9980 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:9982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -10065,7 +10070,7 @@ if test "$CLANG_CXX"; then
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually is a C++ compiler""... $ac_c" 1>&6
-echo "configure:10069: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually is a C++ compiler" >&5
+echo "configure:10074: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually is a C++ compiler" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -10077,14 +10082,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_LIBS=$LIBS
LIBS=
cat > conftest.$ac_ext <<EOF
-#line 10081 "configure"
+#line 10086 "configure"
#include "confdefs.h"
#include <new>
int main() {
int *foo = new int;
; return 0; }
EOF
-if { (eval echo configure:10088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -10179,7 +10184,7 @@ fi
if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF" -a -z "$DEVELOPER_OPTIONS"; then
echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6
-echo "configure:10183: checking whether the linker supports Identical Code Folding" >&5
+echo "configure:10188: checking whether the linker supports Identical Code Folding" >&5
if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10188,7 +10193,7 @@ else
'int main() {return foo() - bar();}' > conftest.${ac_ext}
# If the linker supports ICF, foo and bar symbols will have
# the same address
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:10192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:10197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
test -s conftest${ac_exeext} &&
objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then
LD_SUPPORTS_ICF=yes
@@ -10203,14 +10208,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6
_SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe"
LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections"
cat > conftest.$ac_ext <<EOF
-#line 10207 "configure"
+#line 10212 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections
else
@@ -10229,15 +10234,15 @@ fi
if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then
if test -n "$MOZ_DEBUG_FLAGS"; then
echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6
-echo "configure:10233: checking whether removing dead symbols breaks debugging" >&5
+echo "configure:10238: checking whether removing dead symbols breaks debugging" >&5
if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'int foo() {return 42;}' \
'int bar() {return 1;}' \
'int main() {return foo();}' > conftest.${ac_ext}
- if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:10240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
- { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:10241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:10245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:10246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then
if test "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest.${ac_objext} conftest.${ac_ext}`" = \
"`$PYTHON -m mozbuild.configure.check_debug_ranges conftest${ac_exeext} conftest.${ac_ext}`"; then
@@ -10264,12 +10269,12 @@ fi
if test -z "$SKIP_COMPILER_CHECKS"; then
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:10268: checking for ANSI C header files" >&5
+echo "configure:10273: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10273 "configure"
+#line 10278 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -10277,7 +10282,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10286: \"$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*
@@ -10294,7 +10299,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 10298 "configure"
+#line 10303 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -10312,7 +10317,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 10316 "configure"
+#line 10321 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -10333,7 +10338,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 10337 "configure"
+#line 10342 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -10344,7 +10349,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -10371,12 +10376,12 @@ EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10375: checking for working const" >&5
+echo "configure:10380: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10380 "configure"
+#line 10385 "configure"
#include "confdefs.h"
int main() {
@@ -10425,7 +10430,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:10429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -10449,12 +10454,12 @@ EOF
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:10453: checking for mode_t" >&5
+echo "configure:10458: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10458 "configure"
+#line 10463 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -10485,12 +10490,12 @@ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:10489: checking for off_t" >&5
+echo "configure:10494: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10494 "configure"
+#line 10499 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -10521,12 +10526,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:10525: checking for pid_t" >&5
+echo "configure:10530: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10530 "configure"
+#line 10535 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -10557,12 +10562,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:10561: checking for size_t" >&5
+echo "configure:10566: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10566 "configure"
+#line 10571 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -10607,12 +10612,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:10611: checking for ssize_t" >&5
+echo "configure:10616: checking for ssize_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10616 "configure"
+#line 10621 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -10620,7 +10625,7 @@ int main() {
ssize_t foo = 0;
; return 0; }
EOF
-if { (eval echo configure:10624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_ssize_t=true
else
@@ -10645,12 +10650,12 @@ else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:10649: checking for st_blksize in struct stat" >&5
+echo "configure:10654: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10654 "configure"
+#line 10659 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -10658,7 +10663,7 @@ int main() {
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:10662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -10682,12 +10687,12 @@ EOF
fi
echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
-echo "configure:10686: checking for siginfo_t" >&5
+echo "configure:10691: checking for siginfo_t" >&5
if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10691 "configure"
+#line 10696 "configure"
#include "confdefs.h"
#define _POSIX_C_SOURCE 199506L
#include <signal.h>
@@ -10695,7 +10700,7 @@ int main() {
siginfo_t* info;
; return 0; }
EOF
-if { (eval echo configure:10699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_siginfo_t=true
else
@@ -10741,19 +10746,19 @@ if test "$GNU_CXX"; then
_ADDED_CXXFLAGS="-std=gnu++0x"
echo $ac_n "checking for gcc c++0x headers bug without rtti""... $ac_c" 1>&6
-echo "configure:10745: checking for gcc c++0x headers bug without rtti" >&5
+echo "configure:10750: checking for gcc c++0x headers bug without rtti" >&5
if eval "test \"`echo '$''{'ac_cv_cxx0x_headers_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
+#line 10755 "configure"
#include "confdefs.h"
#include <memory>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cxx0x_headers_bug="no"
else
@@ -10771,19 +10776,19 @@ echo "$ac_t""$ac_cv_cxx0x_headers_bug" 1>&6
CXXFLAGS="$CXXFLAGS -I$_topsrcdir/build/unix/headers"
_ADDED_CXXFLAGS="$_ADDED_CXXFLAGS -I$_topsrcdir/build/unix/headers"
echo $ac_n "checking whether workaround for gcc c++0x headers conflict with clang works""... $ac_c" 1>&6
-echo "configure:10775: checking whether workaround for gcc c++0x headers conflict with clang works" >&5
+echo "configure:10780: checking whether workaround for gcc c++0x headers conflict with clang works" >&5
if eval "test \"`echo '$''{'ac_cv_cxx0x_clang_workaround'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10780 "configure"
+#line 10785 "configure"
#include "confdefs.h"
#include <memory>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cxx0x_clang_workaround="yes"
else
@@ -10824,19 +10829,19 @@ EOF
CPPFLAGS="$HOST_CPPFLAGS"
CXX="$HOST_CXX"
echo $ac_n "checking for host gcc c++0x headers bug without rtti""... $ac_c" 1>&6
-echo "configure:10828: checking for host gcc c++0x headers bug without rtti" >&5
+echo "configure:10833: checking for host gcc c++0x headers bug without rtti" >&5
if eval "test \"`echo '$''{'ac_cv_host_cxx0x_headers_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10833 "configure"
+#line 10838 "configure"
#include "confdefs.h"
#include <memory>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_host_cxx0x_headers_bug="no"
else
@@ -10853,19 +10858,19 @@ echo "$ac_t""$ac_cv_host_cxx0x_headers_bug" 1>&6
if test "$host_compiler" = CLANG -a "$ac_cv_host_cxx0x_headers_bug" = "yes"; then
CXXFLAGS="$CXXFLAGS -I$_topsrcdir/build/unix/headers"
echo $ac_n "checking whether workaround for host gcc c++0x headers conflict with host clang works""... $ac_c" 1>&6
-echo "configure:10857: checking whether workaround for host gcc c++0x headers conflict with host clang works" >&5
+echo "configure:10862: checking whether workaround for host gcc c++0x headers conflict with host clang works" >&5
if eval "test \"`echo '$''{'ac_cv_host_cxx0x_clang_workaround'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10862 "configure"
+#line 10867 "configure"
#include "confdefs.h"
#include <memory>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_host_cxx0x_clang_workaround="yes"
else
@@ -10912,7 +10917,7 @@ cross_compiling=$ac_cv_prog_cc_cross
if test "$GNU_CC"; then
echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
-echo "configure:10916: checking for visibility(hidden) attribute" >&5
+echo "configure:10921: 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
@@ -10940,7 +10945,7 @@ EOF
echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
-echo "configure:10944: checking for visibility(default) attribute" >&5
+echo "configure:10949: 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
@@ -10968,7 +10973,7 @@ EOF
echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
-echo "configure:10972: checking for visibility pragma support" >&5
+echo "configure:10977: 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
@@ -10993,7 +10998,7 @@ fi
echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
if test "$ac_cv_visibility_pragma" = "yes"; then
echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
-echo "configure:10997: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
+echo "configure:11002: 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
@@ -11021,7 +11026,7 @@ fi
echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
-echo "configure:11025: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
+echo "configure:11030: 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
@@ -11075,7 +11080,7 @@ fi # Sun Studio on Solaris
if test "$GNU_CC"; then
echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6
-echo "configure:11079: checking for gcc PR49911" >&5
+echo "configure:11084: checking for gcc PR49911" >&5
ac_have_gcc_pr49911="no"
ac_ext=C
@@ -11092,7 +11097,7 @@ if test "$cross_compiling" = yes; then
true
else
cat > conftest.$ac_ext <<EOF
-#line 11096 "configure"
+#line 11101 "configure"
#include "confdefs.h"
extern "C" void abort(void);
@@ -11133,7 +11138,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:11137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
true
else
@@ -11166,7 +11171,7 @@ fi
echo $ac_n "checking for gcc pr39608""... $ac_c" 1>&6
-echo "configure:11170: checking for gcc pr39608" >&5
+echo "configure:11175: checking for gcc pr39608" >&5
ac_have_gcc_pr39608="yes"
ac_ext=C
@@ -11178,7 +11183,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 11182 "configure"
+#line 11187 "configure"
#include "confdefs.h"
typedef void (*FuncType)();
@@ -11196,7 +11201,7 @@ int main() {
true
; return 0; }
EOF
-if { (eval echo configure:11200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_have_gcc_pr39608="no"
else
@@ -11226,7 +11231,7 @@ if test "$OS_TARGET" != WINNT; then
# cannot do enough code gen for now to make this test work correctly.
echo $ac_n "checking for llvm pr8927""... $ac_c" 1>&6
-echo "configure:11230: checking for llvm pr8927" >&5
+echo "configure:11235: checking for llvm pr8927" >&5
ac_have_llvm_pr8927="no"
ac_ext=c
@@ -11243,7 +11248,7 @@ if test "$cross_compiling" = yes; then
true
else
cat > conftest.$ac_ext <<EOF
-#line 11247 "configure"
+#line 11252 "configure"
#include "confdefs.h"
struct foobar {
@@ -11266,7 +11271,7 @@ int main() {
}
EOF
-if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
true
else
@@ -11304,19 +11309,19 @@ if test "$GNU_CC"; then
CFLAGS_save="${CFLAGS}"
CFLAGS="${CFLAGS} -Werror"
echo $ac_n "checking for __force_align_arg_pointer__ attribute""... $ac_c" 1>&6
-echo "configure:11308: checking for __force_align_arg_pointer__ attribute" >&5
+echo "configure:11313: checking for __force_align_arg_pointer__ attribute" >&5
if eval "test \"`echo '$''{'ac_cv_force_align_arg_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11313 "configure"
+#line 11318 "configure"
#include "confdefs.h"
__attribute__ ((__force_align_arg_pointer__)) void test() {}
int main() {
; return 0; }
EOF
-if { (eval echo configure:11320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_force_align_arg_pointer="yes"
else
@@ -11343,12 +11348,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:11347: checking for $ac_hdr that defines DIR" >&5
+echo "configure:11352: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11352 "configure"
+#line 11357 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -11356,7 +11361,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:11360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -11384,7 +11389,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:11388: checking for opendir in -ldir" >&5
+echo "configure:11393: 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
@@ -11392,7 +11397,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11396 "configure"
+#line 11401 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11403,7 +11408,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:11407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11412: \"$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
@@ -11425,7 +11430,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:11429: checking for opendir in -lx" >&5
+echo "configure:11434: 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
@@ -11433,7 +11438,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11437 "configure"
+#line 11442 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11444,7 +11449,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:11448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11453: \"$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
@@ -11478,12 +11483,12 @@ esac
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11482: checking for $ac_hdr" >&5
+echo "configure:11487: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11487 "configure"
+#line 11492 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -11491,7 +11496,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11526,12 +11531,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11530: checking for $ac_hdr" >&5
+echo "configure:11535: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11535 "configure"
+#line 11540 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -11539,7 +11544,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11573,12 +11578,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11577: checking for $ac_hdr" >&5
+echo "configure:11582: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11582 "configure"
+#line 11587 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -11586,7 +11591,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11619,12 +11624,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11623: checking for $ac_hdr" >&5
+echo "configure:11628: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11628 "configure"
+#line 11633 "configure"
#include "confdefs.h"
#include <sys/socket.h>
#include <$ac_hdr>
@@ -11632,7 +11637,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11666,12 +11671,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11670: checking for $ac_hdr" >&5
+echo "configure:11675: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11675 "configure"
+#line 11680 "configure"
#include "confdefs.h"
#include <sys/socket.h>
#include <$ac_hdr>
@@ -11679,7 +11684,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11713,12 +11718,12 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11717: checking for $ac_hdr" >&5
+echo "configure:11722: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11722 "configure"
+#line 11727 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -11726,7 +11731,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11757,12 +11762,12 @@ EOF
echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6
-echo "configure:11761: checking for sockaddr_in.sin_len" >&5
+echo "configure:11766: checking for sockaddr_in.sin_len" >&5
if eval "test \"`echo '$''{'ac_cv_sockaddr_in_sin_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11766 "configure"
+#line 11771 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -11774,7 +11779,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_in_sin_len=true
else
@@ -11805,12 +11810,12 @@ EOF
fi
echo $ac_n "checking for sockaddr_in6.sin6_len""... $ac_c" 1>&6
-echo "configure:11809: checking for sockaddr_in6.sin6_len" >&5
+echo "configure:11814: checking for sockaddr_in6.sin6_len" >&5
if eval "test \"`echo '$''{'ac_cv_sockaddr_in6_sin6_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
+#line 11819 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -11822,7 +11827,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_in6_sin6_len=true
else
@@ -11846,12 +11851,12 @@ EOF
fi
echo $ac_n "checking for sockaddr.sa_len""... $ac_c" 1>&6
-echo "configure:11850: checking for sockaddr.sa_len" >&5
+echo "configure:11855: checking for sockaddr.sa_len" >&5
if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11855 "configure"
+#line 11860 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -11863,7 +11868,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_sa_len=true
else
@@ -11895,12 +11900,12 @@ fi
if test "x$enable_dtrace" = "xyes"; then
ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6
-echo "configure:11899: checking for sys/sdt.h" >&5
+echo "configure:11904: checking for sys/sdt.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11904 "configure"
+#line 11909 "configure"
#include "confdefs.h"
#include <sys/sdt.h>
@@ -11908,7 +11913,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -11950,12 +11955,12 @@ case $target in
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11954: checking for $ac_hdr" >&5
+echo "configure:11959: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11959 "configure"
+#line 11964 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -11963,7 +11968,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:11967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -12015,12 +12020,12 @@ CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES"
ac_safe=`echo "linux/perf_event.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/perf_event.h""... $ac_c" 1>&6
-echo "configure:12019: checking for linux/perf_event.h" >&5
+echo "configure:12024: checking for linux/perf_event.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12024 "configure"
+#line 12029 "configure"
#include "confdefs.h"
#include <linux/perf_event.h>
@@ -12028,7 +12033,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -12043,19 +12048,19 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for perf_event_open system call""... $ac_c" 1>&6
-echo "configure:12047: checking for perf_event_open system call" >&5
+echo "configure:12052: checking for perf_event_open system call" >&5
if eval "test \"`echo '$''{'ac_cv_perf_event_open'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12052 "configure"
+#line 12057 "configure"
#include "confdefs.h"
#include <asm/unistd.h>
int main() {
return sizeof(__NR_perf_event_open);
; return 0; }
EOF
-if { (eval echo configure:12059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_perf_event_open=yes
else
@@ -12091,7 +12096,7 @@ case $target in
;;
*)
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-echo "configure:12095: checking for gethostbyname_r in -lc_r" >&5
+echo "configure:12100: 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
@@ -12099,7 +12104,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12103 "configure"
+#line 12108 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12110,7 +12115,7 @@ int main() {
gethostbyname_r()
; return 0; }
EOF
-if { (eval echo configure:12114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12119: \"$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
@@ -12149,14 +12154,14 @@ case $target in
*)
echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6
-echo "configure:12153: checking for library containing dlopen" >&5
+echo "configure:12158: checking for library containing dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_dlopen="no"
cat > conftest.$ac_ext <<EOF
-#line 12160 "configure"
+#line 12165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12167,7 +12172,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:12171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_dlopen="none required"
else
@@ -12178,7 +12183,7 @@ rm -f conftest*
test "$ac_cv_search_dlopen" = "no" && for i in dl; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12182 "configure"
+#line 12187 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12189,7 +12194,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:12193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_dlopen="-l$i"
break
@@ -12207,12 +12212,12 @@ if test "$ac_cv_search_dlopen" != "no"; then
test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:12211: checking for dlfcn.h" >&5
+echo "configure:12216: checking for dlfcn.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12216 "configure"
+#line 12221 "configure"
#include "confdefs.h"
#include <dlfcn.h>
@@ -12220,7 +12225,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -12257,12 +12262,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE"
for ac_func in dladdr memmem
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12261: checking for $ac_func" >&5
+echo "configure:12266: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12266 "configure"
+#line 12271 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -12289,7 +12294,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -12323,7 +12328,7 @@ if test ! "$GNU_CXX"; then
case $target in
*-aix*)
echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
-echo "configure:12327: checking for demangle in -lC_r" >&5
+echo "configure:12332: 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
@@ -12331,7 +12336,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lC_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12335 "configure"
+#line 12340 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12342,7 +12347,7 @@ int main() {
demangle()
; return 0; }
EOF
-if { (eval echo configure:12346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12351: \"$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
@@ -12375,7 +12380,7 @@ fi
;;
*)
echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
-echo "configure:12379: checking for demangle in -lC" >&5
+echo "configure:12384: 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
@@ -12383,7 +12388,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lC $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12387 "configure"
+#line 12392 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12394,7 +12399,7 @@ int main() {
demangle()
; return 0; }
EOF
-if { (eval echo configure:12398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12403: \"$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
@@ -12429,7 +12434,7 @@ fi
fi
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:12433: checking for socket in -lsocket" >&5
+echo "configure:12438: 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
@@ -12437,7 +12442,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12441 "configure"
+#line 12446 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12448,7 +12453,7 @@ int main() {
socket()
; return 0; }
EOF
-if { (eval echo configure:12452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12457: \"$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
@@ -12502,7 +12507,7 @@ EOF
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
-echo "configure:12506: checking for XDrawLines in -lX11" >&5
+echo "configure:12511: 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
@@ -12510,7 +12515,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lX11 $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12514 "configure"
+#line 12519 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12521,7 +12526,7 @@ int main() {
XDrawLines()
; return 0; }
EOF
-if { (eval echo configure:12525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12530: \"$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
@@ -12543,7 +12548,7 @@ MISSING_X="$MISSING_X -lX11"
fi
echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
-echo "configure:12547: checking for XextAddDisplay in -lXext" >&5
+echo "configure:12552: 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
@@ -12551,7 +12556,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12555 "configure"
+#line 12560 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12562,7 +12567,7 @@ int main() {
XextAddDisplay()
; return 0; }
EOF
-if { (eval echo configure:12566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12571: \"$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
@@ -12585,7 +12590,7 @@ fi
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:12589: checking for XtFree in -lXt" >&5
+echo "configure:12594: 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
@@ -12593,7 +12598,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12597 "configure"
+#line 12602 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12604,7 +12609,7 @@ int main() {
XtFree()
; return 0; }
EOF
-if { (eval echo configure:12608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12613: \"$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
@@ -12625,7 +12630,7 @@ else
unset ac_cv_lib_Xt_XtFree
echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
-echo "configure:12629: checking for IceFlush in -lICE" >&5
+echo "configure:12634: 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
@@ -12633,7 +12638,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12637 "configure"
+#line 12642 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12644,7 +12649,7 @@ int main() {
IceFlush()
; return 0; }
EOF
-if { (eval echo configure:12648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12653: \"$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
@@ -12665,7 +12670,7 @@ else
fi
echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
-echo "configure:12669: checking for SmcCloseConnection in -lSM" >&5
+echo "configure:12674: 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
@@ -12673,7 +12678,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12677 "configure"
+#line 12682 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12684,7 +12689,7 @@ int main() {
SmcCloseConnection()
; return 0; }
EOF
-if { (eval echo configure:12688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12693: \"$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
@@ -12705,7 +12710,7 @@ else
fi
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:12709: checking for XtFree in -lXt" >&5
+echo "configure:12714: 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
@@ -12713,7 +12718,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12717 "configure"
+#line 12722 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12724,7 +12729,7 @@ int main() {
XtFree()
; return 0; }
EOF
-if { (eval echo configure:12728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12733: \"$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
@@ -12758,7 +12763,7 @@ fi
esac
echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
-echo "configure:12762: checking for XShmCreateImage in -lXext" >&5
+echo "configure:12767: 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
@@ -12766,7 +12771,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12770 "configure"
+#line 12775 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12777,7 +12782,7 @@ int main() {
XShmCreateImage()
; return 0; }
EOF
-if { (eval echo configure:12781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12786: \"$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
@@ -12800,12 +12805,12 @@ fi
ac_safe=`echo "X11/extensions/scrnsaver.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/scrnsaver.h""... $ac_c" 1>&6
-echo "configure:12804: checking for X11/extensions/scrnsaver.h" >&5
+echo "configure:12809: checking for X11/extensions/scrnsaver.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12809 "configure"
+#line 12814 "configure"
#include "confdefs.h"
#include <X11/extensions/scrnsaver.h>
@@ -12813,7 +12818,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:12817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -12828,7 +12833,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XScreenSaverQueryInfo in -lXss""... $ac_c" 1>&6
-echo "configure:12832: checking for XScreenSaverQueryInfo in -lXss" >&5
+echo "configure:12837: checking for XScreenSaverQueryInfo in -lXss" >&5
ac_lib_var=`echo Xss'_'XScreenSaverQueryInfo | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -12836,7 +12841,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXss $XEXT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12840 "configure"
+#line 12845 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12847,7 +12852,7 @@ int main() {
XScreenSaverQueryInfo()
; return 0; }
EOF
-if { (eval echo configure:12851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12856: \"$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
@@ -12897,7 +12902,7 @@ darwin*)
*)
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:12901: checking for pthread_create in -lpthreads" >&5
+echo "configure:12906: checking for pthread_create in -lpthreads" >&5
echo "
#include <pthread.h>
#include <stdlib.h>
@@ -12920,7 +12925,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:12924: checking for pthread_create in -lpthread" >&5
+echo "configure:12929: checking for pthread_create in -lpthread" >&5
echo "
#include <pthread.h>
#include <stdlib.h>
@@ -12943,7 +12948,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:12947: checking for pthread_create in -lc_r" >&5
+echo "configure:12952: checking for pthread_create in -lc_r" >&5
echo "
#include <pthread.h>
#include <stdlib.h>
@@ -12966,7 +12971,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:12970: checking for pthread_create in -lc" >&5
+echo "configure:12975: checking for pthread_create in -lc" >&5
echo "
#include <pthread.h>
#include <stdlib.h>
@@ -13025,7 +13030,7 @@ then
rm -f conftest*
ac_cv_have_dash_pthread=no
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:13029: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:13034: 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
@@ -13048,7 +13053,7 @@ echo "configure:13029: checking whether ${CC-cc} accepts -pthread" >&5
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:13052: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:13057: 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
@@ -13154,13 +13159,13 @@ fi
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:13158: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:13163: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 13164 "configure"
+#line 13169 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -13178,7 +13183,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 13182 "configure"
+#line 13187 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -13200,7 +13205,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:13204: checking for 8-bit clean memcmp" >&5
+echo "configure:13209: 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
@@ -13208,7 +13213,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 13212 "configure"
+#line 13217 "configure"
#include "confdefs.h"
main()
@@ -13218,7 +13223,7 @@ main()
}
EOF
-if { (eval echo configure:13222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13227: \"$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
@@ -13238,12 +13243,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
for ac_func in stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13242: checking for $ac_func" >&5
+echo "configure:13247: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13247 "configure"
+#line 13252 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -13270,7 +13275,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:13274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -13299,7 +13304,7 @@ done
echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC)""... $ac_c" 1>&6
-echo "configure:13303: checking for clock_gettime(CLOCK_MONOTONIC)" >&5
+echo "configure:13308: checking for clock_gettime(CLOCK_MONOTONIC)" >&5
if eval "test \"`echo '$''{'ac_cv_clock_monotonic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13307,7 +13312,7 @@ else
_SAVE_LIBS="$LIBS"
LIBS="$LIBS $libs"
cat > conftest.$ac_ext <<EOF
-#line 13311 "configure"
+#line 13316 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
@@ -13315,7 +13320,7 @@ int main() {
clock_gettime(CLOCK_MONOTONIC, &ts);
; return 0; }
EOF
-if { (eval echo configure:13319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_clock_monotonic=$libs
LIBS="$_SAVE_LIBS"
@@ -13356,19 +13361,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
-echo "configure:13360: checking for wcrtomb" >&5
+echo "configure:13365: checking for wcrtomb" >&5
if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13365 "configure"
+#line 13370 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
mbstate_t ps={0};wcrtomb(0,'f',&ps);
; return 0; }
EOF
-if { (eval echo configure:13372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_wcrtomb="yes"
else
@@ -13391,19 +13396,19 @@ EOF
fi
echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
-echo "configure:13395: checking for mbrtowc" >&5
+echo "configure:13400: checking for mbrtowc" >&5
if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13400 "configure"
+#line 13405 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
mbstate_t ps={0};mbrtowc(0,0,0,&ps);
; return 0; }
EOF
-if { (eval echo configure:13407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_mbrtowc="yes"
else
@@ -13435,7 +13440,7 @@ cross_compiling=$ac_cv_prog_cc_cross
fi
echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
-echo "configure:13439: checking for res_ninit()" >&5
+echo "configure:13444: 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
@@ -13443,7 +13448,7 @@ else
ac_cv_func_res_ninit=no
else
cat > conftest.$ac_ext <<EOF
-#line 13447 "configure"
+#line 13452 "configure"
#include "confdefs.h"
#ifdef linux
@@ -13458,7 +13463,7 @@ int main() {
int foo = res_ninit(&_res);
; return 0; }
EOF
-if { (eval echo configure:13462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13467: \"$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
@@ -13498,7 +13503,7 @@ case $target_os in
*)
echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
-echo "configure:13502: checking for iconv in -lc" >&5
+echo "configure:13507: 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
@@ -13506,7 +13511,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13510 "configure"
+#line 13515 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -13520,7 +13525,7 @@ int main() {
iconv()
; return 0; }
EOF
-if { (eval echo configure:13524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13529: \"$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
@@ -13539,7 +13544,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:13543: checking for iconv in -liconv" >&5
+echo "configure:13548: 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
@@ -13547,7 +13552,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13551 "configure"
+#line 13556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -13561,7 +13566,7 @@ int main() {
iconv()
; return 0; }
EOF
-if { (eval echo configure:13565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13570: \"$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
@@ -13580,7 +13585,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:13584: checking for libiconv in -liconv" >&5
+echo "configure:13589: 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
@@ -13588,7 +13593,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13592 "configure"
+#line 13597 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -13602,7 +13607,7 @@ int main() {
libiconv()
; return 0; }
EOF
-if { (eval echo configure:13606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13611: \"$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
@@ -13629,12 +13634,12 @@ fi
_SAVE_LIBS=$LIBS
LIBS="$LIBS $_ICONV_LIBS"
echo $ac_n "checking for iconv()""... $ac_c" 1>&6
-echo "configure:13633: checking for iconv()" >&5
+echo "configure:13638: checking for iconv()" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13638 "configure"
+#line 13643 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13648,7 +13653,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_iconv=yes
else
@@ -13674,12 +13679,12 @@ EOF
LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
LIBICONV="$_ICONV_LIBS"
echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
-echo "configure:13678: checking for iconv() with const input" >&5
+echo "configure:13683: checking for iconv() with const input" >&5
if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13683 "configure"
+#line 13688 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13694,7 +13699,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_const_iconv=yes
else
@@ -13726,19 +13731,19 @@ esac
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:13730: checking for nl_langinfo and CODESET" >&5
+echo "configure:13735: checking for nl_langinfo and CODESET" >&5
if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13735 "configure"
+#line 13740 "configure"
#include "confdefs.h"
#include <langinfo.h>
int main() {
char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:13742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_langinfo_codeset=yes
else
@@ -13773,12 +13778,12 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
-echo "configure:13777: checking for an implementation of va_copy()" >&5
+echo "configure:13782: 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
cat > conftest.$ac_ext <<EOF
-#line 13782 "configure"
+#line 13787 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdlib.h>
@@ -13794,7 +13799,7 @@ int main() {
f(0, 42); return 0
; return 0; }
EOF
-if { (eval echo configure:13798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_va_copy=yes
else
@@ -13810,12 +13815,12 @@ fi
echo "$ac_t""$ac_cv_va_copy" 1>&6
echo $ac_n "checking whether va_list can be copied by value""... $ac_c" 1>&6
-echo "configure:13814: checking whether va_list can be copied by value" >&5
+echo "configure:13819: checking whether va_list 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
cat > conftest.$ac_ext <<EOF
-#line 13819 "configure"
+#line 13824 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdlib.h>
@@ -13831,7 +13836,7 @@ int main() {
f(0, 42); return 0
; return 0; }
EOF
-if { (eval echo configure:13835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_va_val_copy=yes
else
@@ -13884,12 +13889,12 @@ ARM_ABI_PREFIX=
if test "$GNU_CC"; then
if test "$CPU_ARCH" = "arm" ; then
echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6
-echo "configure:13888: checking for ARM EABI" >&5
+echo "configure:13893: checking for ARM EABI" >&5
if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13893 "configure"
+#line 13898 "configure"
#include "confdefs.h"
int main() {
@@ -13902,7 +13907,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_gcc_arm_eabi="yes"
else
@@ -13927,12 +13932,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6
fi
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
-echo "configure:13931: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
+echo "configure:13936: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13936 "configure"
+#line 13941 "configure"
#include "confdefs.h"
class X {
public: int go(const X&) {return 3;}
@@ -13948,7 +13953,7 @@ int main() {
X x; Y y; y.jo(x);
; return 0; }
EOF
-if { (eval echo configure:13952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cpp_ambiguity_resolving_using=yes
else
@@ -13972,7 +13977,7 @@ EOF
fi
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
-echo "configure:13976: checking for C++ dynamic_cast to void*" >&5
+echo "configure:13981: 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
@@ -13980,7 +13985,7 @@ else
ac_cv_cpp_dynamic_cast_void_ptr=no
else
cat > conftest.$ac_ext <<EOF
-#line 13984 "configure"
+#line 13989 "configure"
#include "confdefs.h"
class X { int i; public: virtual ~X() { } };
class Y { int j; public: virtual ~Y() { } };
@@ -13996,7 +14001,7 @@ class X { int i; public: virtual ~X() { } };
((void*)&mdo == dynamic_cast<void*>(suby))));
}
EOF
-if { (eval echo configure:14000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14005: \"$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
@@ -14023,19 +14028,19 @@ fi
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
-echo "configure:14027: checking whether C++ requires implementation of unused virtual methods" >&5
+echo "configure:14032: checking whether C++ requires implementation of unused virtual methods" >&5
if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14032 "configure"
+#line 14037 "configure"
#include "confdefs.h"
class X {private: virtual void never_called();};
int main() {
X x;
; return 0; }
EOF
-if { (eval echo configure:14039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14044: \"$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
@@ -14061,12 +14066,12 @@ fi
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
-echo "configure:14065: checking for trouble comparing to zero near std::operator!=()" >&5
+echo "configure:14070: checking for trouble comparing to zero near std::operator!=()" >&5
if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14070 "configure"
+#line 14075 "configure"
#include "confdefs.h"
#include <algorithm>
template <class T> class Foo {};
@@ -14077,7 +14082,7 @@ int main() {
Foo<int> f; return (0 != f);
; return 0; }
EOF
-if { (eval echo configure:14081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_trouble_comparing_to_zero=no
else
@@ -14107,19 +14112,19 @@ fi
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS"
echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6
-echo "configure:14111: checking for __thread keyword for TLS variables" >&5
+echo "configure:14116: checking for __thread keyword for TLS variables" >&5
if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14116 "configure"
+#line 14121 "configure"
#include "confdefs.h"
__thread bool tlsIsMainThread = false;
int main() {
return tlsIsMainThread;
; return 0; }
EOF
-if { (eval echo configure:14123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_thread_keyword=yes
else
@@ -14173,12 +14178,12 @@ fi
if test -n "$MOZ_LINKER" -a "$OS_TARGET" = "Android"; then
echo $ac_n "checking whether the CRT objects have text relocations""... $ac_c" 1>&6
-echo "configure:14177: checking whether the CRT objects have text relocations" >&5
+echo "configure:14182: checking whether the CRT objects have text relocations" >&5
if eval "test \"`echo '$''{'ac_cv_crt_has_text_relocations'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'int foo() { return 0; }' > conftest.cpp
- if { ac_try='${CXX-g++} -o conftest${DLL_SUFFIX} $CXXFLAGS $DSO_LDOPTS $LDFLAGS conftest.cpp $LIBS 1>&5'; { (eval echo configure:14182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ if { ac_try='${CXX-g++} -o conftest${DLL_SUFFIX} $CXXFLAGS $DSO_LDOPTS $LDFLAGS conftest.cpp $LIBS 1>&5'; { (eval echo configure:14187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
test -s conftest${DLL_SUFFIX}; then
if ${TOOLCHAIN_PREFIX}readelf -d conftest${DLL_SUFFIX} | grep TEXTREL > /dev/null; then
ac_cv_crt_has_text_relocations=yes
@@ -14205,12 +14210,12 @@ MALLOC_H=
for file in $MALLOC_HEADERS; do
ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $file""... $ac_c" 1>&6
-echo "configure:14209: checking for $file" >&5
+echo "configure:14214: checking for $file" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14214 "configure"
+#line 14219 "configure"
#include "confdefs.h"
#include <$file>
@@ -14218,7 +14223,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -14253,12 +14258,12 @@ done
for ac_func in strndup posix_memalign memalign valloc
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14257: checking for $ac_func" >&5
+echo "configure:14262: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14262 "configure"
+#line 14267 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -14288,7 +14293,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:14292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -14319,12 +14324,12 @@ done
for ac_func in malloc_usable_size
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14323: checking for $ac_func" >&5
+echo "configure:14328: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14328 "configure"
+#line 14333 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -14354,7 +14359,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:14358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -14384,19 +14389,19 @@ done
echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6
-echo "configure:14388: checking for __attribute__((always_inline))" >&5
+echo "configure:14393: checking for __attribute__((always_inline))" >&5
if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14393 "configure"
+#line 14398 "configure"
#include "confdefs.h"
inline void f(void) __attribute__((always_inline));
int main() {
; return 0; }
EOF
-if { (eval echo configure:14400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_attribute_always_inline=yes
else
@@ -14411,19 +14416,19 @@ fi
echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6
echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6
-echo "configure:14415: checking for __attribute__((malloc))" >&5
+echo "configure:14420: checking for __attribute__((malloc))" >&5
if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14420 "configure"
+#line 14425 "configure"
#include "confdefs.h"
void* f(int) __attribute__((malloc));
int main() {
; return 0; }
EOF
-if { (eval echo configure:14427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_attribute_malloc=yes
else
@@ -14438,19 +14443,19 @@ fi
echo "$ac_t""$ac_cv_attribute_malloc" 1>&6
echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6
-echo "configure:14442: checking for __attribute__((warn_unused_result))" >&5
+echo "configure:14447: checking for __attribute__((warn_unused_result))" >&5
if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14447 "configure"
+#line 14452 "configure"
#include "confdefs.h"
int f(void) __attribute__((warn_unused_result));
int main() {
; return 0; }
EOF
-if { (eval echo configure:14454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_attribute_warn_unused=yes
else
@@ -14474,19 +14479,19 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:14478: checking for LC_MESSAGES" >&5
+echo "configure:14483: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14483 "configure"
+#line 14488 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
int category = LC_MESSAGES;
; return 0; }
EOF
-if { (eval echo configure:14490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_i18n_lc_messages=yes
else
@@ -14512,12 +14517,12 @@ fi
for ac_func in localeconv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14516: checking for $ac_func" >&5
+echo "configure:14521: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14521 "configure"
+#line 14526 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -14544,7 +14549,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:14548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -14733,7 +14738,7 @@ fi
# 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:14737: checking for $ac_word" >&5
+echo "configure:14742: 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
@@ -14768,7 +14773,7 @@ fi
min_nspr_version=4.10.6
echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
-echo "configure:14772: checking for NSPR - version >= $min_nspr_version" >&5
+echo "configure:14777: checking for NSPR - version >= $min_nspr_version" >&5
no_nspr=""
if test "$NSPR_CONFIG" != "no"; then
@@ -14827,7 +14832,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $NSPR_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 14831 "configure"
+#line 14836 "configure"
#include "confdefs.h"
#include "prtypes.h"
int main() {
@@ -14836,7 +14841,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:14840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_NATIVE_NSPR=1
else
@@ -14847,7 +14852,7 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 14851 "configure"
+#line 14856 "configure"
#include "confdefs.h"
#include "prtypes.h"
int main() {
@@ -14856,7 +14861,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:14860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_NATIVE_NSPR=1
else
@@ -14956,7 +14961,7 @@ if test "$LIBEVENT_DIR" = yes; 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:14960: checking for $ac_word" >&5
+echo "configure:14965: 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
@@ -15000,19 +15005,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libevent""... $ac_c" 1>&6
-echo "configure:15004: checking for libevent" >&5
+echo "configure:15009: checking for libevent" >&5
if $PKG_CONFIG --exists "libevent" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_LIBEVENT_CFLAGS""... $ac_c" 1>&6
-echo "configure:15011: checking MOZ_LIBEVENT_CFLAGS" >&5
+echo "configure:15016: checking MOZ_LIBEVENT_CFLAGS" >&5
MOZ_LIBEVENT_CFLAGS=`$PKG_CONFIG --cflags "libevent"`
echo "$ac_t""$MOZ_LIBEVENT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_LIBEVENT_LIBS""... $ac_c" 1>&6
-echo "configure:15016: checking MOZ_LIBEVENT_LIBS" >&5
+echo "configure:15021: checking MOZ_LIBEVENT_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_LIBEVENT_LIBS="`$PKG_CONFIG --libs \"libevent\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_LIBEVENT_LIBS" 1>&6
@@ -15049,12 +15054,12 @@ elif test -z "$MOZ_NATIVE_LIBEVENT"; then
LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
ac_safe=`echo "event.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for event.h""... $ac_c" 1>&6
-echo "configure:15053: checking for event.h" >&5
+echo "configure:15058: checking for event.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15058 "configure"
+#line 15063 "configure"
#include "confdefs.h"
#include <event.h>
@@ -15062,7 +15067,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:15066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -15085,7 +15090,7 @@ fi
fi
echo $ac_n "checking for event_init in -levent""... $ac_c" 1>&6
-echo "configure:15089: checking for event_init in -levent" >&5
+echo "configure:15094: checking for event_init in -levent" >&5
ac_lib_var=`echo event'_'event_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15093,7 +15098,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-levent $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15097 "configure"
+#line 15102 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15104,7 +15109,7 @@ int main() {
event_init()
; return 0; }
EOF
-if { (eval echo configure:15108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15113: \"$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
@@ -15187,7 +15192,7 @@ fi
# 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:15191: checking for $ac_word" >&5
+echo "configure:15196: 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
@@ -15220,9 +15225,9 @@ else
echo "$ac_t""no" 1>&6
fi
- min_nss_version=3.16.2.2
+ min_nss_version=3.16.2.3
echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
-echo "configure:15226: checking for NSS - version >= $min_nss_version" >&5
+echo "configure:15231: checking for NSS - version >= $min_nss_version" >&5
no_nss=""
if test "$NSS_CONFIG" = "no"; then
@@ -15289,13 +15294,13 @@ fi
echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6
-echo "configure:15293: checking for YASM assembler" >&5
+echo "configure:15298: checking for YASM assembler" >&5
for ac_prog in yasm
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:15299: checking for $ac_word" >&5
+echo "configure:15304: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YASM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15353,7 +15358,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then
MOZ_NATIVE_JPEG=
else
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:15357: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:15362: 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
@@ -15361,7 +15366,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15365 "configure"
+#line 15370 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15372,7 +15377,7 @@ int main() {
jpeg_destroy_compress()
; return 0; }
EOF
-if { (eval echo configure:15376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15381: \"$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
@@ -15397,7 +15402,7 @@ fi
if test "$MOZ_NATIVE_JPEG" = 1; then
cat > conftest.$ac_ext <<EOF
-#line 15401 "configure"
+#line 15406 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -15412,7 +15417,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:15416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_NATIVE_JPEG=1
else
@@ -15459,7 +15464,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then
MOZ_NATIVE_ZLIB=
else
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
-echo "configure:15463: checking for gzread in -lz" >&5
+echo "configure:15468: 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
@@ -15467,7 +15472,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15471 "configure"
+#line 15476 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15478,7 +15483,7 @@ int main() {
gzread()
; return 0; }
EOF
-if { (eval echo configure:15482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15487: \"$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
@@ -15502,7 +15507,7 @@ fi
if test "$MOZ_NATIVE_ZLIB" = 1; then
MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
cat > conftest.$ac_ext <<EOF
-#line 15506 "configure"
+#line 15511 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <string.h>
@@ -15513,7 +15518,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:15517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_NATIVE_ZLIB=1
else
@@ -15566,7 +15571,7 @@ if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then
MOZ_NATIVE_BZ2=
else
echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6
-echo "configure:15570: checking for BZ2_bzread in -lbz2" >&5
+echo "configure:15575: checking for BZ2_bzread in -lbz2" >&5
ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15574,7 +15579,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbz2 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15578 "configure"
+#line 15583 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15585,7 +15590,7 @@ int main() {
BZ2_bzread()
; return 0; }
EOF
-if { (eval echo configure:15589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15594: \"$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
@@ -15634,7 +15639,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
MOZ_NATIVE_PNG=
else
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
-echo "configure:15638: checking for png_get_valid in -lpng" >&5
+echo "configure:15643: 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
@@ -15642,7 +15647,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15646 "configure"
+#line 15651 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15653,7 +15658,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
-if { (eval echo configure:15657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15662: \"$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
@@ -15675,7 +15680,7 @@ else
fi
echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6
-echo "configure:15679: checking for png_get_acTL in -lpng" >&5
+echo "configure:15684: checking for png_get_acTL in -lpng" >&5
ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15683,7 +15688,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15687 "configure"
+#line 15692 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15694,7 +15699,7 @@ int main() {
png_get_acTL()
; return 0; }
EOF
-if { (eval echo configure:15698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15703: \"$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
@@ -15728,7 +15733,7 @@ fi
fi
if test "$MOZ_NATIVE_PNG" = 1; then
cat > conftest.$ac_ext <<EOF
-#line 15732 "configure"
+#line 15737 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -15742,7 +15747,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:15746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_NATIVE_PNG=1
else
@@ -15811,7 +15816,7 @@ if test -n "$MOZ_NATIVE_HUNSPELL"; 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:15815: checking for $ac_word" >&5
+echo "configure:15820: 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
@@ -15855,19 +15860,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for hunspell""... $ac_c" 1>&6
-echo "configure:15859: checking for hunspell" >&5
+echo "configure:15864: checking for hunspell" >&5
if $PKG_CONFIG --exists "hunspell" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6
-echo "configure:15866: checking MOZ_HUNSPELL_CFLAGS" >&5
+echo "configure:15871: checking MOZ_HUNSPELL_CFLAGS" >&5
MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6
echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6
-echo "configure:15871: checking MOZ_HUNSPELL_LIBS" >&5
+echo "configure:15876: checking MOZ_HUNSPELL_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6
@@ -15925,7 +15930,7 @@ if test -n "$MOZ_NATIVE_FFI"; 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:15929: checking for $ac_word" >&5
+echo "configure:15934: 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
@@ -15969,19 +15974,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6
-echo "configure:15973: checking for libffi > 3.0.9" >&5
+echo "configure:15978: checking for libffi > 3.0.9" >&5
if $PKG_CONFIG --exists "libffi > 3.0.9" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6
-echo "configure:15980: checking MOZ_FFI_CFLAGS" >&5
+echo "configure:15985: checking MOZ_FFI_CFLAGS" >&5
MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"`
echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6
echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6
-echo "configure:15985: checking MOZ_FFI_LIBS" >&5
+echo "configure:15990: checking MOZ_FFI_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_FFI_LIBS" 1>&6
@@ -16017,7 +16022,7 @@ echo "configure:15985: checking MOZ_FFI_LIBS" >&5
# 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:16021: checking for $ac_word" >&5
+echo "configure:16026: 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
@@ -16061,19 +16066,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6
-echo "configure:16065: checking for libffi >= 3.0.9" >&5
+echo "configure:16070: checking for libffi >= 3.0.9" >&5
if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6
-echo "configure:16072: checking MOZ_FFI_CFLAGS" >&5
+echo "configure:16077: checking MOZ_FFI_CFLAGS" >&5
MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"`
echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6
echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6
-echo "configure:16077: checking MOZ_FFI_LIBS" >&5
+echo "configure:16082: checking MOZ_FFI_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_FFI_LIBS" 1>&6
@@ -16227,7 +16232,6 @@ MOZ_AUDIO_CHANNEL_MANAGER=
NSS_NO_LIBPKIX=
MOZ_CONTENT_SANDBOX=
MOZ_CONTENT_SANDBOX_REPORTER=1
-JSGC_USE_EXACT_ROOTING=
case "$target_os" in
mingw*)
@@ -16291,7 +16295,7 @@ fi
echo $ac_n "checking for application to build""... $ac_c" 1>&6
-echo "configure:16295: checking for application to build" >&5
+echo "configure:16299: checking for application to build" >&5
if test -z "$MOZ_BUILD_APP"; then
echo "$ac_t""browser" 1>&6
MOZ_BUILD_APP=browser
@@ -16360,7 +16364,7 @@ fi
# Allow the application to influence configure with a confvars.sh script.
echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6
-echo "configure:16364: checking if app-specific confvars.sh exists" >&5
+echo "configure:16368: checking if app-specific confvars.sh exists" >&5
if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6
. "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
@@ -16553,7 +16557,7 @@ EOF
fi
echo $ac_n "checking for android build-tools directory""... $ac_c" 1>&6
-echo "configure:16557: checking for android build-tools directory" >&5
+echo "configure:16561: checking for android build-tools directory" >&5
android_build_tools=""
for suffix in `ls "$android_sdk_root/build-tools" | sed -e "s,android-,999.," | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr`; do
tools_directory=`echo "$android_sdk_root/build-tools/$suffix" | sed -e "s,999.,android-,"`
@@ -16593,7 +16597,7 @@ echo "configure:16557: checking for android build-tools directory" >&5
# Extract the first word of "zipalign", so it can be a program name with args.
set dummy zipalign; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16597: checking for $ac_word" >&5
+echo "configure:16601: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ZIPALIGN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -16642,7 +16646,7 @@ fi
# Extract the first word of "dx", so it can be a program name with args.
set dummy dx; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16646: checking for $ac_word" >&5
+echo "configure:16650: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -16691,7 +16695,7 @@ fi
# Extract the first word of "aapt", so it can be a program name with args.
set dummy aapt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16695: checking for $ac_word" >&5
+echo "configure:16699: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AAPT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -16740,7 +16744,7 @@ fi
# Extract the first word of "aidl", so it can be a program name with args.
set dummy aidl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16744: checking for $ac_word" >&5
+echo "configure:16748: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AIDL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -16789,7 +16793,7 @@ fi
# Extract the first word of "adb", so it can be a program name with args.
set dummy adb; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16793: checking for $ac_word" >&5
+echo "configure:16797: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ADB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17143,7 +17147,7 @@ if test "$COMPILE_ENVIRONMENT"; 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:17147: checking for $ac_word" >&5
+echo "configure:17151: 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
@@ -17187,19 +17191,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES""... $ac_c" 1>&6
-echo "configure:17191: checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5
+echo "configure:17195: checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5
if $PKG_CONFIG --exists "gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GTK3_CFLAGS""... $ac_c" 1>&6
-echo "configure:17198: checking MOZ_GTK3_CFLAGS" >&5
+echo "configure:17202: checking MOZ_GTK3_CFLAGS" >&5
MOZ_GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES"`
echo "$ac_t""$MOZ_GTK3_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK3_LIBS""... $ac_c" 1>&6
-echo "configure:17203: checking MOZ_GTK3_LIBS" >&5
+echo "configure:17207: checking MOZ_GTK3_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GTK3_LIBS="`$PKG_CONFIG --libs \"gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GTK3_LIBS" 1>&6
@@ -17240,7 +17244,7 @@ echo "configure:17203: checking MOZ_GTK3_LIBS" >&5
# 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:17244: checking for $ac_word" >&5
+echo "configure:17248: 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
@@ -17284,19 +17288,19 @@ fi
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 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES""... $ac_c" 1>&6
-echo "configure:17288: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5
+echo "configure:17292: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5
if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
-echo "configure:17295: checking MOZ_GTK2_CFLAGS" >&5
+echo "configure:17299: checking MOZ_GTK2_CFLAGS" >&5
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
-echo "configure:17300: checking MOZ_GTK2_LIBS" >&5
+echo "configure:17304: checking MOZ_GTK2_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
@@ -17378,7 +17382,7 @@ fi
# 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:17382: checking for $ac_word" >&5
+echo "configure:17386: 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
@@ -17422,19 +17426,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
-echo "configure:17426: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
+echo "configure:17430: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
-echo "configure:17433: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
+echo "configure:17437: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
-echo "configure:17438: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
+echo "configure:17442: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
@@ -17532,7 +17536,7 @@ 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:17536: checking for $ac_word" >&5
+echo "configure:17540: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_QMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17577,7 +17581,7 @@ test -n "$HOST_QMAKE" || HOST_QMAKE=""""
# 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:17581: checking for $ac_word" >&5
+echo "configure:17585: 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
@@ -17621,19 +17625,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for Qt5Gui Qt5Network Qt5Core Qt5Quick""... $ac_c" 1>&6
-echo "configure:17625: checking for Qt5Gui Qt5Network Qt5Core Qt5Quick" >&5
+echo "configure:17629: checking for Qt5Gui Qt5Network Qt5Core Qt5Quick" >&5
if $PKG_CONFIG --exists "Qt5Gui Qt5Network Qt5Core Qt5Quick" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_QT_CFLAGS""... $ac_c" 1>&6
-echo "configure:17632: checking MOZ_QT_CFLAGS" >&5
+echo "configure:17636: checking MOZ_QT_CFLAGS" >&5
MOZ_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt5Gui Qt5Network Qt5Core Qt5Quick"`
echo "$ac_t""$MOZ_QT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_QT_LIBS""... $ac_c" 1>&6
-echo "configure:17637: checking MOZ_QT_LIBS" >&5
+echo "configure:17641: checking MOZ_QT_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_QT_LIBS="`$PKG_CONFIG --libs \"Qt5Gui Qt5Network Qt5Core Qt5Quick\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_QT_LIBS" 1>&6
@@ -17673,7 +17677,7 @@ echo "configure:17637: checking MOZ_QT_LIBS" >&5
# 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:17677: checking for $ac_word" >&5
+echo "configure:17681: 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
@@ -17717,19 +17721,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for Qt5PrintSupport""... $ac_c" 1>&6
-echo "configure:17721: checking for Qt5PrintSupport" >&5
+echo "configure:17725: checking for Qt5PrintSupport" >&5
if $PKG_CONFIG --exists "Qt5PrintSupport" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_QT_WIDGETS_CFLAGS""... $ac_c" 1>&6
-echo "configure:17728: checking MOZ_QT_WIDGETS_CFLAGS" >&5
+echo "configure:17732: checking MOZ_QT_WIDGETS_CFLAGS" >&5
MOZ_QT_WIDGETS_CFLAGS=`$PKG_CONFIG --cflags "Qt5PrintSupport"`
echo "$ac_t""$MOZ_QT_WIDGETS_CFLAGS" 1>&6
echo $ac_n "checking MOZ_QT_WIDGETS_LIBS""... $ac_c" 1>&6
-echo "configure:17733: checking MOZ_QT_WIDGETS_LIBS" >&5
+echo "configure:17737: checking MOZ_QT_WIDGETS_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_QT_WIDGETS_LIBS="`$PKG_CONFIG --libs \"Qt5PrintSupport\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_QT_WIDGETS_LIBS" 1>&6
@@ -17774,7 +17778,7 @@ 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:17778: checking for $ac_word" >&5
+echo "configure:17782: 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
@@ -17809,7 +17813,7 @@ 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:17813: checking for $ac_word" >&5
+echo "configure:17817: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_RCC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17882,7 +17886,7 @@ test -n "$HOST_RCC" || HOST_RCC=""""
# 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:17886: checking for $ac_word" >&5
+echo "configure:17890: 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
@@ -17926,19 +17930,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for qmsystem2""... $ac_c" 1>&6
-echo "configure:17930: checking for qmsystem2" >&5
+echo "configure:17934: checking for qmsystem2" >&5
if $PKG_CONFIG --exists "qmsystem2" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _QMSYSTEM2_CFLAGS""... $ac_c" 1>&6
-echo "configure:17937: checking _QMSYSTEM2_CFLAGS" >&5
+echo "configure:17941: checking _QMSYSTEM2_CFLAGS" >&5
_QMSYSTEM2_CFLAGS=`$PKG_CONFIG --cflags "qmsystem2"`
echo "$ac_t""$_QMSYSTEM2_CFLAGS" 1>&6
echo $ac_n "checking _QMSYSTEM2_LIBS""... $ac_c" 1>&6
-echo "configure:17942: checking _QMSYSTEM2_LIBS" >&5
+echo "configure:17946: checking _QMSYSTEM2_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_QMSYSTEM2_LIBS="`$PKG_CONFIG --libs \"qmsystem2\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_QMSYSTEM2_LIBS" 1>&6
@@ -17988,7 +17992,7 @@ EOF
# 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:17992: checking for $ac_word" >&5
+echo "configure:17996: 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
@@ -18032,19 +18036,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for QtNetwork >= 4.7""... $ac_c" 1>&6
-echo "configure:18036: checking for QtNetwork >= 4.7" >&5
+echo "configure:18040: checking for QtNetwork >= 4.7" >&5
if $PKG_CONFIG --exists "QtNetwork >= 4.7" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _QTNETWORK_CFLAGS""... $ac_c" 1>&6
-echo "configure:18043: checking _QTNETWORK_CFLAGS" >&5
+echo "configure:18047: checking _QTNETWORK_CFLAGS" >&5
_QTNETWORK_CFLAGS=`$PKG_CONFIG --cflags "QtNetwork >= 4.7"`
echo "$ac_t""$_QTNETWORK_CFLAGS" 1>&6
echo $ac_n "checking _QTNETWORK_LIBS""... $ac_c" 1>&6
-echo "configure:18048: checking _QTNETWORK_LIBS" >&5
+echo "configure:18052: checking _QTNETWORK_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_QTNETWORK_LIBS="`$PKG_CONFIG --libs \"QtNetwork >= 4.7\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_QTNETWORK_LIBS" 1>&6
@@ -18092,7 +18096,7 @@ EOF
# 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:18096: checking for $ac_word" >&5
+echo "configure:18100: 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
@@ -18136,19 +18140,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for QtSensors QtFeedback QtLocation""... $ac_c" 1>&6
-echo "configure:18140: checking for QtSensors QtFeedback QtLocation" >&5
+echo "configure:18144: checking for QtSensors QtFeedback QtLocation" >&5
if $PKG_CONFIG --exists "QtSensors QtFeedback QtLocation" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _QTMOBILITY_CFLAGS""... $ac_c" 1>&6
-echo "configure:18147: checking _QTMOBILITY_CFLAGS" >&5
+echo "configure:18151: checking _QTMOBILITY_CFLAGS" >&5
_QTMOBILITY_CFLAGS=`$PKG_CONFIG --cflags "QtSensors QtFeedback QtLocation"`
echo "$ac_t""$_QTMOBILITY_CFLAGS" 1>&6
echo $ac_n "checking _QTMOBILITY_LIBS""... $ac_c" 1>&6
-echo "configure:18152: checking _QTMOBILITY_LIBS" >&5
+echo "configure:18156: checking _QTMOBILITY_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_QTMOBILITY_LIBS="`$PKG_CONFIG --libs \"QtSensors QtFeedback QtLocation\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_QTMOBILITY_LIBS" 1>&6
@@ -18191,7 +18195,7 @@ EOF
else
echo $ac_n "checking for main in -lQtSensors""... $ac_c" 1>&6
-echo "configure:18195: checking for main in -lQtSensors" >&5
+echo "configure:18199: checking for main in -lQtSensors" >&5
ac_lib_var=`echo QtSensors'_'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
@@ -18199,14 +18203,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lQtSensors $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18203 "configure"
+#line 18207 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:18210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18214: \"$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
@@ -18242,7 +18246,7 @@ fi
# 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:18246: checking for $ac_word" >&5
+echo "configure:18250: 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
@@ -18286,19 +18290,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for Qt0Feedback""... $ac_c" 1>&6
-echo "configure:18290: checking for Qt0Feedback" >&5
+echo "configure:18294: checking for Qt0Feedback" >&5
if $PKG_CONFIG --exists "Qt0Feedback" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _QT5FEEDBACK_CFLAGS""... $ac_c" 1>&6
-echo "configure:18297: checking _QT5FEEDBACK_CFLAGS" >&5
+echo "configure:18301: checking _QT5FEEDBACK_CFLAGS" >&5
_QT5FEEDBACK_CFLAGS=`$PKG_CONFIG --cflags "Qt0Feedback"`
echo "$ac_t""$_QT5FEEDBACK_CFLAGS" 1>&6
echo $ac_n "checking _QT5FEEDBACK_LIBS""... $ac_c" 1>&6
-echo "configure:18302: checking _QT5FEEDBACK_LIBS" >&5
+echo "configure:18306: checking _QT5FEEDBACK_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_QT5FEEDBACK_LIBS="`$PKG_CONFIG --libs \"Qt0Feedback\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_QT5FEEDBACK_LIBS" 1>&6
@@ -18348,7 +18352,7 @@ EOF
# 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:18352: checking for $ac_word" >&5
+echo "configure:18356: 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
@@ -18392,19 +18396,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for Qt5Positioning""... $ac_c" 1>&6
-echo "configure:18396: checking for Qt5Positioning" >&5
+echo "configure:18400: checking for Qt5Positioning" >&5
if $PKG_CONFIG --exists "Qt5Positioning" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _QT5GEOPOSITION_CFLAGS""... $ac_c" 1>&6
-echo "configure:18403: checking _QT5GEOPOSITION_CFLAGS" >&5
+echo "configure:18407: checking _QT5GEOPOSITION_CFLAGS" >&5
_QT5GEOPOSITION_CFLAGS=`$PKG_CONFIG --cflags "Qt5Positioning"`
echo "$ac_t""$_QT5GEOPOSITION_CFLAGS" 1>&6
echo $ac_n "checking _QT5GEOPOSITION_LIBS""... $ac_c" 1>&6
-echo "configure:18408: checking _QT5GEOPOSITION_LIBS" >&5
+echo "configure:18412: checking _QT5GEOPOSITION_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_QT5GEOPOSITION_LIBS="`$PKG_CONFIG --libs \"Qt5Positioning\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_QT5GEOPOSITION_LIBS" 1>&6
@@ -18465,7 +18469,7 @@ EOF
# 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:18469: checking for $ac_word" >&5
+echo "configure:18473: 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
@@ -18509,19 +18513,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for contentaction-0.1""... $ac_c" 1>&6
-echo "configure:18513: checking for contentaction-0.1" >&5
+echo "configure:18517: checking for contentaction-0.1" >&5
if $PKG_CONFIG --exists "contentaction-0.1" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking LIBCONTENTACTION_CFLAGS""... $ac_c" 1>&6
-echo "configure:18520: checking LIBCONTENTACTION_CFLAGS" >&5
+echo "configure:18524: checking LIBCONTENTACTION_CFLAGS" >&5
LIBCONTENTACTION_CFLAGS=`$PKG_CONFIG --cflags "contentaction-0.1"`
echo "$ac_t""$LIBCONTENTACTION_CFLAGS" 1>&6
echo $ac_n "checking LIBCONTENTACTION_LIBS""... $ac_c" 1>&6
-echo "configure:18525: checking LIBCONTENTACTION_LIBS" >&5
+echo "configure:18529: checking LIBCONTENTACTION_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
LIBCONTENTACTION_LIBS="`$PKG_CONFIG --libs \"contentaction-0.1\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$LIBCONTENTACTION_LIBS" 1>&6
@@ -18679,7 +18683,7 @@ 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:18683: checking for $ac_word" >&5
+echo "configure:18687: 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
@@ -18723,19 +18727,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6
-echo "configure:18727: checking for pango >= $PANGO_VERSION" >&5
+echo "configure:18731: checking for pango >= $PANGO_VERSION" >&5
if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
-echo "configure:18734: checking _PANGOCHK_CFLAGS" >&5
+echo "configure:18738: checking _PANGOCHK_CFLAGS" >&5
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"`
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
-echo "configure:18739: checking _PANGOCHK_LIBS" >&5
+echo "configure:18743: checking _PANGOCHK_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
@@ -18771,7 +18775,7 @@ echo "configure:18739: checking _PANGOCHK_LIBS" >&5
# 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:18775: checking for $ac_word" >&5
+echo "configure:18779: 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
@@ -18815,19 +18819,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6
-echo "configure:18819: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5
+echo "configure:18823: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5
if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
-echo "configure:18826: checking MOZ_PANGO_CFLAGS" >&5
+echo "configure:18830: checking MOZ_PANGO_CFLAGS" >&5
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"`
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
-echo "configure:18831: checking MOZ_PANGO_LIBS" >&5
+echo "configure:18835: checking MOZ_PANGO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
@@ -18890,7 +18894,7 @@ fi
# 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:18894: checking for $ac_word" >&5
+echo "configure:18898: 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
@@ -18934,19 +18938,19 @@ fi
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:18938: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+echo "configure:18942: 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:18945: checking MOZ_GNOMEVFS_CFLAGS" >&5
+echo "configure:18949: 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:18950: checking MOZ_GNOMEVFS_LIBS" >&5
+echo "configure:18954: checking MOZ_GNOMEVFS_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
@@ -19020,7 +19024,7 @@ fi
# 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:19024: checking for $ac_word" >&5
+echo "configure:19028: 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
@@ -19064,19 +19068,19 @@ fi
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 >= 2.14""... $ac_c" 1>&6
-echo "configure:19068: checking for gtk+-2.0 >= 2.14" >&5
+echo "configure:19072: checking for gtk+-2.0 >= 2.14" >&5
if $PKG_CONFIG --exists "gtk+-2.0 >= 2.14" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _GTKCHECK_CFLAGS""... $ac_c" 1>&6
-echo "configure:19075: checking _GTKCHECK_CFLAGS" >&5
+echo "configure:19079: checking _GTKCHECK_CFLAGS" >&5
_GTKCHECK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14"`
echo "$ac_t""$_GTKCHECK_CFLAGS" 1>&6
echo $ac_n "checking _GTKCHECK_LIBS""... $ac_c" 1>&6
-echo "configure:19080: checking _GTKCHECK_LIBS" >&5
+echo "configure:19084: checking _GTKCHECK_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_GTKCHECK_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 2.14\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_GTKCHECK_LIBS" 1>&6
@@ -19112,7 +19116,7 @@ echo "configure:19080: checking _GTKCHECK_LIBS" >&5
# 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:19116: checking for $ac_word" >&5
+echo "configure:19120: 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
@@ -19156,19 +19160,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gio-2.0 >= $GIO_VERSION""... $ac_c" 1>&6
-echo "configure:19160: checking for gio-2.0 >= $GIO_VERSION" >&5
+echo "configure:19164: checking for gio-2.0 >= $GIO_VERSION" >&5
if $PKG_CONFIG --exists "gio-2.0 >= $GIO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GIO_CFLAGS""... $ac_c" 1>&6
-echo "configure:19167: checking MOZ_GIO_CFLAGS" >&5
+echo "configure:19171: checking MOZ_GIO_CFLAGS" >&5
MOZ_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_VERSION"`
echo "$ac_t""$MOZ_GIO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GIO_LIBS""... $ac_c" 1>&6
-echo "configure:19172: checking MOZ_GIO_LIBS" >&5
+echo "configure:19176: checking MOZ_GIO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GIO_LIBS="`$PKG_CONFIG --libs \"gio-2.0 >= $GIO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GIO_LIBS" 1>&6
@@ -19240,7 +19244,7 @@ fi
# 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:19244: checking for $ac_word" >&5
+echo "configure:19248: 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
@@ -19284,19 +19288,19 @@ fi
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 gobject-2.0 ""... $ac_c" 1>&6
-echo "configure:19288: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5
+echo "configure:19292: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5
if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION gobject-2.0 " ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
-echo "configure:19295: checking MOZ_GCONF_CFLAGS" >&5
+echo "configure:19299: checking MOZ_GCONF_CFLAGS" >&5
MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION gobject-2.0 "`
echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
-echo "configure:19300: checking MOZ_GCONF_LIBS" >&5
+echo "configure:19304: checking MOZ_GCONF_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION gobject-2.0 \" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
@@ -19377,7 +19381,7 @@ fi
# 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:19381: checking for $ac_word" >&5
+echo "configure:19385: 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
@@ -19421,19 +19425,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libproxy-1.0""... $ac_c" 1>&6
-echo "configure:19425: checking for libproxy-1.0" >&5
+echo "configure:19429: checking for libproxy-1.0" >&5
if $PKG_CONFIG --exists "libproxy-1.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_LIBPROXY_CFLAGS""... $ac_c" 1>&6
-echo "configure:19432: checking MOZ_LIBPROXY_CFLAGS" >&5
+echo "configure:19436: checking MOZ_LIBPROXY_CFLAGS" >&5
MOZ_LIBPROXY_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0"`
echo "$ac_t""$MOZ_LIBPROXY_CFLAGS" 1>&6
echo $ac_n "checking MOZ_LIBPROXY_LIBS""... $ac_c" 1>&6
-echo "configure:19437: checking MOZ_LIBPROXY_LIBS" >&5
+echo "configure:19441: checking MOZ_LIBPROXY_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_LIBPROXY_LIBS="`$PKG_CONFIG --libs \"libproxy-1.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_LIBPROXY_LIBS" 1>&6
@@ -19506,7 +19510,7 @@ fi
# 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:19510: checking for $ac_word" >&5
+echo "configure:19514: 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
@@ -19550,19 +19554,19 @@ fi
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:19554: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+echo "configure:19558: 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:19561: checking MOZ_GNOMEUI_CFLAGS" >&5
+echo "configure:19565: 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:19566: checking MOZ_GNOMEUI_LIBS" >&5
+echo "configure:19570: checking MOZ_GNOMEUI_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
@@ -19641,7 +19645,7 @@ fi
# 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:19645: checking for $ac_word" >&5
+echo "configure:19649: 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
@@ -19685,19 +19689,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for dbus-1 >= $DBUS_VERSION""... $ac_c" 1>&6
-echo "configure:19689: checking for dbus-1 >= $DBUS_VERSION" >&5
+echo "configure:19693: checking for dbus-1 >= $DBUS_VERSION" >&5
if $PKG_CONFIG --exists "dbus-1 >= $DBUS_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_DBUS_CFLAGS""... $ac_c" 1>&6
-echo "configure:19696: checking MOZ_DBUS_CFLAGS" >&5
+echo "configure:19700: checking MOZ_DBUS_CFLAGS" >&5
MOZ_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_VERSION"`
echo "$ac_t""$MOZ_DBUS_CFLAGS" 1>&6
echo $ac_n "checking MOZ_DBUS_LIBS""... $ac_c" 1>&6
-echo "configure:19701: checking MOZ_DBUS_LIBS" >&5
+echo "configure:19705: checking MOZ_DBUS_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_DBUS_LIBS="`$PKG_CONFIG --libs \"dbus-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_DBUS_LIBS" 1>&6
@@ -19732,7 +19736,7 @@ echo "configure:19701: checking MOZ_DBUS_LIBS" >&5
# 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:19736: checking for $ac_word" >&5
+echo "configure:19740: 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
@@ -19776,19 +19780,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6
-echo "configure:19780: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
+echo "configure:19784: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6
-echo "configure:19787: checking MOZ_DBUS_GLIB_CFLAGS" >&5
+echo "configure:19791: checking MOZ_DBUS_GLIB_CFLAGS" >&5
MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"`
echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6
echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6
-echo "configure:19792: checking MOZ_DBUS_GLIB_LIBS" >&5
+echo "configure:19796: checking MOZ_DBUS_GLIB_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6
@@ -20013,14 +20017,14 @@ if test -n "$MOZ_WEBRTC"; then
fi
cat > conftest.$ac_ext <<EOF
-#line 20017 "configure"
+#line 20021 "configure"
#include "confdefs.h"
#include <linux/ethtool.h>
int main() {
struct ethtool_cmd cmd; cmd.speed_hi = 0;
; return 0; }
EOF
-if { (eval echo configure:20024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI=1
else
@@ -20192,7 +20196,7 @@ fi
echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6
-echo "configure:20196: checking __attribute__ ((aligned ())) support" >&5
+echo "configure:20200: checking __attribute__ ((aligned ())) support" >&5
if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20202,14 +20206,14 @@ else
for ac_cv_c_attr_align_try in 64 32 16 8; do
echo "trying $ac_cv_c_attr_align_try"
cat > conftest.$ac_ext <<EOF
-#line 20206 "configure"
+#line 20210 "configure"
#include "confdefs.h"
int main() {
static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;
; return 0; }
EOF
-if { (eval echo configure:20213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"
else
@@ -20537,7 +20541,7 @@ EOF
# 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:20541: checking for $ac_word" >&5
+echo "configure:20545: 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
@@ -20581,19 +20585,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for vpx >= 1.3.0""... $ac_c" 1>&6
-echo "configure:20585: checking for vpx >= 1.3.0" >&5
+echo "configure:20589: checking for vpx >= 1.3.0" >&5
if $PKG_CONFIG --exists "vpx >= 1.3.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_LIBVPX_CFLAGS""... $ac_c" 1>&6
-echo "configure:20592: checking MOZ_LIBVPX_CFLAGS" >&5
+echo "configure:20596: checking MOZ_LIBVPX_CFLAGS" >&5
MOZ_LIBVPX_CFLAGS=`$PKG_CONFIG --cflags "vpx >= 1.3.0"`
echo "$ac_t""$MOZ_LIBVPX_CFLAGS" 1>&6
echo $ac_n "checking MOZ_LIBVPX_LIBS""... $ac_c" 1>&6
-echo "configure:20597: checking MOZ_LIBVPX_LIBS" >&5
+echo "configure:20601: checking MOZ_LIBVPX_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_LIBVPX_LIBS="`$PKG_CONFIG --libs \"vpx >= 1.3.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_LIBVPX_LIBS" 1>&6
@@ -20628,12 +20632,12 @@ echo "configure:20597: checking MOZ_LIBVPX_LIBS" >&5
ac_safe=`echo "vpx/vpx_decoder.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vpx/vpx_decoder.h""... $ac_c" 1>&6
-echo "configure:20632: checking for vpx/vpx_decoder.h" >&5
+echo "configure:20636: checking for vpx/vpx_decoder.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20637 "configure"
+#line 20641 "configure"
#include "confdefs.h"
#include <vpx/vpx_decoder.h>
@@ -20641,7 +20645,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:20645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -20663,7 +20667,7 @@ fi
echo $ac_n "checking for vpx_codec_dec_init_ver in -lvpx""... $ac_c" 1>&6
-echo "configure:20667: checking for vpx_codec_dec_init_ver in -lvpx" >&5
+echo "configure:20671: checking for vpx_codec_dec_init_ver in -lvpx" >&5
ac_lib_var=`echo vpx'_'vpx_codec_dec_init_ver | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -20671,7 +20675,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lvpx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 20675 "configure"
+#line 20679 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -20682,7 +20686,7 @@ int main() {
vpx_codec_dec_init_ver()
; return 0; }
EOF
-if { (eval echo configure:20686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20690: \"$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
@@ -20716,12 +20720,12 @@ fi
ac_safe=`echo "vpx_mem/vpx_mem.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vpx_mem/vpx_mem.h""... $ac_c" 1>&6
-echo "configure:20720: checking for vpx_mem/vpx_mem.h" >&5
+echo "configure:20724: checking for vpx_mem/vpx_mem.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20725 "configure"
+#line 20729 "configure"
#include "confdefs.h"
#include <vpx_mem/vpx_mem.h>
@@ -20729,7 +20733,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:20733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -20744,12 +20748,12 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for vpx_mem_set_functions""... $ac_c" 1>&6
-echo "configure:20748: checking for vpx_mem_set_functions" >&5
+echo "configure:20752: checking for vpx_mem_set_functions" >&5
if eval "test \"`echo '$''{'ac_cv_func_vpx_mem_set_functions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20753 "configure"
+#line 20757 "configure"
#define vpx_mem_set_functions innocuous_vpx_mem_set_functions
#include "confdefs.h"
#undef vpx_mem_set_functions
@@ -20776,7 +20780,7 @@ vpx_mem_set_functions();
; return 0; }
EOF
-if { (eval echo configure:20780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vpx_mem_set_functions=yes"
else
@@ -21009,7 +21013,7 @@ if test -n "$MOZ_ALSA"; 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:21013: checking for $ac_word" >&5
+echo "configure:21017: 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
@@ -21053,19 +21057,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for alsa""... $ac_c" 1>&6
-echo "configure:21057: checking for alsa" >&5
+echo "configure:21061: checking for alsa" >&5
if $PKG_CONFIG --exists "alsa" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_ALSA_CFLAGS""... $ac_c" 1>&6
-echo "configure:21064: checking MOZ_ALSA_CFLAGS" >&5
+echo "configure:21068: checking MOZ_ALSA_CFLAGS" >&5
MOZ_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa"`
echo "$ac_t""$MOZ_ALSA_CFLAGS" 1>&6
echo $ac_n "checking MOZ_ALSA_LIBS""... $ac_c" 1>&6
-echo "configure:21069: checking MOZ_ALSA_LIBS" >&5
+echo "configure:21073: checking MOZ_ALSA_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_ALSA_LIBS="`$PKG_CONFIG --libs \"alsa\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_ALSA_LIBS" 1>&6
@@ -21133,7 +21137,7 @@ if test -n "$MOZ_PULSEAUDIO"; 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:21137: checking for $ac_word" >&5
+echo "configure:21141: 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
@@ -21177,19 +21181,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libpulse""... $ac_c" 1>&6
-echo "configure:21181: checking for libpulse" >&5
+echo "configure:21185: checking for libpulse" >&5
if $PKG_CONFIG --exists "libpulse" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PULSEAUDIO_CFLAGS""... $ac_c" 1>&6
-echo "configure:21188: checking MOZ_PULSEAUDIO_CFLAGS" >&5
+echo "configure:21192: checking MOZ_PULSEAUDIO_CFLAGS" >&5
MOZ_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse"`
echo "$ac_t""$MOZ_PULSEAUDIO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PULSEAUDIO_LIBS""... $ac_c" 1>&6
-echo "configure:21193: checking MOZ_PULSEAUDIO_LIBS" >&5
+echo "configure:21197: checking MOZ_PULSEAUDIO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_PULSEAUDIO_LIBS="`$PKG_CONFIG --libs \"libpulse\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_PULSEAUDIO_LIBS" 1>&6
@@ -21265,7 +21269,7 @@ if test -n "$MOZ_GSTREAMER"; 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:21269: checking for $ac_word" >&5
+echo "configure:21273: 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
@@ -21311,7 +21315,7 @@ fi
echo $ac_n "checking for gstreamer-$GST_API_VERSION >= $GST_VERSION
gstreamer-app-$GST_API_VERSION
gstreamer-plugins-base-$GST_API_VERSION""... $ac_c" 1>&6
-echo "configure:21315: checking for gstreamer-$GST_API_VERSION >= $GST_VERSION
+echo "configure:21319: checking for gstreamer-$GST_API_VERSION >= $GST_VERSION
gstreamer-app-$GST_API_VERSION
gstreamer-plugins-base-$GST_API_VERSION" >&5
@@ -21322,14 +21326,14 @@ echo "configure:21315: checking for gstreamer-$GST_API_VERSION >= $GST_VERSION
succeeded=yes
echo $ac_n "checking GSTREAMER_CFLAGS""... $ac_c" 1>&6
-echo "configure:21326: checking GSTREAMER_CFLAGS" >&5
+echo "configure:21330: checking GSTREAMER_CFLAGS" >&5
GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_API_VERSION >= $GST_VERSION
gstreamer-app-$GST_API_VERSION
gstreamer-plugins-base-$GST_API_VERSION"`
echo "$ac_t""$GSTREAMER_CFLAGS" 1>&6
echo $ac_n "checking GSTREAMER_LIBS""... $ac_c" 1>&6
-echo "configure:21333: checking GSTREAMER_LIBS" >&5
+echo "configure:21337: checking GSTREAMER_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
GSTREAMER_LIBS="`$PKG_CONFIG --libs \"gstreamer-$GST_API_VERSION >= $GST_VERSION
gstreamer-app-$GST_API_VERSION
@@ -21369,14 +21373,14 @@ echo "configure:21333: checking GSTREAMER_LIBS" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
cat > conftest.$ac_ext <<EOF
-#line 21373 "configure"
+#line 21377 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:21380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
_HAVE_LIBGSTVIDEO=1
else
@@ -21511,7 +21515,7 @@ fi
# Extract the first word of "java", so it can be a program name with args.
set dummy java; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21515: checking for $ac_word" >&5
+echo "configure:21519: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -21560,7 +21564,7 @@ fi
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21564: checking for $ac_word" >&5
+echo "configure:21568: 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
@@ -21609,7 +21613,7 @@ fi
# Extract the first word of "javah", so it can be a program name with args.
set dummy javah; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21613: checking for $ac_word" >&5
+echo "configure:21617: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAVAH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -21658,7 +21662,7 @@ fi
# Extract the first word of "jar", so it can be a program name with args.
set dummy jar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21662: checking for $ac_word" >&5
+echo "configure:21666: 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
@@ -21707,7 +21711,7 @@ fi
# Extract the first word of "jarsigner", so it can be a program name with args.
set dummy jarsigner; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21711: checking for $ac_word" >&5
+echo "configure:21715: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JARSIGNER'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -21756,7 +21760,7 @@ fi
# Extract the first word of "keytool", so it can be a program name with args.
set dummy keytool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:21760: checking for $ac_word" >&5
+echo "configure:21764: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KEYTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -21924,12 +21928,12 @@ fi
if test "$OS_TARGET" = "WINNT" -a -n "$GNU_CC"; then
ac_safe=`echo "d3d10.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for d3d10.h""... $ac_c" 1>&6
-echo "configure:21928: checking for d3d10.h" >&5
+echo "configure:21932: checking for d3d10.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 21933 "configure"
+#line 21937 "configure"
#include "confdefs.h"
#include <d3d10.h>
@@ -21937,7 +21941,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:21941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:21945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -22083,12 +22087,12 @@ if test "$MOZ_GAMEPAD"; then
Linux)
ac_safe=`echo "linux/joystick.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/joystick.h""... $ac_c" 1>&6
-echo "configure:22087: checking for linux/joystick.h" >&5
+echo "configure:22091: checking for linux/joystick.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 22092 "configure"
+#line 22096 "configure"
#include "confdefs.h"
#include <linux/joystick.h>
@@ -22096,7 +22100,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:22100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:22104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -22194,7 +22198,7 @@ EOF
# 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:22198: checking for $ac_word" >&5
+echo "configure:22202: 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
@@ -22238,19 +22242,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6
-echo "configure:22242: checking for gthread-2.0" >&5
+echo "configure:22246: checking for gthread-2.0" >&5
if $PKG_CONFIG --exists "gthread-2.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6
-echo "configure:22249: checking MOZ_GTHREAD_CFLAGS" >&5
+echo "configure:22253: checking MOZ_GTHREAD_CFLAGS" >&5
MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6
-echo "configure:22254: checking MOZ_GTHREAD_LIBS" >&5
+echo "configure:22258: checking MOZ_GTHREAD_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6
@@ -22567,7 +22571,7 @@ 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:22571: checking for $ac_word" >&5
+echo "configure:22575: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKENSISU'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -22633,7 +22637,7 @@ done
MAKENSISU_MINOR_VER=`echo $MAKENSISU_PARSED_VER | $AWK -F\. '{ print $2 }'`
fi
echo $ac_n "checking for Unicode NSIS version $MIN_NSIS_MAJOR_VER.$MIN_NSIS_MINOR_VER or greater""... $ac_c" 1>&6
-echo "configure:22637: checking for Unicode NSIS version $MIN_NSIS_MAJOR_VER.$MIN_NSIS_MINOR_VER or greater" >&5
+echo "configure:22641: checking for Unicode NSIS version $MIN_NSIS_MAJOR_VER.$MIN_NSIS_MINOR_VER or greater" >&5
if test "$MAKENSISU_MAJOR_VER" -eq $MIN_NSIS_MAJOR_VER -a \
"$MAKENSISU_MINOR_VER" -ge $MIN_NSIS_MINOR_VER ||
test "$MAKENSISU_MAJOR_VER" -gt $MIN_NSIS_MAJOR_VER; then
@@ -22683,13 +22687,13 @@ EOF
fi
echo $ac_n "checking for tar archiver""... $ac_c" 1>&6
-echo "configure:22687: checking for tar archiver" >&5
+echo "configure:22691: checking for tar archiver" >&5
for ac_prog in gnutar gtar tar
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:22693: checking for $ac_word" >&5
+echo "configure:22697: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -22726,13 +22730,13 @@ echo "$ac_t""$TAR" 1>&6
echo $ac_n "checking for wget""... $ac_c" 1>&6
-echo "configure:22730: checking for wget" >&5
+echo "configure:22734: checking for wget" >&5
for ac_prog in wget
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:22736: checking for $ac_word" >&5
+echo "configure:22740: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23120,7 +23124,7 @@ else
# 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:23124: checking for $ac_word" >&5
+echo "configure:23128: 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
@@ -23164,19 +23168,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6
-echo "configure:23168: checking for sqlite3 >= $SQLITE_VERSION" >&5
+echo "configure:23172: checking for sqlite3 >= $SQLITE_VERSION" >&5
if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6
-echo "configure:23175: checking SQLITE_CFLAGS" >&5
+echo "configure:23179: checking SQLITE_CFLAGS" >&5
SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"`
echo "$ac_t""$SQLITE_CFLAGS" 1>&6
echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6
-echo "configure:23180: checking SQLITE_LIBS" >&5
+echo "configure:23184: checking SQLITE_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$SQLITE_LIBS" 1>&6
@@ -23207,7 +23211,7 @@ echo "configure:23180: checking SQLITE_LIBS" >&5
echo $ac_n "checking for SQLITE_SECURE_DELETE support in system SQLite""... $ac_c" 1>&6
-echo "configure:23211: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5
+echo "configure:23215: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SQLITE_CFLAGS"
_SAVE_LIBS="$LIBS"
@@ -23221,7 +23225,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 23225 "configure"
+#line 23229 "configure"
#include "confdefs.h"
#include "sqlite3.h"
@@ -23230,7 +23234,7 @@ else
return !sqlite3_compileoption_used("SQLITE_SECURE_DELETE");
}
EOF
-if { (eval echo configure:23234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:23238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sqlite_secure_delete=yes
else
@@ -23253,7 +23257,7 @@ fi
fi
echo $ac_n "checking for SQLITE_THREADSAFE support in system SQLite""... $ac_c" 1>&6
-echo "configure:23257: checking for SQLITE_THREADSAFE support in system SQLite" >&5
+echo "configure:23261: checking for SQLITE_THREADSAFE support in system SQLite" >&5
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SQLITE_CFLAGS"
_SAVE_LIBS="$LIBS"
@@ -23267,7 +23271,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 23271 "configure"
+#line 23275 "configure"
#include "confdefs.h"
#include "sqlite3.h"
@@ -23276,7 +23280,7 @@ else
return !sqlite3_compileoption_used("SQLITE_THREADSAFE=1");
}
EOF
-if { (eval echo configure:23280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:23284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sqlite_threadsafe=yes
else
@@ -23299,7 +23303,7 @@ fi
fi
echo $ac_n "checking for SQLITE_ENABLE_FTS3 support in system SQLite""... $ac_c" 1>&6
-echo "configure:23303: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5
+echo "configure:23307: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SQLITE_CFLAGS"
_SAVE_LIBS="$LIBS"
@@ -23313,7 +23317,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 23317 "configure"
+#line 23321 "configure"
#include "confdefs.h"
#include "sqlite3.h"
@@ -23322,7 +23326,7 @@ else
return !sqlite3_compileoption_used("SQLITE_ENABLE_FTS3");
}
EOF
-if { (eval echo configure:23326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:23330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sqlite_enable_fts3=yes
else
@@ -23345,7 +23349,7 @@ fi
fi
echo $ac_n "checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite""... $ac_c" 1>&6
-echo "configure:23349: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5
+echo "configure:23353: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $SQLITE_CFLAGS"
_SAVE_LIBS="$LIBS"
@@ -23359,7 +23363,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 23363 "configure"
+#line 23367 "configure"
#include "confdefs.h"
#include "sqlite3.h"
@@ -23368,7 +23372,7 @@ else
return !sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY");
}
EOF
-if { (eval echo configure:23372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:23376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sqlite_enable_unlock_notify=yes
else
@@ -23603,18 +23607,18 @@ fi
if test "$COMPILE_ENVIRONMENT"; then
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
-echo "configure:23607: checking for valid optimization flags" >&5
+echo "configure:23611: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <<EOF
-#line 23611 "configure"
+#line 23615 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:23618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -23663,7 +23667,7 @@ elif test "$GNU_CC"; then
# platform-specific API becomes deprecated.
echo $ac_n "checking whether the C compiler supports -Wno-error=uninitialized""... $ac_c" 1>&6
-echo "configure:23667: checking whether the C compiler supports -Wno-error=uninitialized" >&5
+echo "configure:23671: checking whether the C compiler supports -Wno-error=uninitialized" >&5
if eval "test \"`echo '$''{'ac_c_has_noerror_uninitialized'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23679,14 +23683,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wno-error=uninitialized"
cat > conftest.$ac_ext <<EOF
-#line 23683 "configure"
+#line 23687 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_noerror_uninitialized="yes"
else
@@ -23714,7 +23718,7 @@ echo "$ac_t""$ac_c_has_noerror_uninitialized" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wno-error=uninitialized""... $ac_c" 1>&6
-echo "configure:23718: checking whether the C++ compiler supports -Wno-error=uninitialized" >&5
+echo "configure:23722: checking whether the C++ compiler supports -Wno-error=uninitialized" >&5
if eval "test \"`echo '$''{'ac_cxx_has_noerror_uninitialized'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23730,14 +23734,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wno-error=uninitialized"
cat > conftest.$ac_ext <<EOF
-#line 23734 "configure"
+#line 23738 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_noerror_uninitialized="yes"
else
@@ -23765,7 +23769,7 @@ echo "$ac_t""$ac_cxx_has_noerror_uninitialized" 1>&6
echo $ac_n "checking whether the C compiler supports -Wno-error=maybe-uninitialized""... $ac_c" 1>&6
-echo "configure:23769: checking whether the C compiler supports -Wno-error=maybe-uninitialized" >&5
+echo "configure:23773: checking whether the C compiler supports -Wno-error=maybe-uninitialized" >&5
if eval "test \"`echo '$''{'ac_c_has_noerror_maybe_uninitialized'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23781,14 +23785,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wno-error=maybe-uninitialized"
cat > conftest.$ac_ext <<EOF
-#line 23785 "configure"
+#line 23789 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_noerror_maybe_uninitialized="yes"
else
@@ -23816,7 +23820,7 @@ echo "$ac_t""$ac_c_has_noerror_maybe_uninitialized" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wno-error=maybe-uninitialized""... $ac_c" 1>&6
-echo "configure:23820: checking whether the C++ compiler supports -Wno-error=maybe-uninitialized" >&5
+echo "configure:23824: checking whether the C++ compiler supports -Wno-error=maybe-uninitialized" >&5
if eval "test \"`echo '$''{'ac_cxx_has_noerror_maybe_uninitialized'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23832,14 +23836,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wno-error=maybe-uninitialized"
cat > conftest.$ac_ext <<EOF
-#line 23836 "configure"
+#line 23840 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_noerror_maybe_uninitialized="yes"
else
@@ -23867,7 +23871,7 @@ echo "$ac_t""$ac_cxx_has_noerror_maybe_uninitialized" 1>&6
echo $ac_n "checking whether the C compiler supports -Wno-error=deprecated-declarations""... $ac_c" 1>&6
-echo "configure:23871: checking whether the C compiler supports -Wno-error=deprecated-declarations" >&5
+echo "configure:23875: checking whether the C compiler supports -Wno-error=deprecated-declarations" >&5
if eval "test \"`echo '$''{'ac_c_has_noerror_deprecated_declarations'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23883,14 +23887,14 @@ cross_compiling=$ac_cv_prog_cc_cross
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
cat > conftest.$ac_ext <<EOF
-#line 23887 "configure"
+#line 23891 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_c_has_noerror_deprecated_declarations="yes"
else
@@ -23918,7 +23922,7 @@ echo "$ac_t""$ac_c_has_noerror_deprecated_declarations" 1>&6
echo $ac_n "checking whether the C++ compiler supports -Wno-error=deprecated-declarations""... $ac_c" 1>&6
-echo "configure:23922: checking whether the C++ compiler supports -Wno-error=deprecated-declarations" >&5
+echo "configure:23926: checking whether the C++ compiler supports -Wno-error=deprecated-declarations" >&5
if eval "test \"`echo '$''{'ac_cxx_has_noerror_deprecated_declarations'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23934,14 +23938,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations"
cat > conftest.$ac_ext <<EOF
-#line 23938 "configure"
+#line 23942 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:23945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cxx_has_noerror_deprecated_declarations="yes"
else
@@ -24194,12 +24198,12 @@ elif test -n "$MOZ_REPLACE_MALLOC"; then
if test -n "$MACOSX_DEPLOYMENT_TARGET"; then
echo $ac_n "checking how to do weak dynamic linking""... $ac_c" 1>&6
-echo "configure:24198: checking how to do weak dynamic linking" >&5
+echo "configure:24202: checking how to do weak dynamic linking" >&5
if eval "test \"`echo '$''{'ac_cv_weak_dynamic_linking'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'extern void foo() __attribute__((weak_import));int bar() { if (foo) foo(); return 0; }' > conftest.c
- if { ac_try='${CC-cc} -o conftest${DLL_SUFFIX} $CFLAGS -dynamiclib $LDFLAGS -Wl,-U,_foo conftest.c $LIBS 1>&5'; { (eval echo configure:24203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ if { ac_try='${CC-cc} -o conftest${DLL_SUFFIX} $CFLAGS -dynamiclib $LDFLAGS -Wl,-U,_foo conftest.c $LIBS 1>&5'; { (eval echo configure:24207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
test -s conftest${DLL_SUFFIX}; then
if otool -l conftest${DLL_SUFFIX} 2> /dev/null | grep "LC_DYLD_INFO_ONLY" > /dev/null; then
_CLASSIC_INFO=
@@ -24243,12 +24247,12 @@ if test -z "$MOZ_MEMORY"; then
for ac_func in mallctl nallocm
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:24247: checking for $ac_func" >&5
+echo "configure:24251: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 24252 "configure"
+#line 24256 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -24275,7 +24279,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:24279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -24569,117 +24573,6 @@ EOF
fi
-JSGC_INCREMENTAL=1
-# Check whether --enable-gcincremental or --disable-gcincremental was given.
-if test "${enable_gcincremental+set}" = set; then
- enableval="$enable_gcincremental"
- if test "$enableval" = "no"; then
- JSGC_INCREMENTAL=
- elif test "$enableval" = "yes"; then
- :
- else
- { echo "configure: error: Option, gcincremental, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, gcincremental, does not take an argument ($enableval)." 1>&5; exit 1; }
- fi
-fi
-
-if test -n "$JSGC_INCREMENTAL"; then
- cat >> confdefs.pytmp <<\EOF
- (''' JSGC_INCREMENTAL ''', ' 1 ')
-EOF
-cat >> confdefs.h <<\EOF
-#define JSGC_INCREMENTAL 1
-EOF
-
-fi
-
-# Check whether --enable-exact-rooting or --disable-exact-rooting was given.
-if test "${enable_exact_rooting+set}" = set; then
- enableval="$enable_exact_rooting"
- if test "$enableval" = "no"; then
- JSGC_USE_EXACT_ROOTING=
- elif test "$enableval" = "yes"; then
- JSGC_USE_EXACT_ROOTING=1
- else
- { echo "configure: error: Option, exact-rooting, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, exact-rooting, does not take an argument ($enableval)." 1>&5; exit 1; }
- fi
-fi
-
-if test -n "$JSGC_USE_EXACT_ROOTING"; then
- cat >> confdefs.pytmp <<\EOF
- (''' JSGC_USE_EXACT_ROOTING ''', ' 1 ')
-EOF
-cat >> confdefs.h <<\EOF
-#define JSGC_USE_EXACT_ROOTING 1
-EOF
-
-fi
-
-# Check whether --enable-gcgenerational or --disable-gcgenerational was given.
-if test "${enable_gcgenerational+set}" = set; then
- enableval="$enable_gcgenerational"
- if test "$enableval" = "yes"; then
- JSGC_GENERATIONAL=1
- elif test "$enableval" = "no"; then
- JSGC_GENERATIONAL=
- else
- { echo "configure: error: Option, gcgenerational, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, gcgenerational, does not take an argument ($enableval)." 1>&5; exit 1; }
- fi
-fi
-
-if test -n "$JSGC_GENERATIONAL"; then
- cat >> confdefs.pytmp <<\EOF
- (''' JSGC_GENERATIONAL ''', ' 1 ')
-EOF
-cat >> confdefs.h <<\EOF
-#define JSGC_GENERATIONAL 1
-EOF
-
-fi
-
-# Check whether --enable-gczeal or --disable-gczeal was given.
-if test "${enable_gczeal+set}" = set; then
- enableval="$enable_gczeal"
- if test "$enableval" = "yes"; then
- JS_GC_ZEAL=1
- elif test "$enableval" = "no"; then
- JS_GC_ZEAL=
- else
- { echo "configure: error: Option, gczeal, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, gczeal, does not take an argument ($enableval)." 1>&5; exit 1; }
- fi
-fi
-
-if test -n "$JS_GC_ZEAL" -o -n "$MOZ_DEBUG"; then
- cat >> confdefs.pytmp <<\EOF
- (''' JS_GC_ZEAL ''', ' 1 ')
-EOF
-cat >> confdefs.h <<\EOF
-#define JS_GC_ZEAL 1
-EOF
-
-fi
-
-# Check whether --enable-root-analysis or --disable-root-analysis was given.
-if test "${enable_root_analysis+set}" = set; then
- enableval="$enable_root_analysis"
- if test "$enableval" = "yes"; then
- JSGC_ROOT_ANALYSIS=1
- elif test "$enableval" = "no"; then
- JSGC_ROOT_ANALYSIS=
- else
- { echo "configure: error: Option, root-analysis, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, root-analysis, does not take an argument ($enableval)." 1>&5; exit 1; }
- fi
-fi
-
-if test -n "$JSGC_ROOT_ANALYSIS"; then
- cat >> confdefs.pytmp <<\EOF
- (''' JSGC_ROOT_ANALYSIS ''', ' 1 ')
-EOF
-cat >> confdefs.h <<\EOF
-#define JSGC_ROOT_ANALYSIS 1
-EOF
-
-fi
-
# Check whether --with-ccache or --without-ccache was given.
if test "${with_ccache+set}" = set; then
@@ -24703,7 +24596,7 @@ 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:24707: checking for $ac_word" >&5
+echo "configure:24600: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -24889,12 +24782,12 @@ fi
if test -n "$COMPILE_ENVIRONMENT" -a -n "$USE_ELF_HACK"; then
echo $ac_n "checking whether linker creates PT_GNU_RELRO segments""... $ac_c" 1>&6
-echo "configure:24893: checking whether linker creates PT_GNU_RELRO segments" >&5
+echo "configure:24786: checking whether linker creates PT_GNU_RELRO segments" >&5
if eval "test \"`echo '$''{'LINK_WITH_PT_GNU_RELRO'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "int main() {return 0;}" > conftest.${ac_ext}
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:24898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:24791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
test -s conftest${ac_exeext}; then
if ${TOOLCHAIN_PREFIX}readelf -l conftest${ac_exeext} | grep GNU_RELRO > /dev/null; then
LINK_WITH_PT_GNU_RELRO=yes
@@ -24911,18 +24804,18 @@ echo "$ac_t""$LINK_WITH_PT_GNU_RELRO" 1>&6
if test "$LINK_WITH_PT_GNU_RELRO" = yes; then
if test "$USE_ELF_HACK" = F; then
echo $ac_n "checking for -z norelro option to ld""... $ac_c" 1>&6
-echo "configure:24915: checking for -z norelro option to ld" >&5
+echo "configure:24808: checking for -z norelro option to ld" >&5
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-z,norelro"
cat > conftest.$ac_ext <<EOF
-#line 24919 "configure"
+#line 24812 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:24926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,-z,norelro"
@@ -25243,12 +25136,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_func in __cxa_demangle
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:25247: checking for $ac_func" >&5
+echo "configure:25140: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 25252 "configure"
+#line 25145 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -25278,7 +25171,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:25282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -25340,12 +25233,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for unwind.h""... $ac_c" 1>&6
-echo "configure:25344: checking for unwind.h" >&5
+echo "configure:25237: checking for unwind.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 25349 "configure"
+#line 25242 "configure"
#include "confdefs.h"
#include <unwind.h>
@@ -25353,7 +25246,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:25357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:25250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -25370,12 +25263,12 @@ fi
for ac_func in _Unwind_Backtrace
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:25374: checking for $ac_func" >&5
+echo "configure:25267: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 25379 "configure"
+#line 25272 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -25407,7 +25300,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:25411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -25591,7 +25484,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for -pipe support""... $ac_c" 1>&6
-echo "configure:25595: checking for -pipe support" >&5
+echo "configure:25488: checking for -pipe support" >&5
if test -n "$GNU_CC" -a -n "$GNU_CXX"; then
CFLAGS="$CFLAGS -pipe"
CXXFLAGS="$CXXFLAGS -pipe"
@@ -25605,16 +25498,16 @@ _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction"
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:25609: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:25502: checking whether C compiler supports -fprofile-generate" >&5
cat > conftest.$ac_ext <<EOF
-#line 25611 "configure"
+#line 25504 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:25618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:25511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-generate"
result="yes"
@@ -25665,12 +25558,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
_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:25669: checking for correct overload resolution with const and templates" >&5
+echo "configure:25562: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 25674 "configure"
+#line 25567 "configure"
#include "confdefs.h"
template <class T>
@@ -25700,7 +25593,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:25704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:25597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@@ -25745,20 +25638,20 @@ if test "$COMPILE_ENVIRONMENT"; then
echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6
-echo "configure:25749: checking what kind of list files are supported by the linker" >&5
+echo "configure:25642: checking what kind of list files are supported by the linker" >&5
if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "int main() {return 0;}" > conftest.${ac_ext}
- if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:25754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
+ if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:25647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:25756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:25649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=linkerscript
else
echo "conftest.${OBJ_SUFFIX}" > conftest.list
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:25760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:25653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=filelist
- elif { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:25762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ elif { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:25655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=list
else
EXPAND_LIBS_LIST_STYLE=none
@@ -25778,7 +25671,7 @@ LIBS_DESC_SUFFIX=desc
if test "$GCC_USE_GNU_LD"; then
echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6
-echo "configure:25782: checking what kind of ordering can be done with the linker" >&5
+echo "configure:25675: checking what kind of ordering can be done with the linker" >&5
if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -25786,14 +25679,14 @@ else
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order"
cat > conftest.$ac_ext <<EOF
-#line 25790 "configure"
+#line 25683 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:25797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
EXPAND_LIBS_ORDER_STYLE=section-ordering-file
else
@@ -25805,7 +25698,7 @@ fi
rm -f conftest*
LDFLAGS="$_SAVE_LDFLAGS"
if test -z "$EXPAND_LIBS_ORDER_STYLE"; then
- if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:25809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:25702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
EXPAND_LIBS_ORDER_STYLE=linkerscript
else
EXPAND_LIBS_ORDER_STYLE=none
@@ -25897,7 +25790,7 @@ if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; 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:25901: checking for $ac_word" >&5
+echo "configure:25794: 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
@@ -25941,19 +25834,19 @@ fi
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 gobject-2.0""... $ac_c" 1>&6
-echo "configure:25945: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
+echo "configure:25838: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
-echo "configure:25952: checking GLIB_CFLAGS" >&5
+echo "configure:25845: checking GLIB_CFLAGS" >&5
GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"`
echo "$ac_t""$GLIB_CFLAGS" 1>&6
echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
-echo "configure:25957: checking GLIB_LIBS" >&5
+echo "configure:25850: checking GLIB_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$GLIB_LIBS" 1>&6
@@ -26044,7 +25937,7 @@ if test "$USE_FC_FREETYPE"; 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:26048: checking for $ac_word" >&5
+echo "configure:25941: 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
@@ -26088,19 +25981,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for freetype2 >= 6.1.0""... $ac_c" 1>&6
-echo "configure:26092: checking for freetype2 >= 6.1.0" >&5
+echo "configure:25985: checking for freetype2 >= 6.1.0" >&5
if $PKG_CONFIG --exists "freetype2 >= 6.1.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking FT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:26099: checking FT2_CFLAGS" >&5
+echo "configure:25992: checking FT2_CFLAGS" >&5
FT2_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 6.1.0"`
echo "$ac_t""$FT2_CFLAGS" 1>&6
echo $ac_n "checking FT2_LIBS""... $ac_c" 1>&6
-echo "configure:26104: checking FT2_LIBS" >&5
+echo "configure:25997: checking FT2_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
FT2_LIBS="`$PKG_CONFIG --libs \"freetype2 >= 6.1.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$FT2_LIBS" 1>&6
@@ -26137,12 +26030,12 @@ echo "configure:26104: checking FT2_LIBS" >&5
CFLAGS="$CFLAGS $FT2_CFLAGS"
echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6
-echo "configure:26141: checking for FT_Bitmap_Size.y_ppem" >&5
+echo "configure:26034: checking for FT_Bitmap_Size.y_ppem" >&5
if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26146 "configure"
+#line 26039 "configure"
#include "confdefs.h"
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -26152,7 +26045,7 @@ FT_Bitmap_Size s;
return 1
; return 0; }
EOF
-if { (eval echo configure:26156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:26049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_member_FT_Bitmap_Size_y_ppem=yes
else
@@ -26181,12 +26074,12 @@ EOF
for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:26185: checking for $ac_func" >&5
+echo "configure:26078: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26190 "configure"
+#line 26083 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -26213,7 +26106,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:26217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:26110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -26251,12 +26144,12 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:26255: checking for $ac_hdr" >&5
+echo "configure:26148: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26260 "configure"
+#line 26153 "configure"
#include "confdefs.h"
#include <fontconfig/fontconfig.h>
#include <$ac_hdr>
@@ -26264,7 +26157,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:26268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:26161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -26310,7 +26203,7 @@ EOF
# 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:26314: checking for $ac_word" >&5
+echo "configure:26207: 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
@@ -26354,19 +26247,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for fontconfig""... $ac_c" 1>&6
-echo "configure:26358: checking for fontconfig" >&5
+echo "configure:26251: checking for fontconfig" >&5
if $PKG_CONFIG --exists "fontconfig" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _FONTCONFIG_CFLAGS""... $ac_c" 1>&6
-echo "configure:26365: checking _FONTCONFIG_CFLAGS" >&5
+echo "configure:26258: checking _FONTCONFIG_CFLAGS" >&5
_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"`
echo "$ac_t""$_FONTCONFIG_CFLAGS" 1>&6
echo $ac_n "checking _FONTCONFIG_LIBS""... $ac_c" 1>&6
-echo "configure:26370: checking _FONTCONFIG_LIBS" >&5
+echo "configure:26263: checking _FONTCONFIG_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_FONTCONFIG_LIBS="`$PKG_CONFIG --libs \"fontconfig\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_FONTCONFIG_LIBS" 1>&6
@@ -26470,7 +26363,7 @@ else
# 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:26474: checking for $ac_word" >&5
+echo "configure:26367: 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
@@ -26514,19 +26407,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pixman-1 >= 0.19.2""... $ac_c" 1>&6
-echo "configure:26518: checking for pixman-1 >= 0.19.2" >&5
+echo "configure:26411: checking for pixman-1 >= 0.19.2" >&5
if $PKG_CONFIG --exists "pixman-1 >= 0.19.2" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking PIXMAN_CFLAGS""... $ac_c" 1>&6
-echo "configure:26525: checking PIXMAN_CFLAGS" >&5
+echo "configure:26418: checking PIXMAN_CFLAGS" >&5
PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.19.2"`
echo "$ac_t""$PIXMAN_CFLAGS" 1>&6
echo $ac_n "checking PIXMAN_LIBS""... $ac_c" 1>&6
-echo "configure:26530: checking PIXMAN_LIBS" >&5
+echo "configure:26423: checking PIXMAN_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
PIXMAN_LIBS="`$PKG_CONFIG --libs \"pixman-1 >= 0.19.2\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$PIXMAN_LIBS" 1>&6
@@ -26567,12 +26460,12 @@ if test -n "$COMPILE_ENVIRONMENT"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:26571: checking for $ac_hdr" >&5
+echo "configure:26464: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26576 "configure"
+#line 26469 "configure"
#include "confdefs.h"
#include <$ac_hdr>
@@ -26580,7 +26473,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:26584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:26477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -26667,12 +26560,12 @@ EOF
ac_safe=`echo "d3d9.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for d3d9.h""... $ac_c" 1>&6
-echo "configure:26671: checking for d3d9.h" >&5
+echo "configure:26564: checking for d3d9.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26676 "configure"
+#line 26569 "configure"
#include "confdefs.h"
#include <d3d9.h>
@@ -26680,7 +26573,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:26684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:26577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -26704,12 +26597,12 @@ fi
if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
ac_safe=`echo "d3d10.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for d3d10.h""... $ac_c" 1>&6
-echo "configure:26708: checking for d3d10.h" >&5
+echo "configure:26601: checking for d3d10.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 26713 "configure"
+#line 26606 "configure"
#include "confdefs.h"
#include <d3d10.h>
@@ -26717,7 +26610,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:26721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:26614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -26787,7 +26680,7 @@ else
# 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:26791: checking for $ac_word" >&5
+echo "configure:26684: 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
@@ -26831,19 +26724,19 @@ fi
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:26835: checking for cairo >= $CAIRO_VERSION" >&5
+echo "configure:26728: 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:26842: checking CAIRO_CFLAGS" >&5
+echo "configure:26735: 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:26847: checking CAIRO_LIBS" >&5
+echo "configure:26740: checking CAIRO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_LIBS" 1>&6
@@ -26880,7 +26773,7 @@ echo "configure:26847: checking CAIRO_LIBS" >&5
# 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:26884: checking for $ac_word" >&5
+echo "configure:26777: 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
@@ -26924,19 +26817,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo-tee >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:26928: checking for cairo-tee >= $CAIRO_VERSION" >&5
+echo "configure:26821: checking for cairo-tee >= $CAIRO_VERSION" >&5
if $PKG_CONFIG --exists "cairo-tee >= $CAIRO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking CAIRO_TEE_CFLAGS""... $ac_c" 1>&6
-echo "configure:26935: checking CAIRO_TEE_CFLAGS" >&5
+echo "configure:26828: checking CAIRO_TEE_CFLAGS" >&5
CAIRO_TEE_CFLAGS=`$PKG_CONFIG --cflags "cairo-tee >= $CAIRO_VERSION"`
echo "$ac_t""$CAIRO_TEE_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_TEE_LIBS""... $ac_c" 1>&6
-echo "configure:26940: checking CAIRO_TEE_LIBS" >&5
+echo "configure:26833: checking CAIRO_TEE_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
CAIRO_TEE_LIBS="`$PKG_CONFIG --libs \"cairo-tee >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_TEE_LIBS" 1>&6
@@ -26972,7 +26865,7 @@ echo "configure:26940: checking CAIRO_TEE_LIBS" >&5
# 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:26976: checking for $ac_word" >&5
+echo "configure:26869: 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
@@ -27016,19 +26909,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:27020: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
+echo "configure:26913: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6
-echo "configure:27027: checking CAIRO_XRENDER_CFLAGS" >&5
+echo "configure:26920: checking CAIRO_XRENDER_CFLAGS" >&5
CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"`
echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6
-echo "configure:27032: checking CAIRO_XRENDER_LIBS" >&5
+echo "configure:26925: checking CAIRO_XRENDER_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6
@@ -27933,12 +27826,12 @@ if test -n "$COMPILE_ENVIRONMENT"; then
for ac_func in posix_fadvise posix_fallocate
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:27937: checking for $ac_func" >&5
+echo "configure:27830: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 27942 "configure"
+#line 27835 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -27965,7 +27858,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:27969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -28000,7 +27893,7 @@ if test "$MOZ_X11"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 28004 "configure"
+#line 27897 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -28019,7 +27912,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:28023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:27916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -28187,7 +28080,7 @@ if test -n "$MOZ_NATIVE_ICU"; 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:28191: checking for $ac_word" >&5
+echo "configure:28084: 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
@@ -28231,19 +28124,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for icu-i18n >= 50.1""... $ac_c" 1>&6
-echo "configure:28235: checking for icu-i18n >= 50.1" >&5
+echo "configure:28128: checking for icu-i18n >= 50.1" >&5
if $PKG_CONFIG --exists "icu-i18n >= 50.1" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6
-echo "configure:28242: checking MOZ_ICU_CFLAGS" >&5
+echo "configure:28135: checking MOZ_ICU_CFLAGS" >&5
MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 50.1"`
echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6
echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6
-echo "configure:28247: checking MOZ_ICU_LIBS" >&5
+echo "configure:28140: checking MOZ_ICU_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 50.1\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_ICU_LIBS" 1>&6
@@ -29920,8 +29813,10 @@ if test "$MOZ_TREE_FREETYPE"; then
if ! test -e modules; then
mkdir modules
fi
-
- trap '' EXIT
+ # Only export CC, CXX and RANLIB for the subconfigure, and avoid spilling
+ # that further down the road.
+ (export CC CXX RANLIB;
+ trap '' EXIT
for moz_config_dir in modules/freetype2; do
_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
case "$host" in
@@ -30047,6 +29942,7 @@ done
trap '[ "$?" != 0 ] && echo "------ config.log ------" && tail -n 25 config.log' EXIT
+ ) || exit 1
fi
if test -z "$direct_nspr_config"; then
@@ -30556,9 +30452,6 @@ if test -z "$JS_SHARED_LIBRARY" ; then
ac_configure_args="$ac_configure_args --disable-export-js"
fi
fi
-if test -z "$JSGC_USE_EXACT_ROOTING" ; then
- ac_configure_args="$ac_configure_args --disable-exact-rooting"
-fi
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 895beac..5852478 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3655,7 +3655,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.16.2.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ AM_PATH_NSS(3.16.2.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
if test -n "$MOZ_NATIVE_NSS"; then
@@ -3992,7 +3992,6 @@ MOZ_AUDIO_CHANNEL_MANAGER=
NSS_NO_LIBPKIX=
MOZ_CONTENT_SANDBOX=
MOZ_CONTENT_SANDBOX_REPORTER=1
-JSGC_USE_EXACT_ROOTING=
case "$target_os" in
mingw*)
@@ -7196,61 +7195,6 @@ if test -n "$JS_CRASH_DIAGNOSTICS"; then
AC_DEFINE(JS_CRASH_DIAGNOSTICS)
fi
-dnl ========================================================
-dnl = Use incremental GC
-dnl ========================================================
-JSGC_INCREMENTAL=1
-MOZ_ARG_DISABLE_BOOL(gcincremental,
-[ --disable-gcincremental Disable incremental GC],
- JSGC_INCREMENTAL= )
-if test -n "$JSGC_INCREMENTAL"; then
- AC_DEFINE(JSGC_INCREMENTAL)
-fi
-
-dnl ========================================================
-dnl = Use exact stack rooting for GC
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(exact-rooting,
-[ --disable-exact-rooting Enable use of conservative stack scanning for GC],
- JSGC_USE_EXACT_ROOTING= ,
- JSGC_USE_EXACT_ROOTING=1 )
-if test -n "$JSGC_USE_EXACT_ROOTING"; then
- AC_DEFINE(JSGC_USE_EXACT_ROOTING)
-fi
-
-dnl ========================================================
-dnl = Use generational GC
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(gcgenerational,
-[ --enable-gcgenerational Enable generational GC],
- JSGC_GENERATIONAL=1,
- JSGC_GENERATIONAL= )
-if test -n "$JSGC_GENERATIONAL"; then
- AC_DEFINE(JSGC_GENERATIONAL)
-fi
-
-dnl ========================================================
-dnl Zealous JavaScript GC
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(gczeal,
-[ --enable-gczeal Enable zealous JavaScript GCing],
- JS_GC_ZEAL=1,
- JS_GC_ZEAL= )
-if test -n "$JS_GC_ZEAL" -o -n "$MOZ_DEBUG"; then
- AC_DEFINE(JS_GC_ZEAL)
-fi
-
-dnl ========================================================
-dnl = Perform moving GC stack rooting analysis
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(root-analysis,
-[ --enable-root-analysis Enable moving GC stack root analysis],
- JSGC_ROOT_ANALYSIS=1,
- JSGC_ROOT_ANALYSIS= )
-if test -n "$JSGC_ROOT_ANALYSIS"; then
- AC_DEFINE(JSGC_ROOT_ANALYSIS)
-fi
-
MOZ_CHECK_CCACHE
dnl ========================================================
@@ -9101,8 +9045,11 @@ if test "$MOZ_TREE_FREETYPE"; then
if ! test -e modules; then
mkdir modules
fi
-
- AC_OUTPUT_SUBDIRS(modules/freetype2)
+ # Only export CC, CXX and RANLIB for the subconfigure, and avoid spilling
+ # that further down the road.
+ (export CC CXX RANLIB;
+ AC_OUTPUT_SUBDIRS(modules/freetype2)
+ ) || exit 1
fi
if test -z "$direct_nspr_config"; then
@@ -9245,9 +9192,6 @@ if test -z "$JS_SHARED_LIBRARY" ; then
ac_configure_args="$ac_configure_args --disable-export-js"
fi
fi
-if test -z "$JSGC_USE_EXACT_ROOTING" ; then
- ac_configure_args="$ac_configure_args --disable-exact-rooting"
-fi
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index cbed38d..3493bce 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -3916,7 +3916,7 @@ nsDocument::InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify)
{
if (aKid->IsElement() && GetRootElement()) {
- NS_ERROR("Inserting element child when we already have one");
+ NS_WARNING("Inserting root element when we already have one");
return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
}
diff --git a/mozilla/content/base/src/nsXMLHttpRequest.h b/mozilla/content/base/src/nsXMLHttpRequest.h
index b1fc4e3..22893e3 100644
--- a/mozilla/content/base/src/nsXMLHttpRequest.h
+++ b/mozilla/content/base/src/nsXMLHttpRequest.h
@@ -28,7 +28,8 @@
#include "nsIPrincipal.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsISizeOfEventTarget.h"
-
+#include "nsIXPConnect.h"
+#include "nsIInputStream.h"
#include "mozilla/Assertions.h"
#include "mozilla/DOMEventTargetHelper.h"
#include "mozilla/MemoryReporting.h"
@@ -408,44 +409,64 @@ private:
}
public:
- void Send(ErrorResult& aRv)
+ void Send(JSContext* /*aCx*/, ErrorResult& aRv)
{
aRv = Send(Nullable<RequestBody>());
}
- void Send(const mozilla::dom::ArrayBuffer& aArrayBuffer, ErrorResult& aRv)
+ void Send(JSContext* /*aCx*/,
+ const mozilla::dom::ArrayBuffer& aArrayBuffer,
+ ErrorResult& aRv)
{
aRv = Send(RequestBody(&aArrayBuffer));
}
- void Send(const mozilla::dom::ArrayBufferView& aArrayBufferView,
+ void Send(JSContext* /*aCx*/,
+ const mozilla::dom::ArrayBufferView& aArrayBufferView,
ErrorResult& aRv)
{
aRv = Send(RequestBody(&aArrayBufferView));
}
- void Send(nsIDOMBlob* aBlob, ErrorResult& aRv)
+ void Send(JSContext* /*aCx*/, nsIDOMBlob* aBlob, ErrorResult& aRv)
{
NS_ASSERTION(aBlob, "Null should go to string version");
aRv = Send(RequestBody(aBlob));
}
- void Send(nsIDocument& aDoc, ErrorResult& aRv)
+ void Send(JSContext* /*aCx*/, nsIDocument& aDoc, ErrorResult& aRv)
{
aRv = Send(RequestBody(&aDoc));
}
- void Send(const nsAString& aString, ErrorResult& aRv)
+ void Send(JSContext* aCx, const nsAString& aString, ErrorResult& aRv)
{
if (DOMStringIsNull(aString)) {
- Send(aRv);
+ Send(aCx, aRv);
}
else {
aRv = Send(RequestBody(aString));
}
}
- void Send(nsFormData& aFormData, ErrorResult& aRv)
+ void Send(JSContext* /*aCx*/, nsFormData& aFormData, ErrorResult& aRv)
{
aRv = Send(RequestBody(aFormData));
}
- void Send(nsIInputStream* aStream, ErrorResult& aRv)
+ void Send(JSContext* aCx, nsIInputStream* aStream, ErrorResult& aRv)
{
NS_ASSERTION(aStream, "Null should go to string version");
+ nsCOMPtr<nsIXPConnectWrappedJS> wjs = do_QueryInterface(aStream);
+ if (wjs) {
+ JSObject* data = wjs->GetJSObject();
+ if (!data) {
+ aRv.Throw(NS_ERROR_DOM_TYPE_ERR);
+ return;
+ }
+ JS::Rooted<JS::Value> dataAsValue(aCx, JS::ObjectValue(*data));
+ mozilla::dom::binding_detail::FakeDependentString dataAsString;
+ if (ConvertJSValueToString(aCx, dataAsValue, &dataAsValue, mozilla::dom::eNull,
+ mozilla::dom::eNull, dataAsString)) {
+ Send(aCx, dataAsString, aRv);
+ } else {
+ aRv.Throw(NS_ERROR_FAILURE);
+ }
+ return;
+ }
aRv = Send(RequestBody(aStream));
}
void SendAsBinary(const nsAString& aBody, ErrorResult& aRv);
diff --git a/mozilla/content/base/test/echo.sjs b/mozilla/content/base/test/echo.sjs
new file mode 100644
index 0000000..6e3242c
--- /dev/null
+++ b/mozilla/content/base/test/echo.sjs
@@ -0,0 +1,21 @@
+const CC = Components.Constructor;
+const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",
+ "nsIBinaryInputStream",
+ "setInputStream");
+
+function handleRequest(request, response)
+{
+ response.setHeader("Content-Type", "text/plain");
+ if (request.method == "GET") {
+ response.write(request.queryString);
+ return;
+ }
+
+ var bodyStream = new BinaryInputStream(request.bodyInputStream);
+ var body = "";
+ var bodyAvail;
+ while ((bodyAvail = bodyStream.available()) > 0)
+ body += String.fromCharCode.apply(null, bodyStream.readByteArray(bodyAvail));
+
+ response.write(body);
+}
diff --git a/mozilla/content/base/test/mochitest.ini b/mozilla/content/base/test/mochitest.ini
index 7c92707..c3cffb3 100644
--- a/mozilla/content/base/test/mochitest.ini
+++ b/mozilla/content/base/test/mochitest.ini
@@ -45,6 +45,7 @@ support-files =
bug819051.sjs
copypaste.js
delayedServerEvents.sjs
+ echo.sjs
eventsource.resource
eventsource.resource^headers^
eventsource_redirect.resource
@@ -623,6 +624,7 @@ skip-if = toolkit == 'android'
[test_xhr_forbidden_headers.html]
[test_xhr_progressevents.html]
skip-if = toolkit == 'android'
+[test_xhr_send.html]
[test_xhr_send_readystate.html]
[test_xhr_withCredentials.html]
[test_file_from_blob.html]
diff --git a/mozilla/content/base/test/test_xhr_send.html b/mozilla/content/base/test/test_xhr_send.html
new file mode 100644
index 0000000..7d8e1ba
--- /dev/null
+++ b/mozilla/content/base/test/test_xhr_send.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1096263
+-->
+<head>
+ <meta charset="utf-8">
+ <title>Test for Bug 1096263</title>
+ <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+ <script type="application/javascript">
+
+ /** Test for Bug 1096263 **/
+
+SimpleTest.waitForExplicitFinish();
+
+function simpleGetTest() {
+ var x = new XMLHttpRequest();
+ x.open("GET", "echo.sjs");
+ x.onload = function() {
+ ok(true, "Should have processed GET");
+ simplePostTest();
+ }
+ x.send({});
+}
+
+function simplePostTest() {
+ var x = new XMLHttpRequest();
+ x.open("POST", "echo.sjs");
+ x.onload = function() {
+ ise(x.responseText, "somedata", "Should have processed POST");
+ undefinedPostTest();
+ }
+ x.send({toString: function() { return "somedata"; }});
+}
+
+function undefinedPostTest() {
+ var x = new XMLHttpRequest();
+ x.open("POST", "echo.sjs");
+ x.onload = function() {
+ ise(x.responseText, "undefined", "Should have processed POST");
+ nullPostTest();
+ }
+ x.send({toString: function() { return undefined; }});
+}
+
+function nullPostTest() {
+ var x = new XMLHttpRequest();
+ x.open("POST", "echo.sjs");
+ x.onload = function() {
+ ise(x.responseText, "null", "Should have processed POST");
+ testExceptionInToString();
+ }
+ x.send({toString: function() { return null; }});
+}
+
+function testExceptionInToString() {
+ var x = new XMLHttpRequest();
+ x.open("GET", "echo.sjs");
+ x.onload = function() {
+ ok(false);
+ SimpleTest.finish();
+ }
+ try {
+ x.send({toString: function() { throw "dummy"; }});
+ } catch(ex) {
+ ise(ex, "dummy");
+ SimpleTest.finish();
+ }
+}
+
+ </script>
+</head>
+<body onload="simpleGetTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1096263">Mozilla Bug 1096263</a>
+<p id="display"></p>
+<div id="content">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff --git a/mozilla/content/media/MediaCache.cpp b/mozilla/content/media/MediaCache.cpp
index 598d905..c99f724 100644
--- a/mozilla/content/media/MediaCache.cpp
+++ b/mozilla/content/media/MediaCache.cpp
@@ -1174,6 +1174,7 @@ MediaCache::Update()
// Figure out where we should be reading from. It's the first
// uncached byte after the current mStreamOffset.
int64_t dataOffset = stream->GetCachedDataEndInternal(stream->mStreamOffset);
+ MOZ_ASSERT(dataOffset >= 0);
// Compute where we'd actually seek to to read at readOffset
int64_t desiredOffset = dataOffset;
@@ -1702,6 +1703,7 @@ MediaCacheStream::NotifyDataStarted(int64_t aOffset)
ReentrantMonitorAutoEnter mon(gMediaCache->GetReentrantMonitor());
NS_WARN_IF_FALSE(aOffset == mChannelOffset,
"Server is giving us unexpected offset");
+ MOZ_ASSERT(aOffset >= 0);
mChannelOffset = aOffset;
if (mStreamLength >= 0) {
// If we started reading at a certain offset, then for sure
@@ -2118,23 +2120,28 @@ MediaCacheStream::Seek(int32_t aWhence, int64_t aOffset)
return NS_ERROR_FAILURE;
int64_t oldOffset = mStreamOffset;
+ int64_t newOffset = mStreamOffset;
switch (aWhence) {
case PR_SEEK_END:
if (mStreamLength < 0)
return NS_ERROR_FAILURE;
- mStreamOffset = mStreamLength + aOffset;
+ newOffset = mStreamLength + aOffset;
break;
case PR_SEEK_CUR:
- mStreamOffset += aOffset;
+ newOffset += aOffset;
break;
case PR_SEEK_SET:
- mStreamOffset = aOffset;
+ newOffset = aOffset;
break;
default:
NS_ERROR("Unknown whence");
return NS_ERROR_FAILURE;
}
+ if (newOffset < 0)
+ return NS_ERROR_FAILURE;
+ mStreamOffset = newOffset;
+
CACHE_LOG(PR_LOG_DEBUG, ("Stream %p Seek to %lld", this, (long long)mStreamOffset));
gMediaCache->NoteSeek(this, oldOffset);
@@ -2176,11 +2183,10 @@ MediaCacheStream::Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes)
break;
}
size = std::min(size, bytesRemaining);
- // Clamp size until 64-bit file size issues (bug 500784) are fixed.
+ // Clamp size until 64-bit file size issues are fixed.
size = std::min(size, int64_t(INT32_MAX));
}
- int32_t bytes;
int32_t cacheBlock = streamBlock < mBlocks.Length() ? mBlocks[streamBlock] : -1;
if (cacheBlock < 0) {
// We don't have a complete cached block here.
@@ -2208,7 +2214,10 @@ MediaCacheStream::Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes)
// We can just use the data in mPartialBlockBuffer. In fact we should
// use it rather than waiting for the block to fill and land in
// the cache.
- bytes = std::min<int64_t>(size, streamWithPartialBlock->mChannelOffset - mStreamOffset);
+ int64_t bytes = std::min<int64_t>(size, streamWithPartialBlock->mChannelOffset - mStreamOffset);
+ // Clamp bytes until 64-bit file size issues are fixed.
+ bytes = std::min(bytes, int64_t(INT32_MAX));
+ NS_ABORT_IF_FALSE(bytes >= 0 && bytes <= aCount, "Bytes out of range.");
memcpy(aBuffer,
reinterpret_cast<char*>(streamWithPartialBlock->mPartialBlockBuffer.get()) + offsetInStreamBlock, bytes);
if (mCurrentMode == MODE_METADATA) {
@@ -2232,6 +2241,7 @@ MediaCacheStream::Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes)
gMediaCache->NoteBlockUsage(this, cacheBlock, mCurrentMode, TimeStamp::Now());
int64_t offset = cacheBlock*BLOCK_SIZE + offsetInStreamBlock;
+ int32_t bytes;
NS_ABORT_IF_FALSE(size >= 0 && size <= INT32_MAX, "Size out of range.");
nsresult rv = gMediaCache->ReadCacheFile(offset, aBuffer + count, int32_t(size), &bytes);
if (NS_FAILED(rv)) {
@@ -2268,9 +2278,7 @@ MediaCacheStream::ReadAt(int64_t aOffset, char* aBuffer,
}
nsresult
-MediaCacheStream::ReadFromCache(char* aBuffer,
- int64_t aOffset,
- int64_t aCount)
+MediaCacheStream::ReadFromCache(char* aBuffer, int64_t aOffset, int64_t aCount)
{
ReentrantMonitorAutoEnter mon(gMediaCache->GetReentrantMonitor());
if (mClosed)
@@ -2292,7 +2300,7 @@ MediaCacheStream::ReadFromCache(char* aBuffer,
return NS_ERROR_FAILURE;
}
size = std::min(size, bytesRemaining);
- // Clamp size until 64-bit file size issues (bug 500784) are fixed.
+ // Clamp size until 64-bit file size issues are fixed.
size = std::min(size, int64_t(INT32_MAX));
}
@@ -2303,7 +2311,10 @@ MediaCacheStream::ReadFromCache(char* aBuffer,
// We can just use the data in mPartialBlockBuffer. In fact we should
// use it rather than waiting for the block to fill and land in
// the cache.
- bytes = std::min<int64_t>(size, mChannelOffset - streamOffset);
+ // Clamp bytes until 64-bit file size issues are fixed.
+ int64_t toCopy = std::min<int64_t>(size, mChannelOffset - streamOffset);
+ bytes = std::min(toCopy, int64_t(INT32_MAX));
+ NS_ABORT_IF_FALSE(bytes >= 0 && bytes <= toCopy, "Bytes out of range.");
memcpy(aBuffer + count,
reinterpret_cast<char*>(mPartialBlockBuffer.get()) + offsetInStreamBlock, bytes);
} else {
diff --git a/mozilla/content/media/webm/WebMReader.cpp b/mozilla/content/media/webm/WebMReader.cpp
index 8af284c..11f67cd 100644
--- a/mozilla/content/media/webm/WebMReader.cpp
+++ b/mozilla/content/media/webm/WebMReader.cpp
@@ -664,7 +664,15 @@ bool WebMReader::DecodeAudioPacket(nestegg_packet* aPacket, int64_t aOffset)
return true;
}
int32_t keepFrames = frames - skipFrames;
+ if (keepFrames < 0) {
+ NS_WARNING("Int overflow in keepFrames");
+ return false;
+ }
int samples = keepFrames * channels;
+ if (samples < 0) {
+ NS_WARNING("Int overflow in samples");
+ return false;
+ }
nsAutoArrayPtr<AudioDataValue> trimBuffer(new AudioDataValue[samples]);
for (int i = 0; i < samples; i++)
trimBuffer[i] = buffer[skipFrames*channels + i];
@@ -687,6 +695,10 @@ bool WebMReader::DecodeAudioPacket(nestegg_packet* aPacket, int64_t aOffset)
int32_t keepFrames = frames - discardFrames.value();
if (keepFrames > 0) {
int samples = keepFrames * channels;
+ if (samples < 0) {
+ NS_WARNING("Int overflow in samples");
+ return false;
+ }
nsAutoArrayPtr<AudioDataValue> trimBuffer(new AudioDataValue[samples]);
for (int i = 0; i < samples; i++)
trimBuffer[i] = buffer[i];
diff --git a/mozilla/dom/bindings/Bindings.conf b/mozilla/dom/bindings/Bindings.conf
index 5560ead..ba519fd 100644
--- a/mozilla/dom/bindings/Bindings.conf
+++ b/mozilla/dom/bindings/Bindings.conf
@@ -1550,7 +1550,7 @@ DOMInterfaces = {
'XMLHttpRequest': [
{
'nativeType': 'nsXMLHttpRequest',
- 'implicitJSContext': [ 'constructor', ],
+ 'implicitJSContext': [ 'constructor', 'send'],
'resultNotAddRefed': [ 'upload', 'responseXML' ]
},
{
diff --git a/mozilla/dom/plugins/ipc/PluginProcessChild.cpp b/mozilla/dom/plugins/ipc/PluginProcessChild.cpp
index 6aebebe..3264772 100644
--- a/mozilla/dom/plugins/ipc/PluginProcessChild.cpp
+++ b/mozilla/dom/plugins/ipc/PluginProcessChild.cpp
@@ -13,6 +13,13 @@
#include "base/string_util.h"
#include "chrome/common/chrome_switches.h"
+#if defined(XP_MACOSX)
+#include "nsCocoaFeatures.h"
+// An undocumented CoreGraphics framework method, present in the same form
+// since at least OS X 10.5.
+extern "C" CGError CGSSetDebugOptions(int options);
+#endif
+
#ifdef XP_WIN
#include <objbase.h>
bool ShouldProtectPluginCurrentDirectory(char16ptr_t pluginFilePath);
@@ -119,9 +126,21 @@ PluginProcessChild::Init()
return false;
}
- return mPlugin.Init(pluginFilename, ParentHandle(),
- IOThreadChild::message_loop(),
- IOThreadChild::channel());
+ bool retval = mPlugin.Init(pluginFilename, ParentHandle(),
+ IOThreadChild::message_loop(),
+ IOThreadChild::channel());
+#if defined(XP_MACOSX)
+ if (nsCocoaFeatures::OnYosemiteOrLater()) {
+ // Explicitly turn off CGEvent logging. This works around bug 1092855.
+ // If there are already CGEvents in the log, turning off logging also
+ // causes those events to be written to disk. But at this point no
+ // CGEvents have yet been processed. CGEvents are events (usually
+ // input events) pulled from the WindowServer. An option of 0x80000008
+ // turns on CGEvent logging.
+ CGSSetDebugOptions(0x80000007);
+ }
+#endif
+ return retval;
}
void
diff --git a/mozilla/gfx/2d/DrawTargetCairo.cpp b/mozilla/gfx/2d/DrawTargetCairo.cpp
index 48c2c73..78d9e4f 100644
--- a/mozilla/gfx/2d/DrawTargetCairo.cpp
+++ b/mozilla/gfx/2d/DrawTargetCairo.cpp
@@ -353,6 +353,7 @@ NeedIntermediateSurface(const Pattern& aPattern, const DrawOptions& aOptions)
DrawTargetCairo::DrawTargetCairo()
: mContext(nullptr)
+ , mSurface(nullptr)
, mLockedBits(nullptr)
{
}
diff --git a/mozilla/gfx/angle/src/libEGL/libEGL.rc b/mozilla/gfx/angle/src/libEGL/libEGL.rc
deleted file mode 100644
index 5d1f32f..0000000
--- a/mozilla/gfx/angle/src/libEGL/libEGL.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-#include "../common/version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "#include ""../common/version.h""\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "ANGLE libEGL Dynamic Link Library"
- VALUE "FileVersion", VERSION_STRING
- VALUE "InternalName", "libEGL"
- VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
- VALUE "OriginalFilename", "libEGL.dll"
- VALUE "PrivateBuild", VERSION_STRING
- VALUE "ProductName", "ANGLE libEGL Dynamic Link Library"
- VALUE "ProductVersion", VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
diff --git a/mozilla/gfx/angle/src/libEGL/resource.h b/mozilla/gfx/angle/src/libEGL/resource.h
deleted file mode 100644
index 3921f4c..0000000
--- a/mozilla/gfx/angle/src/libEGL/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by libEGL.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/mozilla/gfx/angle/src/libGLESv2/libGLESv2.rc b/mozilla/gfx/angle/src/libGLESv2/libGLESv2.rc
deleted file mode 100644
index 0ad21e4..0000000
--- a/mozilla/gfx/angle/src/libGLESv2/libGLESv2.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-#include "../common/version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "#include ""../common/version.h""\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "ANGLE libGLESv2 Dynamic Link Library"
- VALUE "FileVersion", VERSION_STRING
- VALUE "InternalName", "libGLESv2"
- VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
- VALUE "OriginalFilename", "libGLESv2.dll"
- VALUE "PrivateBuild", VERSION_STRING
- VALUE "ProductName", "ANGLE libGLESv2 Dynamic Link Library"
- VALUE "ProductVersion", VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
diff --git a/mozilla/gfx/angle/src/libGLESv2/resource.h b/mozilla/gfx/angle/src/libGLESv2/resource.h
deleted file mode 100644
index 39adaad..0000000
--- a/mozilla/gfx/angle/src/libGLESv2/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by libGLESv2.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/mozilla/gfx/layers/basic/BasicLayerManager.cpp b/mozilla/gfx/layers/basic/BasicLayerManager.cpp
index 5a3a1f6..ff42bc0 100644
--- a/mozilla/gfx/layers/basic/BasicLayerManager.cpp
+++ b/mozilla/gfx/layers/basic/BasicLayerManager.cpp
@@ -901,18 +901,17 @@ BasicLayerManager::PaintLayer(gfxContext* aTarget,
RenderTraceScope trace("BasicLayerManager::PaintLayer", "707070");
const nsIntRect* clipRect = aLayer->GetEffectiveClipRect();
- // aLayer might not be a container layer, but if so we take care not to use
- // the container variable
- BasicContainerLayer* container = static_cast<BasicContainerLayer*>(aLayer);
- bool needsGroup = aLayer->GetFirstChild() &&
+ BasicContainerLayer* container =
+ static_cast<BasicContainerLayer*>(aLayer->AsContainerLayer());
+ bool needsGroup = container &&
container->UseIntermediateSurface();
BasicImplData* data = ToData(aLayer);
bool needsClipToVisibleRegion =
data->GetClipToVisibleRegion() && !aLayer->AsThebesLayer();
- NS_ASSERTION(needsGroup || !aLayer->GetFirstChild() ||
+ NS_ASSERTION(needsGroup || !container ||
container->GetOperator() == CompositionOp::OP_OVER,
"non-OVER operator should have forced UseIntermediateSurface");
- NS_ASSERTION(!aLayer->GetFirstChild() || !aLayer->GetMaskLayer() ||
+ NS_ASSERTION(!container || !aLayer->GetMaskLayer() ||
container->UseIntermediateSurface(),
"ContainerLayer with mask layer should force UseIntermediateSurface");
diff --git a/mozilla/js/src/assembler/assembler/MacroAssemblerX86Common.cpp b/mozilla/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
index d48f20a..54ed22f 100644
--- a/mozilla/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
+++ b/mozilla/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
@@ -42,6 +42,7 @@ void MacroAssemblerX86Common::setSSECheckState()
flags_edx = cpuinfo[3];
#else
_asm {
+ xor ecx, ecx // some older processors don't fill ecx, see further below.
mov eax, 1 // cpuid function 1 gives us the standard feature set
cpuid;
mov flags_ecx, ecx;
@@ -59,7 +60,11 @@ void MacroAssemblerX86Common::setSSECheckState()
);
#else
// On 32-bit x86, we must preserve ebx; the compiler needs it for PIC mode.
+ // Some older processors don't fill the ecx register with cpuid, so clobber
+ // it before calling cpuid, so that there's no risk of picking random bits
+ // indicating SSE3/SSE4 are present.
asm (
+ "xor %%ecx, %%ecx;"
"movl $0x1, %%eax;"
"pushl %%ebx;"
"cpuid;"
@@ -84,6 +89,7 @@ void MacroAssemblerX86Common::setSSECheckState()
);
#else
asm (
+ "xor %%ecx, %%ecx;"
"movl $0x1, %eax;"
"pushl %ebx;"
"cpuid;"
diff --git a/mozilla/js/src/builtin/Intl.cpp b/mozilla/js/src/builtin/Intl.cpp
index a6a12b6..e78f144 100644
--- a/mozilla/js/src/builtin/Intl.cpp
+++ b/mozilla/js/src/builtin/Intl.cpp
@@ -695,7 +695,7 @@ InitCollatorClass(JSContext *cx, HandleObject Intl, Handle<GlobalObject*> global
return nullptr;
if (!JSObject::defineProperty(cx, proto, cx->names().compare, UndefinedHandleValue,
JS_DATA_TO_FUNC_PTR(JSPropertyOp, &getter.toObject()),
- nullptr, JSPROP_GETTER))
+ nullptr, JSPROP_GETTER | JSPROP_SHARED))
{
return nullptr;
}
@@ -1184,7 +1184,7 @@ InitNumberFormatClass(JSContext *cx, HandleObject Intl, Handle<GlobalObject*> gl
return nullptr;
if (!JSObject::defineProperty(cx, proto, cx->names().format, UndefinedHandleValue,
JS_DATA_TO_FUNC_PTR(JSPropertyOp, &getter.toObject()),
- nullptr, JSPROP_GETTER))
+ nullptr, JSPROP_GETTER | JSPROP_SHARED))
{
return nullptr;
}
@@ -1641,7 +1641,7 @@ InitDateTimeFormatClass(JSContext *cx, HandleObject Intl, Handle<GlobalObject*>
return nullptr;
if (!JSObject::defineProperty(cx, proto, cx->names().format, UndefinedHandleValue,
JS_DATA_TO_FUNC_PTR(JSPropertyOp, &getter.toObject()),
- nullptr, JSPROP_GETTER))
+ nullptr, JSPROP_GETTER | JSPROP_SHARED))
{
return nullptr;
}
diff --git a/mozilla/js/src/configure b/mozilla/js/src/configure
index a44e4c7..773e69f 100755
--- a/mozilla/js/src/configure
+++ b/mozilla/js/src/configure
@@ -323,7 +323,7 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-gcgenerational Enable generational GC"
ac_help="$ac_help
- --disable-exact-rooting Enable use of conservative stack scanning for GC"
+ --enable-exact-rooting Enable use of conservative stack scanning for GC"
ac_help="$ac_help
--enable-valgrind Enable Valgrind integration hooks (default=no)"
ac_help="$ac_help
@@ -13850,14 +13850,13 @@ EOF
fi
-JSGC_USE_EXACT_ROOTING=1
# Check whether --enable-exact-rooting or --disable-exact-rooting was given.
if test "${enable_exact_rooting+set}" = set; then
enableval="$enable_exact_rooting"
if test "$enableval" = "no"; then
- JSGC_USE_EXACT_ROOTING=
- elif test "$enableval" = "yes"; then
JSGC_USE_EXACT_ROOTING=1
+ elif test "$enableval" = "yes"; then
+ JSGC_USE_EXACT_ROOTING=
else
{ echo "configure: error: Option, exact-rooting, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, exact-rooting, does not take an argument ($enableval)." 1>&5; exit 1; }
fi
@@ -13888,12 +13887,12 @@ fi
if test -n "$MOZ_VALGRIND"; then
ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6
-echo "configure:13892: checking for valgrind/valgrind.h" >&5
+echo "configure:13891: checking for valgrind/valgrind.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13897 "configure"
+#line 13896 "configure"
#include "confdefs.h"
#include <valgrind/valgrind.h>
@@ -13901,7 +13900,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
@@ -14271,7 +14270,7 @@ 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:14275: checking for $ac_word" >&5
+echo "configure:14274: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14442,12 +14441,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_func in __cxa_demangle
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14446: checking for $ac_func" >&5
+echo "configure:14445: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14451 "configure"
+#line 14450 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -14477,7 +14476,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:14481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -14565,7 +14564,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for -pipe support""... $ac_c" 1>&6
-echo "configure:14569: checking for -pipe support" >&5
+echo "configure:14568: checking for -pipe support" >&5
if test -n "$GNU_CC" -a -n "$GNU_CXX"; then
CFLAGS="$CFLAGS -pipe"
CXXFLAGS="$CXXFLAGS -pipe"
@@ -14579,16 +14578,16 @@ _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction"
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:14583: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:14582: checking whether C compiler supports -fprofile-generate" >&5
cat > conftest.$ac_ext <<EOF
-#line 14585 "configure"
+#line 14584 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:14592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-generate"
result="yes"
@@ -14639,12 +14638,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
_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:14643: checking for correct overload resolution with const and templates" >&5
+echo "configure:14642: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14648 "configure"
+#line 14647 "configure"
#include "confdefs.h"
template <class T>
@@ -14674,7 +14673,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@@ -14700,19 +14699,19 @@ EOF
fi
echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:14704: checking for tm_zone tm_gmtoff in struct tm" >&5
+echo "configure:14703: checking for tm_zone tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone_tm_gmtoff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14709 "configure"
+#line 14708 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1;
; return 0; }
EOF
-if { (eval echo configure:14716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone_tm_gmtoff="yes"
else
@@ -14754,20 +14753,20 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6
-echo "configure:14758: checking what kind of list files are supported by the linker" >&5
+echo "configure:14757: checking what kind of list files are supported by the linker" >&5
if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "int main() {return 0;}" > conftest.${ac_ext}
- if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
+ if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=linkerscript
else
echo "conftest.${OBJ_SUFFIX}" > conftest.list
- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:14769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:14768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=filelist
- elif { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+ elif { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=list
else
EXPAND_LIBS_LIST_STYLE=none
@@ -14787,7 +14786,7 @@ LIBS_DESC_SUFFIX=desc
if test "$GCC_USE_GNU_LD"; then
echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6
-echo "configure:14791: checking what kind of ordering can be done with the linker" >&5
+echo "configure:14790: checking what kind of ordering can be done with the linker" >&5
if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14795,14 +14794,14 @@ else
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order"
cat > conftest.$ac_ext <<EOF
-#line 14799 "configure"
+#line 14798 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:14806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
EXPAND_LIBS_ORDER_STYLE=section-ordering-file
else
@@ -14814,7 +14813,7 @@ fi
rm -f conftest*
LDFLAGS="$_SAVE_LDFLAGS"
if test -z "$EXPAND_LIBS_ORDER_STYLE"; then
- if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
EXPAND_LIBS_ORDER_STYLE=linkerscript
else
EXPAND_LIBS_ORDER_STYLE=none
@@ -14896,7 +14895,7 @@ esac
if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
if test -n "$JS_WANT_READLINE"; then
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:14900: checking for readline in -lreadline" >&5
+echo "configure:14899: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -14904,7 +14903,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14908 "configure"
+#line 14907 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14915,7 +14914,7 @@ int main() {
readline()
; return 0; }
EOF
-if { (eval echo configure:14919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14918: \"$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
@@ -15179,12 +15178,12 @@ EOF
for ac_func in posix_fadvise posix_fallocate
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15183: checking for $ac_func" >&5
+echo "configure:15182: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15188 "configure"
+#line 15187 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -15211,7 +15210,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:15215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -15244,7 +15243,7 @@ if test "$MOZ_X11"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 15248 "configure"
+#line 15247 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -15262,7 +15261,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:15266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -15386,7 +15385,7 @@ if test -n "$MOZ_NATIVE_ICU"; 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:15390: checking for $ac_word" >&5
+echo "configure:15389: 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
@@ -15430,19 +15429,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for icu-i18n >= 50.1""... $ac_c" 1>&6
-echo "configure:15434: checking for icu-i18n >= 50.1" >&5
+echo "configure:15433: checking for icu-i18n >= 50.1" >&5
if $PKG_CONFIG --exists "icu-i18n >= 50.1" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6
-echo "configure:15441: checking MOZ_ICU_CFLAGS" >&5
+echo "configure:15440: checking MOZ_ICU_CFLAGS" >&5
MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 50.1"`
echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6
echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6
-echo "configure:15446: checking MOZ_ICU_LIBS" >&5
+echo "configure:15445: checking MOZ_ICU_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 50.1\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_ICU_LIBS" 1>&6
@@ -15835,12 +15834,12 @@ fi
for ac_func in setlocale
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15839: checking for $ac_func" >&5
+echo "configure:15838: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15844 "configure"
+#line 15843 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -15867,7 +15866,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:15871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
@@ -15897,12 +15896,12 @@ done
for ac_func in localeconv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15901: checking for $ac_func" >&5
+echo "configure:15900: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func2_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15906 "configure"
+#line 15905 "configure"
#define $ac_func innocuous_$ac_func
#include "confdefs.h"
#undef $ac_func
@@ -15929,7 +15928,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:15933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func2_$ac_func=yes"
else
diff --git a/mozilla/js/src/configure.in b/mozilla/js/src/configure.in
index 314807b..4605e4a 100644
--- a/mozilla/js/src/configure.in
+++ b/mozilla/js/src/configure.in
@@ -3257,14 +3257,10 @@ fi
dnl ========================================================
dnl = Use exact stack rooting for GC
dnl ========================================================
-dnl Use exact rooting by default in all shell builds. The top-level mozilla
-dnl configure.in will configure SpiderMonkey with --disable-exact-rooting as
-dnl needed on a per-platform basis.
-JSGC_USE_EXACT_ROOTING=1
MOZ_ARG_DISABLE_BOOL(exact-rooting,
-[ --disable-exact-rooting Enable use of conservative stack scanning for GC],
- JSGC_USE_EXACT_ROOTING= ,
- JSGC_USE_EXACT_ROOTING=1 )
+[ --enable-exact-rooting Enable use of conservative stack scanning for GC],
+ JSGC_USE_EXACT_ROOTING=1 ,
+ JSGC_USE_EXACT_ROOTING= )
if test -n "$JSGC_USE_EXACT_ROOTING"; then
AC_DEFINE(JSGC_USE_EXACT_ROOTING)
fi
diff --git a/mozilla/js/src/js-config.h.in b/mozilla/js/src/js-config.h.in
index cf79b1e..a1f5c6b 100644
--- a/mozilla/js/src/js-config.h.in
+++ b/mozilla/js/src/js-config.h.in
@@ -28,6 +28,15 @@
entirely too much GC. */
#undef JS_GC_ZEAL
+/* Define to 1 if SpiderMonkey should use Incremental GC. */