diff --git a/configure.in b/configure.in index 4cfeae0..e831579 100644 --- a/configure.in +++ b/configure.in @@ -838,11 +838,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" @@ -951,6 +946,11 @@ AC_ARG_WITH(system-graphite, [Use graphite library already installed on system.]),, [with_system_graphite="$with_system_libs"]) +AC_ARG_WITH(system-mozldap, + AS_HELP_STRING([--with-system-mozldap], + [Use mozldap libraries already on system.]),, + [with_system_mozldap="$with_system_libs"]) + AC_ARG_WITH(system-nss, AS_HELP_STRING([--with-system-nss], [Use NSS/nspr libraries already on system.]),, @@ -5837,31 +5837,23 @@ 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 + WITH_LDAP=YES + if test -n "$with_system_mozldap" && test "$with_system_mozldap" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_MOZLDAP=YES + PKG_CHECK_MODULES(MOZLDAP, mozldap) else - AC_MSG_RESULT([no. Either Mozilla or OpenLDAP required]) + AC_MSG_RESULT([internal]) + SYSTEM_MOZLDAP=NO fi else AC_MSG_RESULT([no]) WITH_LDAP=NO fi AC_SUBST(WITH_LDAP) -AC_SUBST(WITH_OPENLDAP) +AC_SUBST(SYSTEM_MOZLDAP) +AC_SUBST(MOZLDAP_CFLAGS) +AC_SUBST(MOZLDAP_LIBS) dnl =================================================================== dnl Check for system mozilla @@ -5908,17 +5900,6 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then fi MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS - if test "$WITH_LDAP" != "NO" && test "$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 @@ -6066,7 +6047,6 @@ AC_SUBST(MOZ_FLAVOUR) AC_SUBST(MOZ_INC) AC_SUBST(MOZ_LIB) AC_SUBST(MOZ_LIB_XPCOM) -AC_SUBST(MOZ_LDAP_CFLAGS) dnl =================================================================== dnl Check for system NSS only with xmlsec or mozilla build enabled diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 30977dd..9f628ac 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -278,16 +278,14 @@ void LdapConnection::loadModule() { if ( !s_Ldap_Module ) { +#if defined(SYSTEM_MOZLDAP) +# define LIBLDAP "libldap60.so" +#else #if defined(WNT) # define LIBLDAP "nsldap32v50.dll" #else -# ifdef WITH_OPENLDAP -# define xstr(s) str(s) -# define str(s) #s -# define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR) -# else # define LIBLDAP "libldap50.so" -# endif +#endif #endif const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP)); diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk index d35e242..51fbd6f 100644 --- a/extensions/source/config/ldap/makefile.mk +++ b/extensions/source/config/ldap/makefile.mk @@ -44,17 +44,10 @@ DLLPRE = @echo "LDAP disabled." .ENDIF -.IF "$(LDAPSDKINCLUDES)" == "" - -.IF "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_OPENLDAP)" != "YES" -LDAPSDKINCLUDES = $(MOZ_LDAP_CFLAGS) +.IF "$(SYSTEM_MOZLDAP)" == "YES" +LDAPSDKINCLUDES = $(MOZLDAP_CFLAGS) .ELSE -LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozilla -.ENDIF -.ENDIF - -.IF "$(WITH_OPENLDAP)" == "YES" -CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED +LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozilla/ldap .ENDIF SOLARINC+= $(LDAPSDKINCLUDES) @@ -74,17 +67,10 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS=$(LIB1TARGET) SHL1IMPLIB=i$(SHL1TARGET) SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) -.IF "$(OS)"=="FREEBSD" -SHL1STDLIBS+=-lcompat -# workaround for FreeBSD, which needs -llber50, too -.IF "$(WITH_OPENLDAP)" != "YES" -SHL1STDLIBS+=-Wl,-Bstatic -llber50 -.ENDIF -.ENDIF + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALHELPERLIB) \ + $(SALLIB) DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx index 4a43f1f..8d7c406 100644 --- a/extensions/source/config/ldap/wrapldapinclude.hxx +++ b/extensions/source/config/ldap/wrapldapinclude.hxx @@ -31,20 +31,10 @@ #pragma warning (disable:4668) #endif -#ifdef WITH_OPENLDAP -#include -#ifndef LDAP_API -# define LDAP_API(rt) rt -#endif -#ifndef LDAP_CALL -# define LDAP_CALL -#endif -#else #ifndef LDAP_INCLUDED #define LDAP_INCLUDED -#include +#include #endif // LDAP_INCLUDED -#endif #ifdef WNT #pragma warning (pop) diff --git a/set_soenv.in b/set_soenv.in index bef9405..f6e7d9e 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1814,7 +1814,9 @@ ToFile( "THES_SYSTEM_DIR", "@THES_SYSTEM_DIR@", "e"); ToFile( "ENABLE_LOCKDOWN", "@ENABLE_LOCKDOWN@", "e" ); ToFile( "ENABLE_XMLSEC", "@ENABLE_XMLSEC@", "e" ); ToFile( "WITH_LDAP", "@WITH_LDAP@", "e" ); -ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" ); +ToFile( "SYSTEM_MOZLDAP", "@SYSTEM_MOZLDAP@", "e" ); +ToFile( "MOZLDAP_CFLAGS", "@MOZLDAP_CFLAGS@", "e" ); +ToFile( "MOZLDAP_LIBS", "@MOZLDAP_LIBS@", "e" ); ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" ); ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" ); ToFile( "MOZ_FLAVOUR", "@MOZ_FLAVOUR@", "e" ); @@ -1823,7 +1825,6 @@ ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" ); ToFile( "MOZ_INC", "@MOZ_INC@", "e" ); ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" ); ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" ); -ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" ); ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" ); ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" ); ToFile( "OOOP_FONTS_PACK", "@OOOP_FONTS_PACK@","e" );