Bug 801265 - Update confvars.sh and configure.in to match the changes in
Bug 800154 (Refactor how services/ integrates with build system). rs=bustage-fix
--- a/configure.in
+++ b/configure.in
@@ -6310,16 +6310,28 @@ if test "$MOZ_PLACES"; then
fi
dnl Build Apps in the Cloud (AITC) if required
AC_SUBST(MOZ_SERVICES_AITC)
if test -n "$MOZ_SERVICES_AITC"; then
AC_DEFINE(MOZ_SERVICES_AITC)
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 Notifications if required
AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then
AC_DEFINE(MOZ_SERVICES_NOTIFICATIONS)
fi
dnl Build Sync Services if required
AC_SUBST(MOZ_SERVICES_SYNC)
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -28,16 +28,18 @@ MOZ_MEDIA_NAVIGATOR=1
MOZ_MORK=1
MOZ_STATIC_BUILD_UNSUPPORTED=1
if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
fi
MOZ_SERVICES_AITC=1
+MOZ_SERVICES_COMMON=1
+MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_NOTIFICATIONS=1
MOZ_SERVICES_SYNC=1
MOZ_URL_CLASSIFIER=1
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
SEAMONKEY_VERSION=$MOZ_APP_VERSION