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

Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73

14 files changed, 43 insertions, 134 deletions

diff --git a/Repository.mk b/Repository.mk
index 3d6f4238b55f..b9ea8fb9b943 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -547,6 +547,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     i18nsearch \
     kdebe1 \
     kde4be1 \
+    ldapbe2 \
     localebe1 \
     lomenubar \
     macbe1 \
@@ -594,12 +595,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 ))
 endif
 
-ifeq ($(WITH_LDAP),YES)
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
-    ldapbe2 \
-))
-endif
-
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
     acceptor \
     binaryurp \
diff --git a/config_host.mk.in b/config_host.mk.in
index 8aac2ea57277..4b4bd29bb1ec 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -369,7 +369,6 @@ export MOZILLA_HEADERS_CFLAGS=@MOZILLA_HEADERS_CFLAGS@
 export MOZILLA_VERSION=@MOZILLA_VERSION@
 export MOZ_FLAVOUR=@MOZ_FLAVOUR@
 export MOZ_INC=@MOZ_INC@
-export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
 export MOZ_LIB=@MOZ_LIB@
 export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
 export MSPUB_CFLAGS=@MSPUB_CFLAGS@
@@ -532,6 +531,7 @@ export SYSTEM_MYTHES=@SYSTEM_MYTHES@
 export SYSTEM_NEON=@SYSTEM_NEON@
 export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
+export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
 export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PANGO=@SYSTEM_PANGO@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
@@ -579,11 +579,9 @@ export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
 export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
-export WITH_LDAP=@WITH_LDAP@
 export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
 export WITH_MOZILLA=@WITH_MOZILLA@
 export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
-export WITH_OPENLDAP=@WITH_OPENLDAP@
 export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
 export WITH_STLPORT=@WITH_STLPORT@
 export WITH_THEMES=@WITH_THEMES@
diff --git a/configure.in b/configure.in
index b6520ebbc9cd..7069b5e57c63 100644
--- a/configure.in
+++ b/configure.in
@@ -593,11 +593,6 @@ AC_ARG_ENABLE(graphite,
         [Enables the compilation of Graphite smart font rendering.])
 )
 
-AC_ARG_ENABLE(ldap,
-    AS_HELP_STRING([--disable-ldap],
-        [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK])
-)
-
 AC_ARG_ENABLE(fetch-external,
     AS_HELP_STRING([--disable-fetch-external],
         [Disables fetching external tarballs from web sources.])
@@ -1040,11 +1035,6 @@ AC_ARG_WITH(linked-git,
     GIT_LINK_SRC=$withval ,
 )
 
-AC_ARG_WITH(openldap,
-    AS_HELP_STRING([--with-openldap],
-        [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
-,)
-
 AC_ARG_WITH(vba-package-format,
     AS_HELP_STRING([--with-vba-package-format],
         [Specify package format for vba compatibility api. Specifying  "builtin"
@@ -1270,6 +1260,11 @@ AC_ARG_WITH(system-icu,
         [Use icu already on system.]),,
     [with_system_icu="$with_system_libs"])
 
+AC_ARG_WITH(system_openldap,
+    AS_HELP_STRING([--with-system-openldap],
+        [Use the OpenLDAP LDAP SDK already on system.]),,
+	[with_system_openldap="$with_system_libs"])
+
 AC_ARG_WITH(system-poppler,
     AS_HELP_STRING([--with-system-poppler],
         [Use system poppler. (only needed for pdfimport extension)]),,
@@ -7528,33 +7523,27 @@ else
 fi
 AC_SUBST(ENABLE_XMLSEC)
 
-AC_MSG_CHECKING([whether to build LDAP configuration backend])
-if test "$enable_ldap" != "no"; then
-    WITH_OPENLDAP=NO
-    WITH_LDAP=NO
-    if test "$with_openldap" = "yes"; then
-        WITH_LDAP=YES
-        AC_MSG_RESULT([OpenLDAP])
-        WITH_OPENLDAP=YES
-        AC_CHECK_HEADERS(ldap.h, [],
-            [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
-	AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:],
-	    [AC_MSG_ERROR(openldap lib not found or functional)], [])
-	AC_CHECK_LIB([ldap], [ldap_set_option], [:],
-	    [AC_MSG_ERROR(openldap lib not found or functional)], [])
-    elif test "$enable_mozilla" != "no"; then
-        AC_MSG_RESULT([Mozilla])
-        WITH_LDAP=YES
-        WITH_OPENLDAP=NO
-    else
-        AC_MSG_RESULT([no. Either Mozilla or OpenLDAP required])
-    fi
+dnl ===================================================================
+dnl Check for system openldap
+dnl ===================================================================
+
+if test "$_os" != "WINNT"; then
+AC_MSG_CHECKING([which openldap library to use])
+if test "$with_system_openldap" = "yes"; then
+	AC_MSG_RESULT([external])
+    SYSTEM_OPENLDAP=YES
+    AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
+	AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
+	AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
 else
-    AC_MSG_RESULT([no])
-    WITH_LDAP=NO
+    AC_MSG_RESULT([internal])
+    SYSTEM_OPENLDAP=NO
+	BUILD_TYPE="$BUILD_TYPE OPENLDAP"
+fi
+else
+    SYSTEM_OPENLDAP=NO
 fi
-AC_SUBST(WITH_LDAP)
-AC_SUBST(WITH_OPENLDAP)
+AC_SUBST(SYSTEM_OPENLDAP)
 
 dnl ===================================================================
 dnl Check for system mozilla
@@ -7602,17 +7591,6 @@ if test -n "$with_system_mozilla" -a "$with_system_mozilla" != "no"; then
     fi
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-    if test "$WITH_LDAP" != "NO" -a "$WITH_OPENLDAP" != "YES"; then
-        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
-        if test -d "$MOZ_INC/ldap"; then
-            AC_MSG_RESULT([yes])
-            MOZ_LDAP_CFLAGS="-I$MOZ_INC"
-        else
-            AC_MSG_ERROR([no.
-Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap.])
-        fi
-    fi
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
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)
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index a04b6e275667..41fd8ca69776 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -56,30 +56,17 @@ CONFIGURE_DIR=.
 BUILD_DIR=src
 
 CONFIGURE_ACTION =
-BUILD_ACTION = nmake -f win32.mak USE_SSL=1
-.IF "$(WITH_LDAP)" == "YES"
-BUILD_ACTION += USE_LDAP=1
-.IF "$(WITH_OPENLDAP)" != "YES"
-BUILD_ACTION += USE_MICROSOFT_LDAP=1
-.ENDIF
-.ENDIF # "$(WITH_LDAP)" == "YES"
+BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MICROSOFT_LDAP=1
 .ELSE #"$(GUI)$(COM)"!="WNTMSC"
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl
+CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl --with-ldap
 
 .IF "$(CROSS_COMPILING)" == "YES"
 CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
-.IF "$(WITH_LDAP)" == "YES"
-CONFIGURE_ACTION += --with-ldap
-.IF "$(WITH_OPENLDAP)" != "YES"
-CONFIGURE_ACTION += --with-includes='$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap' --with-mozldap
-.ENDIF
-.ENDIF # "$(WITH_LDAP)" == "YES"
-
 .IF "$(WITH_KRB5)" == "YES"
 CONFIGURE_ACTION += --with-krb5
 .ENDIF
diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst
index 5059f9521b22..abe042ea5a34 100644
--- a/postgresql/prj/build.lst
+++ b/postgresql/prj/build.lst
@@ -1,3 +1,3 @@
-my	postgresql	:	solenv sal OPENSSL:openssl MOZ:moz NULL
+my	postgresql	:	solenv sal OPENLDAP:openldap OPENSSL:openssl NULL
 my	postgresql    nmake	-	all	my_mkout NULL
 
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b70211801a66..0ba2f2532e07 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -165,6 +165,7 @@ my_components += \
     component/desktop/source/splash/spl \
     component/extensions/source/abpilot/abp \
     component/extensions/source/bibliography/bib \
+	component/extensions/source/config/ldap/ldapbe2 \
     component/extensions/source/dbpilots/dbp \
     component/extensions/source/logging/log \
     component/extensions/source/propctrlr/pcr \
@@ -310,10 +311,6 @@ my_components += \
     bindet
 .END
 
-.IF "$(WITH_LDAP)" == "YES"
-my_components += component/extensions/source/config/ldap/ldapbe2
-.END
-
 .IF "$(WITH_MOZILLA)" != "NO"
 my_components += component/extensions/source/plugin/pl
 .END
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index a36be0514d25..debd26883fb2 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_REDLAND \
 	SYSTEM_SNDFILE \
 	SYSTEM_STDLIBS \
-	WITH_LDAP \
 ))
 
 $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ae6692122251..35e3f1e777df 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -95,7 +95,6 @@ End
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
 
-#ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -106,7 +105,6 @@ File gid_File_Lib_Ldapbe2
     Name = "ldapbe2.uno.dll";
   #endif
 End
-#endif
 
 STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
 STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 1610786a4064..31e947b8b7a0 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -114,11 +114,7 @@ MOZBASELIB=-lnspr4 -lxpcom
 .IF "$(GUI)$(COM)"=="WNTGCC"
 LDAPSDKLIB=-lwldap32
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(WITH_OPENLDAP)" == "YES"
 LDAPSDKLIB=-lldap
-.ELSE
-LDAPSDKLIB=-lldap50
-.ENDIF
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 
 ICOLIB=-lico$(DLLPOSTFIX)
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9e4780affd3c..ec0e1bd0b532 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL