Bug 1257326 - Remove MOZ_SERVICES_COMMON. It is usually set, but never checked.
MozReview-Commit-ID: Km8hEYki2Rv
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -13,17 +13,16 @@ MOZ_UA_OS_AGNOSTIC=1
MOZ_B2G_VERSION=2.6.0.0-prerelease
MOZ_B2G_OS_NAME=Boot2Gecko
MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh
MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_COMMON=1
MOZ_WEBSMS_BACKEND=1
MOZ_NO_SMART_CARDS=1
MOZ_APP_STATIC_INI=1
NSS_DISABLE_DBM=1
MOZ_NO_EV_CERTS=1
MOZ_WEBSPEECH=1
--- a/b2g/graphene/confvars.sh
+++ b/b2g/graphene/confvars.sh
@@ -20,17 +20,16 @@ MOZ_APP_UA_NAME=Firefox
MOZ_B2G_VERSION=2.6.0.0-prerelease
MOZ_B2G_OS_NAME=Boot2Gecko
MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh
MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_COMMON=1
MOZ_CAPTIVEDETECT=1
MOZ_WEBSMS_BACKEND=1
MOZ_NO_SMART_CARDS=1
MOZ_APP_STATIC_INI=1
NSS_NO_LIBPKIX=1
NSS_DISABLE_DBM=1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -23,17 +23,16 @@ if test "$OS_ARCH" = "WINNT"; then
fi
fi
fi
# Enable building ./signmar and running libmar signature tests
MOZ_ENABLE_SIGNMAR=1
MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_CLOUDSYNC=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
MOZ_EXTENSIONS_DEFAULT=" gio"
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
--- a/embedding/ios/confvars.sh
+++ b/embedding/ios/confvars.sh
@@ -3,12 +3,11 @@
# 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_APP_NAME=geckoembed
MOZ_APP_DISPLAYNAME=GeckoEmbed
MOZ_UPDATER=
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_EXTENSIONS_DEFAULT=" gio"
-MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_HEALTHREPORT=1
--- a/old-configure.in
+++ b/old-configure.in
@@ -6613,22 +6613,16 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
[ --disable-ctypes Disable js-ctypes],
BUILD_CTYPES=,
BUILD_CTYPES=1)
AC_SUBST(BUILD_CTYPES)
if test "$BUILD_CTYPES"; then
AC_DEFINE(BUILD_CTYPES)
fi
-dnl Build Common JS modules provided by services.
-AC_SUBST(MOZ_SERVICES_COMMON)
-if test -n "$MOZ_SERVICES_COMMON"; then
- AC_DEFINE(MOZ_SERVICES_COMMON)
-fi
-
dnl Build Services crypto component (used by Sync)
AC_SUBST(MOZ_SERVICES_CRYPTO)
if test -n "$MOZ_SERVICES_CRYPTO"; then
AC_DEFINE(MOZ_SERVICES_CRYPTO)
fi
dnl Build Firefox Health Reporter Service
AC_SUBST(MOZ_SERVICES_HEALTHREPORT)