From d6a020730e77de56d701fa5f566a4b8f421e064d Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Wed, 27 Mar 2013 00:34:19 +0100
Subject: a little ldap cleaning

Change-Id: Ib224484ef994312e78bac75c40421c7f6235326a
---
 RepositoryExternal.mk                        | 2 +-
 connectivity/Library_postgresql-sdbc-impl.mk | 2 +-
 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,\
-- 
cgit v1.2.3