diff options
| author | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
| commit | c2c4069f215ab0784dae8cc951c69f936150e6d6 (patch) | |
| tree | 756010e21c1ab05cb4525d8b7643dc909a64e1a8 /extensions/source/config/ldap/ldapaccess.cxx | |
| parent | 1cc444c64e77f5176fe481a9e12cefbb6bfdf188 (diff) | |
| parent | da329905a985f89b265c310d881dd94fea03b123 (diff) | |
merged in DEV300_m62
Diffstat (limited to 'extensions/source/config/ldap/ldapaccess.cxx')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 340b749fa..bf8bb38b2 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -283,14 +283,17 @@ void LdapConnection::loadModule() if ( !s_Ldap_Module ) { #if defined(WIN) || defined(WNT) - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll")); +# define LIBLDAP "nsldap32v50.dll" #else -#ifdef WITH_OPENLDAP - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so")); -#else - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so")); -#endif +# 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 + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP)); // load the dbtools library s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); |