RepositoryExternal.mk | 6 ------ connectivity/Library_postgresql-sdbc-impl.mk | 1 + extensions/source/config/ldap/ldapaccess.cxx | 2 +- extensions/source/config/ldap/wrapldapinclude.hxx | 14 ++++++++++++++ postgresql/makefile.mk | 3 +-- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 + solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 + solenv/inc/libs.mk | 4 ++-- 8 files changed, 21 insertions(+), 11 deletions(-)
New commits: commit 4bc7149816e51e6ccca7673876586f8dc9a2c3d0 Author: Fridrich Strba <[email protected]> Date: Mon Jul 9 01:38:48 2012 -0600 Trying to use Windows LDAP for Windows builds Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73 Signed-off-by: Fridrich Å trba <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3b321ee..8f542d7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1368,12 +1368,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ws2_32 \ ) -ifeq ($(WITH_LDAP),YES) -$(call gb_LinkTarget_add_libs,$(1),\ - nsldap32v50.lib \ -) -endif - endif endef diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 979d166..b77f16c 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ + wldap32 \ )) ifeq ($(COM),MSC) diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index c1d07ed..00e62d9 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -283,7 +283,7 @@ void LdapConnection::loadModule() { #if defined WNT s_Ldap_Module = osl_loadModuleRelativeAscii( - &thisModule, "nsldap32v50.dll", 0); + &thisModule, "wldap32.dll", 0); #elif defined WITH_OPENLDAP s_Ldap_Module = osl_loadModuleAscii( ("libldap-" SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) "." diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx index 470d4b9..1b84b76 100644 --- a/extensions/source/config/ldap/wrapldapinclude.hxx +++ b/extensions/source/config/ldap/wrapldapinclude.hxx @@ -31,10 +31,24 @@ # define LDAP_CALL #endif #else +#ifdef WNT +#include <windows.h> +#include <winldap.h> +#ifndef LDAP_API +# define LDAP_API(rt) rt +#endif +#ifndef LDAP_CALL +# define LDAP_CALL +#endif +#ifndef LDAP_NO_ATTRS +# define LDAP_NO_ATTRS "1.1" +#endif +#else // !defined WNT #ifndef LDAP_INCLUDED #define LDAP_INCLUDED #include <ldap/ldap.h> #endif // LDAP_INCLUDED +#endif // WNT #endif #ifdef WNT diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 4550ad5..a04b6e2 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -60,8 +60,7 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1 .IF "$(WITH_LDAP)" == "YES" BUILD_ACTION += USE_LDAP=1 .IF "$(WITH_OPENLDAP)" != "YES" -SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap -BUILD_ACTION += USE_MOZLDAP=1 +BUILD_ACTION += USE_MICROSOFT_LDAP=1 .ENDIF .ENDIF # "$(WITH_LDAP)" == "YES" .ELSE #"$(GUI)$(COM)"!="WNTMSC" diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 78dac25..81d6226 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -252,6 +252,7 @@ gb_Library_PLAINLIBS_NONE += \ version \ wininet \ winspool \ + wldap32 \ ws2_32 \ gb_Library_LAYER := \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index efb000e..41a231e 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -423,6 +423,7 @@ gb_Library_PLAINLIBS_NONE += \ wininet \ winmm \ winspool \ + wldap32 \ ws2_32 \ gb_Library_LAYER := \ diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 67c09fd..0ea1cc3 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -112,7 +112,7 @@ MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" MOZBASELIB=-lnspr4 -lxpcom .IF "$(GUI)$(COM)"=="WNTGCC" -LDAPSDKLIB=-lnsldap32v50 +LDAPSDKLIB=-lwldap32 .ELSE # "$(GUI)$(COM)"=="WNTGCC" .IF "$(WITH_OPENLDAP)" == "YES" LDAPSDKLIB=-lldap @@ -412,7 +412,7 @@ EXTLIB=iext.lib SOTLIB=isot.lib MOZBASELIBST=nspr4_s.lib xpcombase_s.lib MOZBASELIB=nspr4.lib xpcom.lib -LDAPSDKLIB=nsldap32v50.lib +LDAPSDKLIB=wldap32.lib PAPILIB=ipap.lib SFX2LIB=sfx.lib SFXLIB=$(SFX2LIB)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
