# HG changeset patch
# User Bill Gianopoulos <wgianopoulos@gmail.com>
# Date 1589930150 14400
# Node ID 44171a2e26b1e23c73022a2754d8b4808291e66c
# Parent  fbd77f425a58d141663bd006127e83557821c685
Bug 1639853 - Remove MOZ_LDAP_XPCOM defines from suite. r=frg
Port Bug 1637921 "Always build LDAP, and remove the MOZ_LDAP_XPCOM define".

diff --git a/suite/configure.in b/suite/configure.in
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -41,26 +41,16 @@ dnl = Lightning extension
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
     MOZ_CALENDAR= )
 AC_SUBST(MOZ_CALENDAR)
 
 dnl =========================================================
-dnl = LDAP
-dnl =========================================================
-MOZ_ARG_DISABLE_BOOL(ldap,
-[  --disable-ldap          Disable LDAP support],
-    MOZ_LDAP_XPCOM=,
-    MOZ_LDAP_XPCOM=1)
-
-AC_SUBST(MOZ_LDAP_XPCOM)
-
-dnl =========================================================
 dnl = MAPI support (Windows only)
 dnl =========================================================
 
 if test "$_WIN32_MSVC"; then
     MOZ_MAPI_SUPPORT=1
 fi
 
 MOZ_ARG_DISABLE_BOOL(mapi,
diff --git a/suite/confvars.sh b/suite/confvars.sh
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -2,17 +2,16 @@
 # 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/.
 
 MOZ_APP_BASENAME=SeaMonkey
 MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
-MOZ_LDAP_XPCOM=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/seamonkey
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/seamonkey
 
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
diff --git a/suite/installer/Makefile.in b/suite/installer/Makefile.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -95,20 +95,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)
diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -714,25 +714,23 @@
 #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@