Merge branch 'master' into release

1 files changed, 63 insertions, 0 deletions

diff --git a/mailnews/build/moz.build b/mailnews/build/moz.build
new file mode 100644
index 000000000..375a6ca8f
--- /dev/null
+++ b/mailnews/build/moz.build
@@ -0,0 +1,63 @@
+# 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/.
+
+SOURCES += [
+    'nsMailModule.cpp',
+]
+
+USE_LIBS += [
+    'nspr',
+]
+
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    XPCOMBinaryComponent('mail')
+    USE_LIBS += [
+        'rdfutil_external_s',
+        'unicharutil_external_s',
+        'xpcomglue_s',
+        'xul',
+    ]
+else:
+    Library('mail')
+    FINAL_LIBRARY = 'xul'
+
+# js needs to come after xul for now, because it is an archive and its content
+# is discarded when it comes first.
+USE_LIBS += [
+    'js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    OS_LIBS += [
+        'shell32',
+    ]
+else:
+    OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    OS_LIBS += CONFIG['TK_LIBS']
+    OS_LIBS += ['-framework Cocoa']
+
+LOCAL_INCLUDES += [
+    '/mailnews/addrbook/src',
+    '/mailnews/base/search/src',
+    '/mailnews/base/src',
+    '/mailnews/base/util',
+    '/mailnews/compose/src',
+    '/mailnews/extensions/bayesian-spam-filter/src',
+    '/mailnews/extensions/fts3/src',
+    '/mailnews/extensions/mailviews/src',
+    '/mailnews/extensions/mdn/src',
+    '/mailnews/extensions/smime/src',
+    '/mailnews/imap/src',
+    '/mailnews/intl',
+    '/mailnews/local/src',
+    '/mailnews/mime/emitters',
+    '/mailnews/mime/src',
+    '/mailnews/news/src',
+]
+
+if CONFIG['MOZ_LDAP_XPCOM']:
+    DEFINES['MOZ_LDAP_XPCOM'] = True