From d23dcfdb976c20014e7d263400bb4b03a018c5df Mon Sep 17 00:00:00 2001
From: "dmose%mozilla.org" <dmose%mozilla.org>
Date: Thu, 1 Jun 2000 00:26:48 +0000
Subject: [PATCH] make mozilla configure and build the ldap sdk when
 --enable-ldap is given.  r=pavlov@netscape.com,cls@seawoord.org;
 a=brendan@mozilla.org.

---
 Makefile.in           |  4 ++++
 config/autoconf.mk.in |  1 +
 configure.in          | 12 +++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 794b06e1a29f..5625cbe91868 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,6 +131,10 @@ ifdef ENABLE_TESTS
 DIRS		+= xpcom/tests
 endif
 
+ifdef MOZ_LDAP_XPCOM
+DIRS	+=	directory/c-sdk/ldap directory/xpcom
+endif
+
 endif # BUILD_MODULES == all
 
 STATIC_MAKEFILES := $(NSPRPUB_DIR)
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index e0a93f5b425b..00d78d7cff89 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -71,6 +71,7 @@ ENABLE_TESTS	= @ENABLE_TESTS@
 BUILD_IDLC = @BUILD_IDLC@
 NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@
 MOZ_ENDER_LITE = @MOZ_ENDER_LITE@
+MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
 MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
diff --git a/configure.in b/configure.in
index c8c1f38a6a15..22ce41333588 100644
--- a/configure.in
+++ b/configure.in
@@ -3252,7 +3252,8 @@ dnl
 MOZ_ARG_ENABLE_BOOL(ldap,
 [  --enable-ldap           Enable LDAP (default=no); will fail w/o prereqs at
                             http://www.mozilla.org/directory/xpcom.html ],
-  MOZ_LDAP_XPCOM=1)
+  MOZ_LDAP_XPCOM=1
+    )
 
 dnl --enable mathml
 dnl TODO: handle include files here ?
@@ -3413,6 +3414,7 @@ AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_INSURIFYING)
 AC_SUBST(MOZ_BUILD_XPFE)
 dnl AC_SUBST(MOZ_LDAP)
+AC_SUBST(MOZ_LDAP_XPCOM)
 
 AC_SUBST(UNIX_CRASH_ON_ASSERT)
 AC_SUBST(NO_UNIX_ASYNC_DNS)
@@ -4027,3 +4029,11 @@ if test -z "$MOZ_NATIVE_NSPR" && test -n "$USE_NSPR_AUTOCONF"; then
   ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
   AC_OUTPUT_SUBDIRS(nsprpub)
 fi
+
+# if we're building the LDAP XPCOM component, we need to build 
+# the c-sdk first.  
+#
+if test "$MOZ_LDAP_XPCOM"; then
+  ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
+  AC_OUTPUT_SUBDIRS(directory/c-sdk/ldap)
+fi