--- mozilla/configure.in.orig	2006-08-19 00:46:36 +0400

+++ mozilla/configure.in	2006-08-19 21:44:37 +0400

@@ -4287,6 +4287,12 @@

     MOZ_LDAP_XPCOM=,

     MOZ_LDAP_XPCOM=1)

+MOZ_ARG_WITH_BOOL(system-ldap,

+[  --with-system-ldap      Use system installed MozLDAP],

+    USE_SYSTEM_LDAP=1,

+    USE_SYSTEM_LDAP=)

+AC_SUBST(USE_SYSTEM_LDAP)

+

 dnl ========================================================

 dnl = Trademarked Branding 

 dnl ========================================================

@@ -6577,6 +6583,9 @@

         LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'

     fi

 fi

+if test "$USE_SYSTEM_LDAP"; then

+	PKG_CHECK_MODULES([LDAP], [mozldap])

+fi

 if test "$COMPILE_ENVIRONMENT"; then

 if test "$SUNCTL"; then

@@ -7114,7 +7123,7 @@

 unset CONFIG_FILES

 if test "$COMPILE_ENVIRONMENT"; then

-if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then

+if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM" -a -z "$USE_SYSTEM_LDAP"; then

     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"

     if test -z "$MOZ_DEBUG"; then

         ac_configure_args="$ac_configure_args --disable-debug"

@@ -7149,7 +7158,7 @@

 # if we're building the LDAP XPCOM component, we need to build 

 # the c-sdk first.  

 #

-if test "$MOZ_LDAP_XPCOM"; then

+if test "$MOZ_LDAP_XPCOM" -a -z "$USE_SYSTEM_LDAP" ; then

     # these subdirs may not yet have been created in the build tree.

     # don't use the "-p" switch to mkdir, since not all platforms have it

--- mozilla/Makefile.in.orig	2006-08-19 21:55:32 +0400

+++ mozilla/Makefile.in	2006-08-19 21:56:19 +0400

@@ -483,7 +483,9 @@

 	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)

 endif

 ifdef MOZ_LDAP_XPCOM

+ifndef USE_SYSTEM_LDAP

 	$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap

+endif	

 endif

 include $(topsrcdir)/config/rules.mk

@@ -494,7 +496,9 @@

 	$(MAKE) -C nsprpub $@

 endif

 ifdef MOZ_LDAP_XPCOM

+ifndef USE_SYSTEM_LDAP

 	$(MAKE) -C directory/c-sdk $@

+endif	

 endif

 # Map mozilla targets to standard automake target

@@ -550,7 +554,9 @@

 ldap:

 ifdef MOZ_LDAP_XPCOM

+ifndef USE_SYSTEM_LDAP

 	$(MAKE) -C directory/c-sdk

+endif	

 endif

 distclean::

--- mozilla/config/autoconf.mk.in.orig	2006-08-19 21:42:23 +0400

+++ mozilla/config/autoconf.mk.in	2006-08-19 23:22:52 +0400

@@ -122,6 +122,7 @@

 MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@

 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@

 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@

+USE_SYSTEM_LDAP = @USE_SYSTEM_LDAP@

 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@

 XPCOM_USE_LEA = @XPCOM_USE_LEA@

 JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@