--- mozilla/config/autoconf.mk.in.fix15	2007-02-27 23:46:46 +0300
+++ mozilla/config/autoconf.mk.in	2007-02-27 23:46:46 +0300
@@ -121,8 +121,9 @@ MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
 MOZ_XPINSTALL = @MOZ_XPINSTALL@
 MOZ_JSLOADER  = @MOZ_JSLOADER@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@
+MOZ_NATIVE_LDAP = @MOZ_NATIVE_LDAP@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
--- mozilla/configure.in.fix15	2007-02-27 23:46:46 +0300
+++ mozilla/configure.in	2007-02-27 23:54:01 +0300
@@ -3841,8 +3841,13 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" 
     PNG_CFLAGS="-I${PNG_DIR}/include"
     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
 fi
 
+MOZ_NATIVE_LDAP=
+MOZ_ARG_WITH_BOOL(system-nspr,
+[  --with-system-ldap      Use system installed Mozilla LDAP SDK],
+    MOZ_NATIVE_LDAP=1 )
+
 fi # SKIP_LIBRARY_CHECKS
 
 dnl ========================================================
 dnl Java SDK support
@@ -6962,8 +6967,13 @@ if test "$MOZ_LDAP_XPCOM"; then
             LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
     else
         LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
     fi
+    
+    if test "$MOZ_NATIVE_LDAP"; then
+	LDAP_CFLAGS="`pkg-config --cflags-only-I mozldap`"
+	LDAP_LIBS="`pkg-config --libs mozldap`"
+    fi
 fi
 
 if test "$COMPILE_ENVIRONMENT"; then
 if test "$SUNCTL"; then
@@ -7055,8 +7065,9 @@ AC_SUBST(MOZ_INSURE)
 AC_SUBST(MOZ_INSURE_DIRS)
 AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
 AC_SUBST(MOZ_QUANTIFY)
 AC_SUBST(MOZ_INSURIFYING)
+AC_SUBST(MOZ_NATIVE_LDAP)
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
@@ -7547,8 +7558,9 @@ fi
 # if we're building the LDAP XPCOM component, we need to build 
 # the c-sdk first.  
 #
 if test "$MOZ_LDAP_XPCOM"; then
+if test -z "$MOZ_NATIVE_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
     #
@@ -7573,6 +7585,7 @@ if test "$MOZ_LDAP_XPCOM"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     AC_OUTPUT_SUBDIRS(directory/c-sdk)
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+fi # MOZ_NATIVE_LDAP
 fi
 fi # COMPILE_ENVIRONMENT
--- mozilla/Makefile.in.fix15	2007-02-27 23:44:45 +0300
+++ mozilla/Makefile.in	2007-02-27 23:46:46 +0300
@@ -469,10 +469,12 @@ ifndef MOZ_NATIVE_NSPR
 	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
 	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
 endif
 ifdef MOZ_LDAP_XPCOM
+ifndef MOZ_NATIVE_LDAP
 	$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Clean up after pseudo-external modules
@@ -480,10 +482,12 @@ clean clobber realclean clobber_all dist
 ifndef MOZ_NATIVE_NSPR
 	$(MAKE) -C nsprpub $@
 endif
 ifdef MOZ_LDAP_XPCOM
+ifndef MOZ_NATIVE_LDAP
 	$(MAKE) -C directory/c-sdk $@
 endif
+endif
 
 # Map mozilla targets to standard automake target
 ifdef MOZ_ENABLE_LIBXUL
 tier_50: $(addsuffix /Makefile, $(filter-out $(STATIC_MAKEFILES), $($@_dirs)))
@@ -536,10 +540,12 @@ ifndef MOZ_NATIVE_NSPR
 endif
 
 ldap:
 ifdef MOZ_LDAP_XPCOM
+ifndef MOZ_NATIVE_LDAP
 	$(MAKE) -C directory/c-sdk
 endif
+endif
 
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
 	rm -f unallmakefiles $(DIST_GARBAGE)