summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-16 19:00:07 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-16 19:00:07 +0200
commite0ee0d444e5107bc2bbc2ac9f3bda19150f4f82b (patch)
tree640225fc402a8186ecda8d14562b3ed33a96493f
parentff89c90f7dffed78fb84fbf1139e112aa65fec44 (diff)
RepositoryExternal.mk: add openldap
Change-Id: I5f673db405449d28951eff4d6d30ad0b9ec5d77f
-rw-r--r--RepositoryExternal.mk35
-rw-r--r--extensions/Library_ldapbe2.mk4
2 files changed, 37 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8f542d74e916..9394c85e4abd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1328,6 +1328,41 @@ endef
endif # SYSTEM_HSQLDB
+ifdef ($(SYSTEM_OPENLDAP),YES)
+
+define gb_LinkTarget__use_openldap
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ -lldap \
+ -llber \
+)
+
+endef
+
+else # !SYSTEM_OPENLDAP
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+ ldap \
+ lber \
+))
+
+define gb_LinkTarget__use_openldap
+
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(OUTDIR)/inc/openldap \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+ ldap \
+ lber \
+)
+
+endef
+
+endif # SYSTEM_OPENLDAP
+
+
ifeq ($(SYSTEM_POSTGRESQL),YES)
define gb_LinkTarget__use_postgresql
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 9fd80731ede6..d503cf6bb8cc 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -58,9 +58,9 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
wldap32 \
))
else # 0S!=WNT
+$(eval $(call gb_Library_use_externals,ldapbe2,openldap))
+
$(eval $(call gb_Library_add_libs,ldapbe2,\
- -lldap \
- -llber \
-lssl3 \
-lsmime3 \
-lnss3 \