projects / packages / seamonkey.git / blame
| 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 | |
| c7d608a7 JB |
3 | @@ -134,6 +134,13 @@ |
| 4 | AC_MSG_RESULT([no]) | |
| 5 | fi | |
| c376f173 JR |
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 ======================================================== | |
| c7d608a7 JB |
17 | --- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 |
| 18 | +++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200 | |
| 19 | @@ -59,7 +59,12 @@ | |
| 20 | MOZ_LDAP_XPCOM=, | |
| 21 | MOZ_LDAP_XPCOM=1) | |
| 22 | ||
| 23 | -if test "$MOZ_LDAP_XPCOM"; then | |
| 24 | +if test "$MOZ_LDAP_DIR" ; then | |
| 25 | + LDAP_CFLAGS=$(pkg-config --cflags mozldap) | |
| 26 | + LDAP_LIBS=$(pkg-config --libs mozldap) | |
| 27 | + LDAP_COMPONENT=mozldap | |
| 28 | + LDAP_MODULE="MODULE(nsLDAPProtocolModule)" | |
| 29 | +elif test "$MOZ_LDAP_XPCOM"; then | |
| 30 | LDAP_CFLAGS='-I${DIST}/public/ldap' | |
| 31 | if test "$OS_ARCH" = "WINNT"; then | |
| 32 | if test -n "$GNU_CC"; then | |
| 33 | @@ -118,7 +130,7 @@ | |
| 34 | ||
| 35 | # if we're building the LDAP XPCOM component, we need to build | |
| 36 | # the c-sdk first. | |
| 37 | -if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then | |
| 38 | +if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then | |
| 39 | # Save configure args so we can restore them after configuring LDAP. | |
| 40 | _save_ac_configure_args="$ac_configure_args" | |
| 41 | ac_configure_args="$_SUBDIR_CONFIG_ARGS" | |
| 42 | --- mozilla/suite/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 | |
| 43 | +++ mozilla/suite/configure.in 2010-07-06 11:14:54.350499449 +0200 | |
| 44 | @@ -59,7 +59,12 @@ | |
| 45 | MOZ_LDAP_XPCOM=, | |
| 46 | MOZ_LDAP_XPCOM=1) | |
| 47 | ||
| 48 | -if test "$MOZ_LDAP_XPCOM"; then | |
| 49 | +if test "$MOZ_LDAP_DIR" ; then | |
| 50 | + LDAP_CFLAGS=$(pkg-config --cflags mozldap) | |
| 51 | + LDAP_LIBS=$(pkg-config --libs mozldap) | |
| 52 | + LDAP_COMPONENT=mozldap | |
| 53 | + LDAP_MODULE="MODULE(nsLDAPProtocolModule)" | |
| 54 | +elif test "$MOZ_LDAP_XPCOM"; then | |
| 55 | LDAP_CFLAGS='-I${DIST}/public/ldap' | |
| 56 | if test "$OS_ARCH" = "WINNT"; then | |
| 57 | if test -n "$GNU_CC"; then | |
| 58 | @@ -113,7 +125,7 @@ | |
| c376f173 | 59 | |
| c7d608a7 JB |
60 | # if we're building the LDAP XPCOM component, we need to build |
| 61 | # the c-sdk first. | |
| c376f173 JR |
62 | -if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then |
| 63 | +if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then | |
| c7d608a7 JB |
64 | # Save configure args so we can restore them after configuring LDAP. |
| 65 | _save_ac_configure_args="$ac_configure_args" | |
| 66 | ac_configure_args="$_SUBDIR_CONFIG_ARGS" |