|
1 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
|
2 --- a/config/autoconf.mk.in |
|
3 +++ b/config/autoconf.mk.in |
|
4 @@ -421,16 +421,17 @@ NSPR_CONFIG = @NSPR_CONFIG@ |
|
5 NSPR_CFLAGS = @NSPR_CFLAGS@ |
|
6 NSPR_LIBS = @NSPR_LIBS@ |
|
7 |
|
8 NSS_CONFIG = @NSS_CONFIG@ |
|
9 NSS_CFLAGS = @NSS_CFLAGS@ |
|
10 NSS_LIBS = @NSS_LIBS@ |
|
11 NSS_DEP_LIBS = @NSS_DEP_LIBS@ |
|
12 |
|
13 +MOZ_NATIVE_MOZLDAP = @SYSTEM_MOZLDAP@ |
|
14 LDAP_CFLAGS = @LDAP_CFLAGS@ |
|
15 LDAP_LIBS = @LDAP_LIBS@ |
|
16 XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@ |
|
17 XPCOM_STANDALONE_GLUE_LDOPTS = @XPCOM_STANDALONE_GLUE_LDOPTS@ |
|
18 MOZ_XPCOM_OBSOLETE_LIBS = @MOZ_XPCOM_OBSOLETE_LIBS@ |
|
19 |
|
20 USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@ |
|
21 |
|
22 diff --git a/configure.in b/configure.in |
|
23 --- a/configure.in |
|
24 +++ b/configure.in |
|
25 @@ -4936,16 +4936,34 @@ dnl ==================================== |
|
26 dnl = LDAP |
|
27 dnl ========================================================= |
|
28 MOZ_ARG_DISABLE_BOOL(ldap, |
|
29 [ --disable-ldap Disable LDAP support], |
|
30 MOZ_LDAP_XPCOM=, |
|
31 MOZ_LDAP_XPCOM=1) |
|
32 |
|
33 dnl ======================================================== |
|
34 +dnl = If mozldap was not detected in the system, |
|
35 +dnl = use the one in the source tree (mozilla/directory/c-sdk) |
|
36 +dnl ======================================================== |
|
37 + |
|
38 +if test -n "$MOZ_LDAP_XPCOM"; then |
|
39 + MOZ_ARG_ENABLE_BOOL(system-mozldap, |
|
40 + [ --enable-system-mozldap |
|
41 + Use system installed mozldap (located with pkgconfig)], |
|
42 + SYSTEM_MOZLDAP=1 ) |
|
43 + |
|
44 + if test -n "$SYSTEM_MOZLDAP"; then |
|
45 + PKG_CHECK_MODULES(MOZLDAP, mozldap >= 6.0.6, |
|
46 + SYSTEM_MOZLDAP=1, SYSTEM_MOZLDAP=) |
|
47 + fi |
|
48 +fi |
|
49 +AC_SUBST(SYSTEM_MOZLDAP) |
|
50 + |
|
51 +dnl ======================================================== |
|
52 dnl = Trademarked Branding |
|
53 dnl ======================================================== |
|
54 MOZ_ARG_ENABLE_BOOL(official-branding, |
|
55 [ --enable-official-branding Enable Official mozilla.org Branding |
|
56 Do not distribute builds with |
|
57 --enable-official-branding unless you have |
|
58 permission to use trademarks per |
|
59 http://www.mozilla.org/foundation/trademarks/ .], |
|
60 @@ -7043,17 +7061,22 @@ if test "$MOZ_LDAP_XPCOM"; then |
|
61 if test -n "$GNU_CC"; then |
|
62 LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60' |
|
63 else |
|
64 LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}' |
|
65 fi |
|
66 elif test "$OS_ARCH" = "OS2"; then |
|
67 LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}' |
|
68 else |
|
69 - LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60' |
|
70 + if test "$SYSTEM_MOZLDAP"; then |
|
71 + LDAP_LIBS="$MOZLDAP_LIBS" |
|
72 + LDAP_CFLAGS="$MOZLDAP_CFLAGS" |
|
73 + else |
|
74 + LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60' |
|
75 + fi |
|
76 fi |
|
77 fi |
|
78 |
|
79 dnl ======================================================== |
|
80 dnl = |
|
81 dnl = Maintainer debug option (no --enable equivalent) |
|
82 dnl = |
|
83 dnl ======================================================== |
|
84 @@ -7603,17 +7626,17 @@ fi |
|
85 AC_OUTPUT_SUBDIRS(mozilla) |
|
86 ac_configure_args="$_SUBDIR_CONFIG_ARGS" |
|
87 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED" |
|
88 |
|
89 if test "$COMPILE_ENVIRONMENT"; then |
|
90 # if we're building the LDAP XPCOM component, we need to build |
|
91 # the c-sdk first. |
|
92 # |
|
93 -if test "$MOZ_LDAP_XPCOM"; then |
|
94 +if test "$MOZ_LDAP_XPCOM" -a -z "$SYSTEM_MOZLDAP" ; then |
|
95 |
|
96 # these subdirs may not yet have been created in the build tree. |
|
97 # don't use the "-p" switch to mkdir, since not all platforms have it |
|
98 # |
|
99 if test ! -d "directory"; then |
|
100 mkdir "directory" |
|
101 fi |
|
102 if test ! -d "directory/c-sdk"; then |
|
103 diff --git a/mail/build.mk b/mail/build.mk |
|
104 --- a/mail/build.mk |
|
105 +++ b/mail/build.mk |
|
106 @@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS |
|
107 tier_app_dirs += extensions |
|
108 endif |
|
109 |
|
110 else # toplevel Makefile |
|
111 |
|
112 TIERS += app |
|
113 |
|
114 ifdef MOZ_LDAP_XPCOM |
|
115 +ifndef MOZ_NATIVE_MOZLDAP |
|
116 tier_app_staticdirs += directory/c-sdk |
|
117 +endif |
|
118 tier_app_dirs += directory/xpcom |
|
119 endif |
|
120 |
|
121 ifdef MOZ_COMPOSER |
|
122 tier_app_dirs += editor/ui |
|
123 endif |
|
124 |
|
125 ifdef MOZ_BRANDING_DIRECTORY |
|
126 diff --git a/suite/build.mk b/suite/build.mk |
|
127 --- a/suite/build.mk |
|
128 +++ b/suite/build.mk |
|
129 @@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS |
|
130 tier_app_dirs += extensions |
|
131 endif |
|
132 |
|
133 else # toplevel Makefile |
|
134 |
|
135 TIERS += app |
|
136 |
|
137 ifdef MOZ_LDAP_XPCOM |
|
138 +ifndef MOZ_NATIVE_MOZLDAP |
|
139 tier_app_staticdirs += directory/c-sdk |
|
140 +endif |
|
141 tier_app_dirs += directory/xpcom |
|
142 endif |
|
143 |
|
144 ifdef MOZ_COMPOSER |
|
145 tier_app_dirs += editor/ui |
|
146 endif |
|
147 |
|
148 ifdef MOZ_BRANDING_DIRECTORY |