First attempt at removing mozilla ldap at all (please help to fix)

Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73

4 files changed, 12 insertions, 51 deletions

diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index e2f4d844e06c..3a5736f6aeb5 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -34,26 +34,11 @@ $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap
 
 $(eval $(call gb_Library_use_sdk_api,ldapbe2))
 
-ifeq ($(LDAPSDKINCLUDES),)
-ifneq ($(WITH_OPENLDAP),YES)
-ifeq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_Library_set_include,ldapbe2,\
-	$$(INCLUDE) \
-	$(MOZ_LDAP_CFLAGS) \
-))
-else # SYSTEM_MOZILLA=NO
-$(eval $(call gb_Library_set_include,ldapbe2,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/mozilla \
-))
-endif # SYSTEM_MOZILLA=YES
-else # WITH_OPENLDAP=YES
+ifneq ($(OS),WNT)
 $(eval $(call gb_Library_add_defs,ldapbe2,\
-	-DWITH_OPENLDAP \
 	-DLDAP_DEPRECATED \
 ))
-endif # WITH_OPENLDAP=NO
-endif # LDAPSDKINCLUDES=
+endif
 
 $(eval $(call gb_Library_add_exception_objects,ldapbe2,\
 	extensions/source/config/ldap/componentdef \
@@ -73,16 +58,11 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
 	wldap32 \
 ))
 else # 0S!=WNT
-ifneq ($(WITH_OPENLDAP),YES)
-$(eval $(call gb_Library_add_libs,ldapbe2,\
-	-lldap50 \
-))
-else # WITH_OPENLDAP=YES
 $(eval $(call gb_Library_add_libs,ldapbe2,\
 	-lldap \
+	-llber \
 ))
 endif
-endif
 
 
 
@@ -90,12 +70,6 @@ ifeq ($(OS),FREEBSD)
 $(eval $(call gb_Library_add_libs,ldapbe2,\
 	-lcompat \
 ))
-ifneq ($(WITH_OPENLDAP),YES)
-$(eval $(call gb_Library_add_libs,ldapbe2,\
-	-Wl,-Bstatic
-	-llber50 \
-))
-endif # WITH_OPENLDAP=NO
 endif # OS=FREEBSD
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 30144de68361..49b015eb8409 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	AllLangResTarget_scn \
 	AllLangResTarget_upd \
 	Library_abp \
+	Library_ldapbe2 \
 	Library_log \
 	Library_res \
 	Library_scn \
@@ -130,10 +131,4 @@ $(eval $(call gb_Module_add_targets,extensions,\
 ))
 endif # OS=MACOSX
 
-ifeq ($(WITH_LDAP),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
-	Library_ldapbe2 \
-))
-endif # WITH_LDAP=YES
-
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 90e646afbf81..c7fd3ed4f30a 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg salhelper TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt CPPUNIT:cppunit NULL
+ex  extensions :  officecfg salhelper OPENLDAP:openldap TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt CPPUNIT:cppunit NULL
 ex  extensions\prj                              nmake   -   all ex_prj NULL
 
 # Fails at the moment
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index f76f0558e688..7b03fcd99449 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -22,16 +22,6 @@
 #pragma warning (disable:4668)
 #endif
 
-#ifdef WITH_OPENLDAP
-#include <ldap.h>
-#ifndef LDAP_API
-#    define LDAP_API(rt) rt
-#endif
-#ifndef LDAP_CALL
-#    define LDAP_CALL
-#endif
-#define CONST_PCHAR_CAST
-#else
 #ifdef WNT
 #include <windows.h>
 #include <winldap.h>
@@ -46,13 +36,15 @@
 #    define LDAP_NO_ATTRS "1.1"
 #endif
 #else // !defined WNT
+#include <ldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
 #define CONST_PCHAR_CAST
-#ifndef LDAP_INCLUDED
-#define LDAP_INCLUDED
-#include <ldap/ldap.h>
-#endif // LDAP_INCLUDED
 #endif // WNT
-#endif
 
 #ifdef WNT
 #pragma warning (pop)