diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 13:14:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 13:14:22 +0000 |
| commit | a377e44615b507c29bf95eb1656e6dc765fbda0b (patch) | |
| tree | 314fb7cf7a7640136046b67fc107ea5f2bc0cea9 /extensions/source/config | |
| parent | 74a661a2afef9434b02a3d9451c9e5d055450220 (diff) | |
INTEGRATION: CWS openldap (1.3.4); FILE MERGED
2004/10/29 11:02:04 rene 1.3.4.1: #i36326# patch to be able to use OpenLDAP LDAP SDK instead of mozilla one
Diffstat (limited to 'extensions/source/config')
| -rw-r--r-- | extensions/source/config/ldap/ldapuserprof.hxx | 8 | ||||
| -rw-r--r-- | extensions/source/config/ldap/makefile.mk | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/extensions/source/config/ldap/ldapuserprof.hxx b/extensions/source/config/ldap/ldapuserprof.hxx index 7825d033c2f5..2fa2d8ea4d68 100644 --- a/extensions/source/config/ldap/ldapuserprof.hxx +++ b/extensions/source/config/ldap/ldapuserprof.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ldapuserprof.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-10-22 08:05:28 $ + * last change: $Author: obo $ $Date: 2004-11-15 14:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,10 +62,14 @@ #ifndef EXTENSIONS_CONFIG_LDAP_LDAPUSERPROF_HXX_ #define EXTENSIONS_CONFIG_LDAP_LDAPUSERPROF_HXX_ +#ifdef WITH_OPENLDAP +#include <ldap.h> +#else #ifndef LDAP_INCLUDED #define LDAP_INCLUDED #include <ldap/ldap.h> #endif // LDAP_INCLUDED +#endif #ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk index bc8ee4f12a0b..925057dbd222 100644 --- a/extensions/source/config/ldap/makefile.mk +++ b/extensions/source/config/ldap/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2004-10-22 08:06:44 $ +# last change: $Author: obo $ $Date: 2004-11-15 14:14:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,6 +88,10 @@ all: LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozilla .ENDIF +.IF "$(WITH_OPENLDAP)" == "YES" +CFLAGS += -DWITH_OPENLDAP +.ENDIF + SOLARINC+= $(LDAPSDKINCLUDES) # --- Files --- |