]>
Commit | Line | Data |
---|---|---|
c376f173 JR |
1 | --- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 |
2 | +++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200 | |
3 | @@ -5032,6 +5032,13 @@ | |
4 | MOZ_LDAP_XPCOM=, | |
5 | MOZ_LDAP_XPCOM=1) | |
6 | ||
7 | +dnl system LDAP Support | |
8 | +dnl ======================================================== | |
9 | +MOZ_ARG_WITH_STRING(system-ldap, | |
10 | +[ --with-system-ldap[=PFX] | |
11 | + Use system mozldap [installed at prefix PFX]], | |
12 | + MOZ_LDAP_DIR=$withval) | |
13 | + | |
14 | dnl ======================================================== | |
15 | dnl = Trademarked Branding | |
16 | dnl ======================================================== | |
17 | @@ -7612,7 +7619,7 @@ | |
18 | ||
19 | # if we're building the LDAP XPCOM component, we need to build | |
20 | # the c-sdk first. | |
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 | |
23 | # these subdirs may not yet have been created in the build tree. | |
24 | # don't use the "-p" switch to mkdir, since not all platforms have it | |
25 | if test ! -d "directory/c-sdk/ldap"; then |