]> git.pld-linux.org Git - packages/thunderbird.git/blame - system-mozldap.patch
- sync with mozilla-thunderbird.spec
[packages/thunderbird.git] / system-mozldap.patch
CommitLineData
7876e8ff 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
d0b96b40
JR
3@@ -134,6 +134,13 @@
4 AC_MSG_RESULT([no])
5 fi
242c2b2f
ER
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 ========================================================
d0b96b40
JR
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 MOZ_ARG_ENABLE_BOOL(incomplete-toolkit-ldap-autocomplete,
31 [ --enable-incomplete-toolkit-ldap-autocomplete Builds a JavaScript component that implements an LDAP autocomplete component using the toolkit interfaces rather than the C++ component using the obsolete XPFE interfaces. ],
32 MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE=1,
33@@ -118,7 +130,7 @@
7876e8ff 34
d0b96b40
JR
35 # if we're building the LDAP XPCOM component, we need to build
36 # the c-sdk first.
7876e8ff 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
d0b96b40
JR
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"
This page took 0.700802 seconds and 4 git commands to generate.