diff options
| -rw-r--r-- | RepositoryExternal.mk | 35 | ||||
| -rw-r--r-- | extensions/Library_ldapbe2.mk | 4 |
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 \ |