diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 16:33:07 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 17:22:49 +0200 |
| commit | 336c956262340db1e6be932462fbd412ca668954 (patch) | |
| tree | 9c4f8a29034521beb2f8e72509b37672d30ab226 /extensions/Library_ldapbe2.mk | |
| parent | Fix typo (diff) | |
| download | core-336c956262340db1e6be932462fbd412ca668954.tar.gz core-336c956262340db1e6be932462fbd412ca668954.zip | |
First attempt at removing mozilla ldap at all (please help to fix)
Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73
Diffstat (limited to 'extensions/Library_ldapbe2.mk')
| -rw-r--r-- | extensions/Library_ldapbe2.mk | 32 |
1 files changed, 3 insertions, 29 deletions
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: |