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

@@ -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)

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@

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