Bug 1328156 - Support disable-ldap in SeaMonkey installer. r=Ratty a=Ratty RELEASE_50_END
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 07 Jan 2017 23:33:25 +0100
changeset 31382 5130160ce063fcb0537ed7e9cafaa288f496075f
parent 31381 97c6d580f40f551fb830bb12e521be603400c3a0
child 31383 9a7fabfafdb32cf44755283a27584147eb774264
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, Ratty
bugs1328156
Bug 1328156 - Support disable-ldap in SeaMonkey installer. r=Ratty a=Ratty
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -97,16 +97,20 @@ endif
 
 ifdef MOZ_MOVEMAIL
 DEFINES += -DMOZ_MOVEMAIL=1
 endif
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI=1
 endif
 
+ifdef MOZ_LDAP_XPCOM
+DEFINES += -DMOZ_LDAP_XPCOM=1
+endif
+
 # Set MSVC dlls version to package, if any.
 # With VS2015+ it does not make sense to define the ucrt libs without
 # the base c++ libs and vice versa. 
 ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
 ifdef WIN_UCRT_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -740,21 +740,26 @@
 ; for Solaris SPARC
 #ifdef SOLARIS
 bin/libfreebl_32fpu_3.so
 bin/libfreebl_32int_3.so
 bin/libfreebl_32int64_3.so
 #endif
 
 ; LDAP components need to be in the browser for AutoConfig
+@RESPATH@/components/nsAbLDAPAttributeMap.js
+#ifdef MOZ_LDAP_XPCOM
 @RESPATH@/components/mozldap.xpt
+@RESPATH@/components/nsAbLDAPAutoCompleteSearch.js
 @RESPATH@/components/nsLDAPProtocolHandler.js
+@RESPATH@/components/ldapComponents.manifest
 @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
+#endif
 
 ; [Updater]
 ;
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
 @BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
@@ -783,17 +788,16 @@ bin/libfreebl_32int64_3.so
 #endif
 
 [mail]
 ; MailNews component xpts
 @RESPATH@/components/addrbook.xpt
 @RESPATH@/components/nsAddrbook.manifest
 @RESPATH@/components/fts3tok.xpt
 @RESPATH@/components/import.xpt
-@RESPATH@/components/ldapComponents.manifest
 @RESPATH@/components/mailview.xpt
 @RESPATH@/components/mime.xpt
 #ifdef MOZ_MAPI_SUPPORT
 @RESPATH@/components/mapihook.xpt
 #endif
 @RESPATH@/components/msgbase.xpt
 @RESPATH@/components/msgBase.manifest
 @RESPATH@/components/msgcompose.xpt
@@ -811,18 +815,16 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/components/msgAsyncPrompter.js
 @RESPATH@/components/msgMime.manifest
 ; OAuth2 for mail
 @RESPATH@/components/msgOAuth2Module.js
 @RESPATH@/components/newsblog.js
 @RESPATH@/components/newsblog.manifest
 @RESPATH@/components/nsAbAutoCompleteMyDomain.js
 @RESPATH@/components/nsAbAutoCompleteSearch.js
-@RESPATH@/components/nsAbLDAPAttributeMap.js
-@RESPATH@/components/nsAbLDAPAutoCompleteSearch.js
 @RESPATH@/components/nsMailNewsCommandLineHandler.js
 @RESPATH@/components/nsMsgTraitService.js
 @RESPATH@/components/nsMsgTraitService.manifest
 @RESPATH@/components/nsNewsAutoCompleteSearch.js
 @RESPATH@/components/nsNewsAutoCompleteSearch.manifest
 @RESPATH@/components/nsSMTPProtocolHandler.js
 @RESPATH@/components/nsSMTPProtocolHandler.manifest
 @RESPATH@/components/offlineStartup.js