[packages/icedove.git] / system-mozldap.patch

--- mozilla/configure.in~	2010-03-17 19:02:26.000000000 +0200
+++ mozilla/configure.in	2010-04-09 14:19:51.573033459 +0300
@@ -4953,6 +4953,13 @@
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
+dnl system LDAP Support
+dnl ========================================================
+MOZ_ARG_WITH_STRING(system-ldap,
+[  --with-system-ldap[=PFX]
+                          Use system mozldap [installed at prefix PFX]],
+    MOZ_LDAP_DIR=$withval)
+
 dnl ========================================================
 dnl = Trademarked Branding 
 dnl ========================================================
@@ -7625,7 +7632,7 @@
 # if we're building the LDAP XPCOM component, we need to build 
 # the c-sdk first.  
 #
-if test "$MOZ_LDAP_XPCOM"; then
+if test "$MOZ_LDAP_XPCOM" && test -z "$MOZ_LDAP_DIR"; then
 
     # these subdirs may not yet have been created in the build tree.
     # don't use the "-p" switch to mkdir, since not all platforms have it
Commit	Line	Data
242c2b2f ER	1	--- mozilla/configure.in~ 2010-03-17 19:02:26.000000000 +0200
	2	+++ mozilla/configure.in 2010-04-09 14:19:51.573033459 +0300
	3	@@ -4953,6 +4953,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	@@ -7625,7 +7632,7 @@
	18	# if we're building the LDAP XPCOM component, we need to build
	19	# the c-sdk first.
	20	#
	21	-if test "$MOZ_LDAP_XPCOM"; then
	22	+if test "$MOZ_LDAP_XPCOM" && test -z "$MOZ_LDAP_DIR"; then
	23
	24	# these subdirs may not yet have been created in the build tree.
	25	# don't use the "-p" switch to mkdir, since not all platforms have it