---- mozilla/configure.in~ 2010-03-17 19:02:26.000000000 +0200
-+++ mozilla/configure.in 2010-04-09 14:19:51.573033459 +0300
-@@ -4953,6 +4953,13 @@
- MOZ_LDAP_XPCOM=,
- MOZ_LDAP_XPCOM=1)
+--- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
++++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200
+@@ -134,6 +134,13 @@
+ AC_MSG_RESULT([no])
+ fi
+dnl system LDAP Support
+dnl ========================================================
dnl ========================================================
dnl = Trademarked Branding
dnl ========================================================
-@@ -7625,7 +7632,7 @@
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
- #
+--- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
++++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200
+@@ -59,7 +59,12 @@
+ MOZ_LDAP_XPCOM=,
+ MOZ_LDAP_XPCOM=1)
+
-if test "$MOZ_LDAP_XPCOM"; then
-+if test "$MOZ_LDAP_XPCOM" && test -z "$MOZ_LDAP_DIR"; then
++if test "$MOZ_LDAP_DIR" ; then
++ LDAP_CFLAGS=$(pkg-config --cflags mozldap)
++ LDAP_LIBS=$(pkg-config --libs mozldap)
++ LDAP_COMPONENT=mozldap
++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
++elif test "$MOZ_LDAP_XPCOM"; then
+ LDAP_CFLAGS='-I${DIST}/public/ldap'
+ if test "$OS_ARCH" = "WINNT"; then
+ if test -n "$GNU_CC"; then
+@@ -118,7 +130,7 @@
- # 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 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_LDAP_DIR"; then
+ # Save configure args so we can restore them after configuring LDAP.
+ _save_ac_configure_args="$ac_configure_args"
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"