Browse Source

Issue #1258 - Part 3: Make mailnews and friends build

pull/24/head
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
18ffebc2a1
  1. 1
      build/moz.configure/old.configure
  2. 11
      db/mork/moz.build
  3. 2
      mailnews/base/util/moz.build
  4. 4
      mailnews/extensions/smime/src/moz.build
  5. 4
      mailnews/intl/moz.build
  6. 6
      mailnews/mime/src/moz.build
  7. 63
      old-configure.in
  8. 7
      toolkit/toolkit.mozbuild

1
build/moz.configure/old.configure vendored

@ -308,6 +308,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',

11
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',
]

2
mailnews/base/util/moz.build

@ -68,7 +68,7 @@ EXTRA_JS_MODULES += [
]
LOCAL_INCLUDES += [
'/mozilla/netwerk/base'
'/netwerk/base'
]
FINAL_LIBRARY = 'mail'

4
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'
]

4
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'

6
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 += [

63
old-configure.in

@ -2264,6 +2264,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*)
@ -2811,6 +2816,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 ========================================================

7
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',

Loading…
Cancel
Save