|
|
@@ -0,0 +1,410 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Andrea Marchesini <amarchesini@mozilla.com>
|
|
|
+# Date 1585067403 0
|
|
|
+# Node ID 23646088066c9a96c48af7f108f55b6de8b0eb40
|
|
|
+# Parent 3e589048cd1e2ba70583f269c9dad885a30d21d2
|
|
|
+Bug 1623593 - Get rid of NECKO_COOKIES compilation flag, r=mayhemer
|
|
|
+
|
|
|
+Differential Revision: https://phabricator.services.mozilla.com/D67451
|
|
|
+
|
|
|
+diff --git a/Makefile.in b/Makefile.in
|
|
|
+--- a/Makefile.in
|
|
|
++++ b/Makefile.in
|
|
|
+@@ -29,17 +29,17 @@ GARBAGE_DIRS += _javagen _profile static
|
|
|
+ # RUST*TARGET to GARBAGE_DIRS for those directories building Rust libraries.
|
|
|
+ # But the directories building Rust libraries don't actually have
|
|
|
+ # subdirectories to remove. So we add to GARBAGE_DIRS once here, globally,
|
|
|
+ # for it to have the desired effect.
|
|
|
+ GARBAGE_DIRS += $(RUST_TARGET)
|
|
|
+ DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
|
|
|
+ config/autoconf.mk \
|
|
|
+ mozilla-config.h \
|
|
|
+- netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
|
|
|
++ xpcom/xpcom-config.h xpcom/xpcom-private.h \
|
|
|
+ .mozconfig.mk
|
|
|
+
|
|
|
+ ifndef MOZ_PROFILE_USE
|
|
|
+ $(MDDEPDIR)/buildid.h.stub $(MDDEPDIR)/source-repo.h.stub: FORCE
|
|
|
+ source-repo.h: $(MDDEPDIR)/source-repo.h.stub
|
|
|
+ buildid.h: $(MDDEPDIR)/buildid.h.stub
|
|
|
+ endif
|
|
|
+
|
|
|
+diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build
|
|
|
+--- a/netwerk/build/moz.build
|
|
|
++++ b/netwerk/build/moz.build
|
|
|
+@@ -14,16 +14,17 @@ SOURCES += [
|
|
|
+
|
|
|
+ include('/ipc/chromium/chromium-config.mozbuild')
|
|
|
+
|
|
|
+ FINAL_LIBRARY = 'xul'
|
|
|
+
|
|
|
+ LOCAL_INCLUDES += [
|
|
|
+ '/netwerk/base',
|
|
|
+ '/netwerk/cache',
|
|
|
++ '/netwerk/cookie',
|
|
|
+ '/netwerk/dns',
|
|
|
+ '/netwerk/mime',
|
|
|
+ '/netwerk/protocol/about',
|
|
|
+ '/netwerk/protocol/data',
|
|
|
+ '/netwerk/protocol/file',
|
|
|
+ '/netwerk/protocol/ftp',
|
|
|
+ '/netwerk/protocol/http',
|
|
|
+ '/netwerk/protocol/res',
|
|
|
+@@ -55,21 +56,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
|
|
|
+ '/netwerk/system/android',
|
|
|
+ ]
|
|
|
+
|
|
|
+ elif CONFIG['OS_ARCH'] == 'Linux':
|
|
|
+ LOCAL_INCLUDES += [
|
|
|
+ '/netwerk/system/linux',
|
|
|
+ ]
|
|
|
+
|
|
|
+-if CONFIG['NECKO_COOKIES']:
|
|
|
+- LOCAL_INCLUDES += [
|
|
|
+- '/netwerk/cookie',
|
|
|
+- ]
|
|
|
+-
|
|
|
+ if CONFIG['NECKO_WIFI']:
|
|
|
+ LOCAL_INCLUDES += [
|
|
|
+ '/netwerk/wifi',
|
|
|
+ ]
|
|
|
+
|
|
|
+ LOCAL_INCLUDES += [
|
|
|
+ '!/netwerk/dns',
|
|
|
+ '/modules/brotli/dec',
|
|
|
+diff --git a/netwerk/build/nsNetModule.cpp b/netwerk/build/nsNetModule.cpp
|
|
|
+--- a/netwerk/build/nsNetModule.cpp
|
|
|
++++ b/netwerk/build/nsNetModule.cpp
|
|
|
+@@ -1,16 +1,14 @@
|
|
|
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
|
+ /* vim: set sw=4 ts=8 et tw=80 : */
|
|
|
+ /* 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/. */
|
|
|
+
|
|
|
+-#include "necko-config.h"
|
|
|
+-
|
|
|
+ #define ALLOW_LATE_HTTPLOG_H_INCLUDE 1
|
|
|
+ #include "base/basictypes.h"
|
|
|
+
|
|
|
+ #include "nsCOMPtr.h"
|
|
|
+ #include "nsIClassInfoImpl.h"
|
|
|
+ #include "mozilla/ModuleUtils.h"
|
|
|
+ #include "nsIComponentManager.h"
|
|
|
+ #include "nsIServiceManager.h"
|
|
|
+@@ -192,21 +190,19 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirInde
|
|
|
+ ///////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+ #include "nsStreamListenerTee.h"
|
|
|
+ typedef mozilla::net::nsStreamListenerTee nsStreamListenerTee;
|
|
|
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamListenerTee)
|
|
|
+
|
|
|
+ ///////////////////////////////////////////////////////////////////////////////
|
|
|
+
|
|
|
+-#ifdef NECKO_COOKIES
|
|
|
+ #include "nsCookieService.h"
|
|
|
+ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsICookieService,
|
|
|
+ nsCookieService::GetXPCOMSingleton)
|
|
|
+-#endif
|
|
|
+
|
|
|
+ ///////////////////////////////////////////////////////////////////////////////
|
|
|
+ #ifdef NECKO_WIFI
|
|
|
+
|
|
|
+ #include "nsWifiMonitor.h"
|
|
|
+ #undef LOG
|
|
|
+ #undef LOG_ENABLED
|
|
|
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWifiMonitor)
|
|
|
+@@ -740,20 +736,18 @@ NS_DEFINE_NAMED_CID(NS_ABOUT_CACHE_MODUL
|
|
|
+ NS_DEFINE_NAMED_CID(NS_ABOUT_CACHE_ENTRY_MODULE_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_SOCKSSOCKETPROVIDER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_SOCKS4SOCKETPROVIDER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_UDPSOCKETPROVIDER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_CACHESERVICE_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHESERVICE_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHENAMESPACE_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHE_CID);
|
|
|
+-#ifdef NECKO_COOKIES
|
|
|
+ NS_DEFINE_NAMED_CID(NS_COOKIEMANAGER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_COOKIESERVICE_CID);
|
|
|
+-#endif
|
|
|
+ #ifdef NECKO_WIFI
|
|
|
+ NS_DEFINE_NAMED_CID(NS_WIFI_MONITOR_COMPONENT_CID);
|
|
|
+ #endif
|
|
|
+ NS_DEFINE_NAMED_CID(NS_DATAPROTOCOLHANDLER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_VIEWSOURCEHANDLER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_WYCIWYGPROTOCOLHANDLER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_WEBSOCKETPROTOCOLHANDLER_CID);
|
|
|
+ NS_DEFINE_NAMED_CID(NS_WEBSOCKETSSLPROTOCOLHANDLER_CID);
|
|
|
+@@ -861,20 +855,18 @@ static const mozilla::Module::CIDEntry k
|
|
|
+ { &kNS_ABOUT_CACHE_ENTRY_MODULE_CID, false, nullptr, nsAboutCacheEntryConstructor },
|
|
|
+ { &kNS_SOCKSSOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV5 },
|
|
|
+ { &kNS_SOCKS4SOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV4 },
|
|
|
+ { &kNS_UDPSOCKETPROVIDER_CID, false, nullptr, nsUDPSocketProviderConstructor },
|
|
|
+ { &kNS_CACHESERVICE_CID, false, nullptr, nsCacheService::Create },
|
|
|
+ { &kNS_APPLICATIONCACHESERVICE_CID, false, nullptr, nsApplicationCacheServiceConstructor },
|
|
|
+ { &kNS_APPLICATIONCACHENAMESPACE_CID, false, nullptr, nsApplicationCacheNamespaceConstructor },
|
|
|
+ { &kNS_APPLICATIONCACHE_CID, false, nullptr, nsApplicationCacheConstructor },
|
|
|
+-#ifdef NECKO_COOKIES
|
|
|
+ { &kNS_COOKIEMANAGER_CID, false, nullptr, nsICookieServiceConstructor },
|
|
|
+ { &kNS_COOKIESERVICE_CID, false, nullptr, nsICookieServiceConstructor },
|
|
|
+-#endif
|
|
|
+ #ifdef NECKO_WIFI
|
|
|
+ { &kNS_WIFI_MONITOR_COMPONENT_CID, false, nullptr, nsWifiMonitorConstructor },
|
|
|
+ #endif
|
|
|
+ { &kNS_DATAPROTOCOLHANDLER_CID, false, nullptr, nsDataHandler::Create },
|
|
|
+ { &kNS_VIEWSOURCEHANDLER_CID, false, nullptr, nsViewSourceHandlerConstructor },
|
|
|
+ { &kNS_WYCIWYGPROTOCOLHANDLER_CID, false, nullptr, nsWyciwygProtocolHandlerConstructor },
|
|
|
+ { &kNS_WEBSOCKETPROTOCOLHANDLER_CID, false, nullptr,
|
|
|
+ mozilla::net::WebSocketChannelConstructor },
|
|
|
+@@ -990,20 +982,18 @@ static const mozilla::Module::ContractID
|
|
|
+ { NS_ABOUT_MODULE_CONTRACTID_PREFIX "cache-entry", &kNS_ABOUT_CACHE_ENTRY_MODULE_CID },
|
|
|
+ { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks", &kNS_SOCKSSOCKETPROVIDER_CID },
|
|
|
+ { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks4", &kNS_SOCKS4SOCKETPROVIDER_CID },
|
|
|
+ { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "udp", &kNS_UDPSOCKETPROVIDER_CID },
|
|
|
+ { NS_CACHESERVICE_CONTRACTID, &kNS_CACHESERVICE_CID },
|
|
|
+ { NS_APPLICATIONCACHESERVICE_CONTRACTID, &kNS_APPLICATIONCACHESERVICE_CID },
|
|
|
+ { NS_APPLICATIONCACHENAMESPACE_CONTRACTID, &kNS_APPLICATIONCACHENAMESPACE_CID },
|
|
|
+ { NS_APPLICATIONCACHE_CONTRACTID, &kNS_APPLICATIONCACHE_CID },
|
|
|
+-#ifdef NECKO_COOKIES
|
|
|
+ { NS_COOKIEMANAGER_CONTRACTID, &kNS_COOKIEMANAGER_CID },
|
|
|
+ { NS_COOKIESERVICE_CONTRACTID, &kNS_COOKIESERVICE_CID },
|
|
|
+-#endif
|
|
|
+ #ifdef NECKO_WIFI
|
|
|
+ { NS_WIFI_MONITOR_CONTRACTID, &kNS_WIFI_MONITOR_COMPONENT_CID },
|
|
|
+ #endif
|
|
|
+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "data", &kNS_DATAPROTOCOLHANDLER_CID },
|
|
|
+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "view-source", &kNS_VIEWSOURCEHANDLER_CID },
|
|
|
+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wyciwyg", &kNS_WYCIWYGPROTOCOLHANDLER_CID },
|
|
|
+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ws", &kNS_WEBSOCKETPROTOCOLHANDLER_CID },
|
|
|
+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wss", &kNS_WEBSOCKETSSLPROTOCOLHANDLER_CID },
|
|
|
+diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
|
|
|
+--- a/netwerk/cache/nsCacheService.cpp
|
|
|
++++ b/netwerk/cache/nsCacheService.cpp
|
|
|
+@@ -4,18 +4,16 @@
|
|
|
+ * 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/. */
|
|
|
+
|
|
|
+ #include "mozilla/ArrayUtils.h"
|
|
|
+ #include "mozilla/Attributes.h"
|
|
|
+ #include "mozilla/Assertions.h"
|
|
|
+ #include "mozilla/DebugOnly.h"
|
|
|
+
|
|
|
+-#include "necko-config.h"
|
|
|
+-
|
|
|
+ #include "nsCache.h"
|
|
|
+ #include "nsCacheService.h"
|
|
|
+ #include "nsCacheRequest.h"
|
|
|
+ #include "nsCacheEntry.h"
|
|
|
+ #include "nsCacheEntryDescriptor.h"
|
|
|
+ #include "nsCacheDevice.h"
|
|
|
+ #include "nsMemoryCacheDevice.h"
|
|
|
+ #include "nsICacheVisitor.h"
|
|
|
+diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
|
|
|
+--- a/netwerk/cookie/moz.build
|
|
|
++++ b/netwerk/cookie/moz.build
|
|
|
+@@ -2,57 +2,57 @@
|
|
|
+ # vim: set filetype=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/.
|
|
|
+
|
|
|
+ with Files('**'):
|
|
|
+ BUG_COMPONENT = ('Core', 'Networking: Cookies')
|
|
|
+
|
|
|
+-# export required interfaces, even if --disable-cookies has been given
|
|
|
++# export required interfaces
|
|
|
+ XPIDL_SOURCES += [
|
|
|
+ 'nsICookie.idl',
|
|
|
+ 'nsICookie2.idl',
|
|
|
+ 'nsICookieManager.idl',
|
|
|
+ 'nsICookieManager2.idl',
|
|
|
+ 'nsICookiePermission.idl',
|
|
|
+ 'nsICookieService.idl',
|
|
|
+ ]
|
|
|
+
|
|
|
+ XPIDL_MODULE = 'necko_cookie'
|
|
|
+
|
|
|
+-if CONFIG['NECKO_COOKIES']:
|
|
|
+- EXPORTS.mozilla.net = [
|
|
|
+- 'CookieServiceChild.h',
|
|
|
+- 'CookieServiceParent.h',
|
|
|
+- 'nsCookieKey.h',
|
|
|
+- ]
|
|
|
+- UNIFIED_SOURCES += [
|
|
|
+- 'CookieServiceChild.cpp',
|
|
|
+- 'CookieServiceParent.cpp',
|
|
|
+- 'nsCookie.cpp',
|
|
|
+- ]
|
|
|
+- # nsCookieService.cpp can't be unified because of symbol conflicts
|
|
|
+- SOURCES += [
|
|
|
+- 'nsCookieService.cpp',
|
|
|
+- ]
|
|
|
+- LOCAL_INCLUDES += [
|
|
|
+- '/intl/uconv',
|
|
|
+- ]
|
|
|
++EXPORTS.mozilla.net = [
|
|
|
++ 'CookieServiceChild.h',
|
|
|
++ 'CookieServiceParent.h',
|
|
|
++ 'nsCookieKey.h',
|
|
|
++]
|
|
|
++UNIFIED_SOURCES += [
|
|
|
++ 'CookieServiceChild.cpp',
|
|
|
++ 'CookieServiceParent.cpp',
|
|
|
++ 'nsCookie.cpp',
|
|
|
++]
|
|
|
++# nsCookieService.cpp can't be unified because of symbol conflicts
|
|
|
++SOURCES += [
|
|
|
++ 'nsCookieService.cpp',
|
|
|
++]
|
|
|
+
|
|
|
+- XPCSHELL_TESTS_MANIFESTS += [
|
|
|
+- 'test/unit/xpcshell.ini',
|
|
|
+- ]
|
|
|
++XPCSHELL_TESTS_MANIFESTS += [
|
|
|
++ 'test/unit/xpcshell.ini',
|
|
|
++]
|
|
|
+
|
|
|
+- BROWSER_CHROME_MANIFESTS += [
|
|
|
+- 'test/browser/browser.ini',
|
|
|
+- ]
|
|
|
++BROWSER_CHROME_MANIFESTS += [
|
|
|
++ 'test/browser/browser.ini',
|
|
|
++]
|
|
|
+
|
|
|
+ IPDL_SOURCES = [
|
|
|
+ 'PCookieService.ipdl',
|
|
|
+ ]
|
|
|
+
|
|
|
++LOCAL_INCLUDES += [
|
|
|
++ '/intl/uconv',
|
|
|
++]
|
|
|
++
|
|
|
+ include('/ipc/chromium/chromium-config.mozbuild')
|
|
|
+
|
|
|
+ FINAL_LIBRARY = 'xul'
|
|
|
+
|
|
|
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
|
|
|
+ CXXFLAGS += ['-Wno-error=shadow']
|
|
|
+diff --git a/netwerk/ipc/NeckoChild.cpp b/netwerk/ipc/NeckoChild.cpp
|
|
|
+--- a/netwerk/ipc/NeckoChild.cpp
|
|
|
++++ b/netwerk/ipc/NeckoChild.cpp
|
|
|
+@@ -1,16 +1,15 @@
|
|
|
+
|
|
|
+ /* vim: set sw=2 ts=8 et tw=80 : */
|
|
|
+
|
|
|
+ /* 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/. */
|
|
|
+
|
|
|
+-#include "necko-config.h"
|
|
|
+ #include "nsHttp.h"
|
|
|
+ #include "mozilla/net/NeckoChild.h"
|
|
|
+ #include "mozilla/dom/ContentChild.h"
|
|
|
+ #include "mozilla/dom/TabChild.h"
|
|
|
+ #include "mozilla/net/HttpChannelChild.h"
|
|
|
+ #include "mozilla/net/CookieServiceChild.h"
|
|
|
+ #include "mozilla/net/WyciwygChannelChild.h"
|
|
|
+ #include "mozilla/net/FTPChannelChild.h"
|
|
|
+diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
|
|
|
+--- a/netwerk/ipc/NeckoParent.cpp
|
|
|
++++ b/netwerk/ipc/NeckoParent.cpp
|
|
|
+@@ -1,16 +1,15 @@
|
|
|
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
+ /* vim: set sw=2 ts=8 et tw=80 : */
|
|
|
+
|
|
|
+ /* 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/. */
|
|
|
+
|
|
|
+-#include "necko-config.h"
|
|
|
+ #include "nsHttp.h"
|
|
|
+ #include "mozilla/BasePrincipal.h"
|
|
|
+ #include "mozilla/ipc/IPCStreamUtils.h"
|
|
|
+ #include "mozilla/net/ExtensionProtocolHandler.h"
|
|
|
+ #include "mozilla/net/NeckoParent.h"
|
|
|
+ #include "mozilla/net/HttpChannelParent.h"
|
|
|
+ #include "mozilla/net/CookieServiceParent.h"
|
|
|
+ #include "mozilla/net/WyciwygChannelParent.h"
|
|
|
+diff --git a/netwerk/moz.build b/netwerk/moz.build
|
|
|
+--- a/netwerk/moz.build
|
|
|
++++ b/netwerk/moz.build
|
|
|
+@@ -29,11 +29,8 @@ if CONFIG['MOZ_SCTP']:
|
|
|
+
|
|
|
+ if CONFIG['NECKO_WIFI']:
|
|
|
+ DIRS += ['wifi']
|
|
|
+
|
|
|
+ DIRS += ['locales']
|
|
|
+
|
|
|
+ DIRS += ['build']
|
|
|
+ TEST_DIRS += ['test']
|
|
|
+-
|
|
|
+-CONFIGURE_DEFINE_FILES += ['necko-config.h']
|
|
|
+-EXPORTS += ['!necko-config.h']
|
|
|
+diff --git a/netwerk/necko-config.h.in b/netwerk/necko-config.h.in
|
|
|
+deleted file mode 100644
|
|
|
+--- a/netwerk/necko-config.h.in
|
|
|
++++ /dev/null
|
|
|
+@@ -1,12 +0,0 @@
|
|
|
+-/* 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/. */
|
|
|
+-
|
|
|
+-#ifndef _NECKO_CONFIG_H_
|
|
|
+-#define _NECKO_CONFIG_H_
|
|
|
+-
|
|
|
+-#undef NECKO_COOKIES
|
|
|
+-
|
|
|
+-#undef NECKO_WIFI
|
|
|
+-
|
|
|
+-#endif
|
|
|
+diff --git a/old-configure.in b/old-configure.in
|
|
|
+--- a/old-configure.in
|
|
|
++++ b/old-configure.in
|
|
|
+@@ -1641,17 +1641,16 @@ MOZ_FEEDS=1
|
|
|
+ MOZ_AUTH_EXTENSION=1
|
|
|
+ MOZ_PREF_EXTENSIONS=1
|
|
|
+ MOZ_SPELLCHECK=1
|
|
|
+ MOZ_TOOLKIT_SEARCH=1
|
|
|
+ MOZ_UNIVERSALCHARDET=1
|
|
|
+ MOZ_XUL=1
|
|
|
+ MOZ_ZIPWRITER=1
|
|
|
+ MOZ_NO_SMART_CARDS=
|
|
|
+-NECKO_COOKIES=1
|
|
|
+ MOZ_USE_NATIVE_POPUP_WINDOWS=
|
|
|
+ MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
|
|
|
+ MOZ_CONTENT_SANDBOX=
|
|
|
+ MOZ_GMP_SANDBOX=
|
|
|
+ MOZ_SANDBOX=1
|
|
|
+ MOZ_BINARY_EXTENSIONS=
|
|
|
+ MOZ_DEVTOOLS=server
|
|
|
+
|
|
|
+@@ -2834,29 +2833,16 @@ if test "$NECKO_WIFI"; then
|
|
|
+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
|
|
|
+ fi
|
|
|
+ AC_DEFINE(NECKO_WIFI)
|
|
|
+ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
|
|
|
+ fi
|
|
|
+ AC_SUBST(NECKO_WIFI)
|
|
|
+ AC_SUBST(NECKO_WIFI_DBUS)
|
|
|
+
|
|
|
+-dnl
|
|
|
+-dnl option to disable cookies
|
|
|
+-dnl
|
|
|
+-MOZ_ARG_DISABLE_BOOL(cookies,
|
|
|
+-[ --disable-cookies Disable cookie support],
|
|
|
+- NECKO_COOKIES=,
|
|
|
+- NECKO_COOKIES=1)
|
|
|
+-AC_SUBST(NECKO_COOKIES)
|
|
|
+-if test "$NECKO_COOKIES"; then
|
|
|
+- AC_DEFINE(NECKO_COOKIES)
|
|
|
+- _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
|
|
|
+-fi
|
|
|
+-
|
|
|
+ dnl ========================================================
|
|
|
+ dnl =
|
|
|
+ dnl = Maintainer debug option (no --enable equivalent)
|
|
|
+ dnl =
|
|
|
+ dnl ========================================================
|
|
|
+
|
|
|
+ AC_SUBST(NM)
|
|
|
+ AC_SUBST_LIST(ASFLAGS)
|
Frank-Rainer Grahl