Bug 1419997: Get rid of MOZ_MORK configuration variable; r=Fallen,frg
Part of the build system has support for optionally compiling mork (but the build fails if it isn't enabled) and other parts explicitly force that option to be on. Instead, just get rid of the option and always compile mork.
MozReview-Commit-ID: 8EV2uQyYZ01
--- a/db/moz.build
+++ b/db/moz.build
@@ -1,11 +1,10 @@
# 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/.
-if not CONFIG['NSS_DISABLE_DBM'] and CONFIG['MOZ_MORK']:
- DIRS += [
- 'mork/public',
- 'mork/src',
- 'mork/build',
- ]
+DIRS += [
+ 'mork/public',
+ 'mork/src',
+ 'mork/build',
+]
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -15,20 +15,16 @@ AC_SUBST(MOZ_BUNDLED_FONTS)
dnl More things we need to carry from confvars.sh
AC_SUBST(moztopsrcdir)
AC_SUBST(commtopsrcdir)
AC_SUBST(mozreltopsrcdir)
AC_SUBST(commreltopsrcdir)
AC_SUBST(commtopobjdir)
dnl Optional parts of the build.
-AC_SUBST(MOZ_MORK)
-if test "$MOZ_MORK"; then
- AC_DEFINE(MOZ_MORK)
-fi
if test "$OS_ARCH" != "WINNT"; then
MOZ_MOVEMAIL=1
HAVE_MOVEMAIL=1
AC_DEFINE(HAVE_MOVEMAIL)
fi
AC_SUBST(MOZ_MOVEMAIL)
dnl Get other versions (for the calendar plugin)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -19,18 +19,16 @@ fi
if test "$OS_ARCH" = "WINNT"; then
MOZ_MAINTENANCE_SERVICE=1
if ! test "$HAVE_64BIT_BUILD"; then
MOZ_VERIFY_MAR_SIGNATURE=1
fi
fi
-MOZ_MORK=1
-
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt
MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT`
THUNDERBIRD_VERSION=$MOZ_APP_VERSION
MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/other-licenses/branding/thunderbird
--- a/mailnews/mailnews.mozbuild
+++ b/mailnews/mailnews.mozbuild
@@ -4,12 +4,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_LDAP_XPCOM']:
DIRS += [
'/%s/ldap' % CONFIG['commreltopsrcdir'],
'/%s/ldap/xpcom' % CONFIG['commreltopsrcdir'],
]
-if CONFIG['MOZ_MORK']:
- DIRS += ['/%s/db' % CONFIG['commreltopsrcdir']]
+DIRS += [
+ '/%s/mailnews' % CONFIG['commreltopsrcdir'],
+ '/%s/db' % CONFIG['commreltopsrcdir'],
+]
-DIRS += ['/%s/mailnews' % CONFIG['commreltopsrcdir']]
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -18,20 +18,16 @@ AC_SUBST(MOZ_DEBUGQA)
dnl More things we need to carry from confvars.sh
AC_SUBST(moztopsrcdir)
AC_SUBST(commtopsrcdir)
AC_SUBST(mozreltopsrcdir)
AC_SUBST(commreltopsrcdir)
AC_SUBST(commtopobjdir)
dnl Optional parts of the build.
-AC_SUBST(MOZ_MORK)
-if test "$MOZ_MORK"; then
- AC_DEFINE(MOZ_MORK)
-fi
if test "$OS_ARCH" != "WINNT"; then
MOZ_MOVEMAIL=1
HAVE_MOVEMAIL=1
AC_DEFINE(HAVE_MOVEMAIL)
fi
AC_SUBST(MOZ_MOVEMAIL)
dnl Get other versions (for the calendar plugin)
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -16,17 +16,16 @@ MOZ_BRANDING_DIRECTORY=$commreltopsrcdir
MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/suite/branding/nightly
MOZ_UPDATER=1
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
# of values.
ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
MAR_CHANNEL_ID=seamonkey-comm-central
-MOZ_MORK=1
MOZ_SERVICES_FXACCOUNTS=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
MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
MOZ_PROFILE_MIGRATOR=1