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

--HG--
extra : rebase_source : 894b94b461fa8a138e9b781e81157793a3e9c705
extra : amend_source : 989e6ecddaabc0c7eca3cb30b43630c4994d2a2a
extra : histedit_source : 53f79f2cb127305b4d8a01abcec1a428ec41c340

db/moz.build

@@ -3,9 +3,8 @@
 # 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',
+]

mail/configure.in

@@ -20,10 +20,6 @@ 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

mail/confvars.sh

@@ -24,8 +24,6 @@ if test "$OS_ARCH" = "WINNT"; then
   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

mailnews/mailnews.mozbuild

@@ -9,7 +9,8 @@ if CONFIG['MOZ_LDAP_XPCOM']:
         '/%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']]

suite/configure.in

@@ -23,10 +23,6 @@ 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

suite/confvars.sh

@@ -21,7 +21,6 @@ MOZ_UPDATER=1
 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