Bug 1639853 - Remove MOZ_LDAP_XPCOM defines from suite. r=frg
authorBill Gianopoulos <wgianopoulos@gmail.com>
Tue, 19 May 2020 19:15:50 -0400
changeset 29636 44171a2e26b1e23c73022a2754d8b4808291e66c
parent 29635 f2646b70e308effbbe225747834d92d6e003dac3
child 29637 b8c06eb419142c4deea5775cd522c863518a81df
push id17465
push userfrgrahl@gmx.net
push dateThu, 21 May 2020 13:02:07 +0000
treeherdercomm-central@44171a2e26b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1639853, 1637921
Bug 1639853 - Remove MOZ_LDAP_XPCOM defines from suite. r=frg Port Bug 1637921 "Always build LDAP, and remove the MOZ_LDAP_XPCOM define".
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -90,20 +90,16 @@ endif
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI=1
 endif
 
 ifdef MOZ_BUNDLED_FONTS
 DEFINES += -DMOZ_BUNDLED_FONTS=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
@@ -388,21 +388,19 @@
 ; 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
-#ifdef MOZ_LDAP_XPCOM
 @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
-#endif
 
 ; [MAN pages]
 #ifdef UNIX_BUT_NOT_MAC
 man/*
 #endif
 
 ; [Updater]
 ;