]>
Commit | Line | Data |
---|---|---|
d0b96b40 JR |
1 | --- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 |
2 | +++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200 | |
3 | @@ -59,7 +59,12 @@ | |
4 | MOZ_LDAP_XPCOM=, | |
5 | MOZ_LDAP_XPCOM=1) | |
6 | ||
7 | -if test "$MOZ_LDAP_XPCOM"; then | |
8 | +if test "$MOZ_LDAP_DIR" ; then | |
9 | + LDAP_CFLAGS=$(pkg-config --cflags mozldap) | |
10 | + LDAP_LIBS=$(pkg-config --libs mozldap) | |
11 | + LDAP_COMPONENT=mozldap | |
12 | + LDAP_MODULE="MODULE(nsLDAPProtocolModule)" | |
13 | +elif test "$MOZ_LDAP_XPCOM"; then | |
590c075b JR |
14 | LDAP_CFLAGS='-I${DIST}/public/ldap' |
15 | if test "$OS_ARCH" = "WINNT"; then | |
16 | if test -n "$GNU_CC"; then | |
d0b96b40 | 17 | @@ -118,7 +130,7 @@ |
7876e8ff | 18 | |
d0b96b40 JR |
19 | # if we're building the LDAP XPCOM component, we need to build |
20 | # the c-sdk first. | |
7876e8ff | 21 | -if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then |
22 | +if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then | |
d0b96b40 JR |
23 | # Save configure args so we can restore them after configuring LDAP. |
24 | _save_ac_configure_args="$ac_configure_args" | |
25 | ac_configure_args="$_SUBDIR_CONFIG_ARGS" |