From 6e7b3df3712caf96c9da8a55bee8e6b6e7ad02a7 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 3 Nov 2019 15:33:58 -0500 Subject: Issue #1258 - Part 3: Make mailnews and friends build --- build/moz.configure/old.configure | 1 + db/mork/moz.build | 11 ++++++ mailnews/base/util/moz.build | 2 +- mailnews/extensions/smime/src/moz.build | 4 +-- mailnews/intl/moz.build | 4 +-- mailnews/mime/src/moz.build | 6 ++-- old-configure.in | 63 +++++++++++++++++++++++++++++++++ toolkit/toolkit.mozbuild | 7 ++++ 8 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 db/mork/moz.build diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 552019a13..d6e8a287d 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -307,6 +307,7 @@ def old_configure_options(*options): '--enable-mapi', '--enable-calendar', '--enable-incomplete-external-linkage', + '--enable-mailnews', # Below are configure flags used by Pale Moon '--disable-browser-statusbar', diff --git a/db/mork/moz.build b/db/mork/moz.build new file mode 100644 index 000000000..a4cc91c19 --- /dev/null +++ b/db/mork/moz.build @@ -0,0 +1,11 @@ +# 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 += [ + 'public', + 'src', + 'build', + ] diff --git a/mailnews/base/util/moz.build b/mailnews/base/util/moz.build index a016cbcb9..134a46ae1 100644 --- a/mailnews/base/util/moz.build +++ b/mailnews/base/util/moz.build @@ -68,7 +68,7 @@ EXTRA_JS_MODULES += [ ] LOCAL_INCLUDES += [ - '/mozilla/netwerk/base' + '/netwerk/base' ] FINAL_LIBRARY = 'mail' diff --git a/mailnews/extensions/smime/src/moz.build b/mailnews/extensions/smime/src/moz.build index f3e888dd4..19a18f54f 100644 --- a/mailnews/extensions/smime/src/moz.build +++ b/mailnews/extensions/smime/src/moz.build @@ -18,6 +18,6 @@ EXTRA_COMPONENTS += [ FINAL_LIBRARY = 'mail' LOCAL_INCLUDES += [ - '/mozilla/security/manager/pki', - '/mozilla/security/pkix/include' + '/security/manager/pki', + '/security/pkix/include' ] diff --git a/mailnews/intl/moz.build b/mailnews/intl/moz.build index 935468da1..10412b119 100644 --- a/mailnews/intl/moz.build +++ b/mailnews/intl/moz.build @@ -20,14 +20,14 @@ UNIFIED_SOURCES += [ XPIDL_MODULE = 'commuconv' LOCAL_INCLUDES += [ - '/mozilla/intl/locale', + '/intl/locale', ] GENERATED_FILES += [ 'charsetalias.properties.h', ] charsetalias = GENERATED_FILES['charsetalias.properties.h'] -charsetalias.script = '../../mozilla/intl/locale/props2arrays.py' +charsetalias.script = '../../intl/locale/props2arrays.py' charsetalias.inputs = ['charsetalias.properties'] FINAL_LIBRARY = 'mail' diff --git a/mailnews/mime/src/moz.build b/mailnews/mime/src/moz.build index 1d44db88a..93bdbad98 100644 --- a/mailnews/mime/src/moz.build +++ b/mailnews/mime/src/moz.build @@ -71,9 +71,9 @@ SOURCES += [ ] LOCAL_INCLUDES += [ - '/mozilla/security/certverifier', - '/mozilla/security/manager/ssl', - '/mozilla/security/pkix/include', + '/security/certverifier', + '/security/manager/ssl', + '/security/pkix/include', ] EXTRA_COMPONENTS += [ diff --git a/old-configure.in b/old-configure.in index 6638ea688..45c3fe0ad 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2259,6 +2259,11 @@ MOZ_PLACES=1 MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_SYNC=1 MOZ_USERINFO=1 +MOZ_MAILNEWS= +MOZ_LDAP_XPCOM= +MOZ_MORK= +MOZ_MAPI_SUPPORT= +MOZ_INCOMPLETE_EXTERNAL_LINKAGE= case "$target_os" in mingw*) @@ -2806,6 +2811,64 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64) esac +dnl ========================================================= +dnl = Don't fold mailnews related comps into libXUL +dnl ========================================================= +MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage, +[ --enable-incomplete-external-linkage Don't fold *comps into libXUL which is currently badly busted so don't even bother with it ], + MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1, + MOZ_INCOMPLETE_EXTERNAL_LINKAGE= ) + +AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE) + +dnl ======================================================== +dnl = Enable MailNews +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(mailnews, +[ --enable-mailnews Enable the mailnews core backend], + MOZ_MAILNEWS=1, + MOZ_MAILNEWS=) + +if test -n "$MOZ_MAILNEWS"; then + MOZ_MORK=1 + MOZ_LDAP_XPCOM=1 + if test "$_WIN32_MSVC"; then + MOZ_MAPI_SUPPORT=1 + fi + AC_DEFINE(MOZ_MAILNEWS) + AC_DEFINE(MOZ_MORK) +fi + +AC_SUBST(MOZ_MAILNEWS) +AC_SUBST(MOZ_MORK) + +dnl ========================================================= +dnl = LDAP +dnl ========================================================= +MOZ_ARG_DISABLE_BOOL(ldap, +[ --disable-ldap Disable LDAP support], + MOZ_LDAP_XPCOM= ) + +if test -n "$MOZ_LDAP_XPCOM"; then + AC_DEFINE(MOZ_LDAP_XPCOM) +fi + +AC_SUBST(MOZ_LDAP_XPCOM) + +dnl ========================================================= +dnl = MAPI support (Windows only) +dnl ========================================================= + +MOZ_ARG_DISABLE_BOOL(mapi, +[ --disable-mapi Disable MAPI support], + MOZ_MAPI_SUPPORT= ) + +if test -n "$MOZ_MAPI_SUPPORT"; then + AC_DEFINE(MOZ_MAPI_SUPPORT) +fi + +AC_SUBST(MOZ_MAPI_SUPPORT) + dnl ======================================================== dnl = Enable WebRTC code dnl ======================================================== diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index da4e7cd85..6a745e51e 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -4,6 +4,13 @@ # 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 CONFIG['MOZ_MAILNEWS']: + DIRS += [ + '/ldap', + '/db/mork', + '/mailnews', + ] + DIRS += [ # Depends on NSS and NSPR '/security/certverifier', -- cgit v1.2.3