From 07fe90dc5d569917ca13cf6f4aa53c79ed8e8cca Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 3 May 2022 11:35:52 -0500
Subject: Issue #32 - Part 2: Use in-tree MAPI headers

---
 mailnews/addrbook/src/moz.build        | 2 ++
 mailnews/build/moz.build               | 1 +
 mailnews/import/outlook/src/moz.build  | 3 ++-
 mailnews/mapi/mapiDll/moz.build        | 2 ++
 mailnews/mapi/mapihook/build/moz.build | 1 +
 mailnews/mapi/mapihook/src/moz.build   | 2 ++
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mailnews/addrbook/src/moz.build b/mailnews/addrbook/src/moz.build
index 30917ef09..aa67594f6 100644
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -89,4 +89,6 @@ EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
 ]
 
+LOCAL_INCLUDES += ['/mailnews/mapi/include']
+
 FINAL_LIBRARY = 'mail'
diff --git a/mailnews/build/moz.build b/mailnews/build/moz.build
index 9561fd33d..99f13bf42 100644
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -49,6 +49,7 @@ LOCAL_INCLUDES += [
     '/mailnews/imap/src',
     '/mailnews/intl',
     '/mailnews/local/src',
+    '/mailnews/mapi/include',
     '/mailnews/mime/emitters',
     '/mailnews/mime/src',
     '/mailnews/news/src',
diff --git a/mailnews/import/outlook/src/moz.build b/mailnews/import/outlook/src/moz.build
index 399baebc1..95fced7d9 100644
--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -18,6 +18,7 @@ SOURCES += [
 FINAL_LIBRARY = 'import'
 
 LOCAL_INCLUDES += [
-    '../../src'
+    '../../src',
+    '/mailnews/mapi/include'
 ]
 
diff --git a/mailnews/mapi/mapiDll/moz.build b/mailnews/mapi/mapiDll/moz.build
index 8f53dec56..989ca822b 100644
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -17,6 +17,8 @@ OS_LIBS += [
 DEFINES['UNICODE'] = True
 DEFINES['_UNICODE'] = True
 
+LOCAL_INCLUDES += ['/mailnews/mapi/include']
+
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     DEFINES['MOZILLA_INTERNAL_API'] = True
 
diff --git a/mailnews/mapi/mapihook/build/moz.build b/mailnews/mapi/mapihook/build/moz.build
index fd813cf04..420ec06e5 100644
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -19,3 +19,4 @@ if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
 
 DEFFILE = SRCDIR + '/MapiProxy.def'
 
+LOCAL_INCLUDES += ['/mailnews/mapi/include']
\ No newline at end of file
diff --git a/mailnews/mapi/mapihook/src/moz.build b/mailnews/mapi/mapihook/src/moz.build
index 8319a69b9..9f29fa3a7 100644
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -20,5 +20,7 @@ OS_LIBS += [
     'ole32',
 ]
 
+LOCAL_INCLUDES += ['/mailnews/mapi/include']
+
 DEFINES['UNICODE'] = True
 DEFINES['_UNICODE'] = True
-- 
cgit v1.2.3