--- mozilla/mail/build.mk.fix15	2011-01-23 02:34:43.000000000 +0300

+++ mozilla/mail/build.mk	2011-01-23 02:44:15.024241112 +0300

@@ -59,9 +59,11 @@ else # toplevel Makefile

 TIERS += app

 ifdef MOZ_LDAP_XPCOM

+ifndef MOZ_NATIVE_LDAP

 tier_app_staticdirs += directory/sdks/c-sdk

+endif

 tier_app_dirs += directory/xpcom

 endif

 ifdef MOZ_COMPOSER

--- mozilla/config/autoconf.mk.in.fix15	2011-01-23 02:35:34.532259143 +0300

+++ mozilla/config/autoconf.mk.in	2011-01-23 02:35:34.540254143 +0300

@@ -128,8 +128,9 @@ ACCESSIBILITY = @ACCESSIBILITY@

 MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@

 MOZ_XPINSTALL = @MOZ_XPINSTALL@

 MOZ_JSLOADER  = @MOZ_JSLOADER@

 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@

+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/suite/build.mk.fix15	2011-01-23 02:34:43.000000000 +0300

+++ mozilla/suite/build.mk	2011-01-23 02:35:34.540254143 +0300

@@ -51,9 +51,11 @@ else # toplevel Makefile

 TIERS += app

 ifdef MOZ_LDAP_XPCOM

+ifndef MOZ_NATIVE_LDAP

 tier_app_staticdirs += directory/c-sdk

+endif

 tier_app_dirs += directory/xpcom

 endif

 ifdef MOZ_COMPOSER

--- mozilla/configure.in.fix15	2011-01-23 02:35:34.532259143 +0300

+++ mozilla/configure.in	2011-01-23 02:35:34.540254143 +0300

@@ -4510,8 +4510,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 system HunSpell Support

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

@@ -7103,8 +7108,12 @@ if test "$MOZ_LDAP_XPCOM"; then

             LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'

     else

         LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'

     fi

+    if test "$MOZ_NATIVE_LDAP"; then

+	LDAP_CFLAGS="`pkg-config --cflags-only-I mozldap`"

+	LDAP_LIBS="`pkg-config --libs mozldap`"

+    fi

 fi

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

 dnl =

@@ -7165,8 +7174,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)

@@ -7614,9 +7624,9 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"

 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"

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

 # the c-sdk first.  

-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then

+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -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

     if test ! -d "directory/sdks/c-sdk/ldap"; then

         if test ! -d "directory/sdks/c-sdk"; then