diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-27 00:34:19 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-27 00:40:11 +0100 |
| commit | d6a020730e77de56d701fa5f566a4b8f421e064d (patch) | |
| tree | 5d9b4c92bee6f6dafa4b75d3c34fdaeca0edc742 | |
| parent | 1e14293ef7da3fe289bbf61afe84ce727319c839 (diff) | |
a little ldap cleaning
Change-Id: Ib224484ef994312e78bac75c40421c7f6235326a
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_ldapbe2.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 443e4a4d5bd3..216dd4dd6eae 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1917,7 +1917,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -else # !SYSTEM_OPENLDAP +else ifeq ($(SYSTEM_OPENLDAP),NO) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ ldap \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 00832dd3e935..d733f01662ea 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ openssl \ - $(if $(SYSTEM_OPENLDAP),openldap) \ + openldap \ nss3 \ plc4 \ ssl3 \ diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index bfed3013ab38..2b21a9d8f21f 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ - plc4,wldap32 \ + wldap32 \ )) else # 0S!=WNT $(eval $(call gb_Library_use_externals,ldapbe2,\ |