From: Bradley Nicholes Date: Wed, 18 Aug 2004 22:26:58 +0000 (+0000) Subject: Update the netware make files to stop building the ldap modules from experimental... X-Git-Tag: STRIKER_2_1_0_RC1~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211ecf3b515bba8b2103873c3ab0c97dfc0f36e3;p=thirdparty%2Fapache%2Fhttpd.git Update the netware make files to stop building the ldap modules from experimental and start building from the new locations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104719 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile index 09ec212972b..a213675b1ae 100644 --- a/modules/NWGNUmakefile +++ b/modules/NWGNUmakefile @@ -18,6 +18,13 @@ SUBDIRS = \ filters \ $(EOLIST) +# If LDAPSDK has been defined then build the util_ldap module +ifneq "$(LDAPSDK)" "" +SUBDIRS += ldap \ + $(EOLIST) +endif + + #If the mod_edir directory exists then build the mod_edir module ifeq "$(wildcard $(AP_WORK)\modules\mod_edir)" "$(AP_WORK)\modules\mod_edir" SUBDIRS += mod_edir \ diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile index daa393ecec4..203cb7c846a 100644 --- a/modules/aaa/NWGNUmakefile +++ b/modules/aaa/NWGNUmakefile @@ -158,7 +158,6 @@ TARGET_nlm = \ $(OBJDIR)/authndbm.nlm \ $(OBJDIR)/authndef.nlm \ $(OBJDIR)/authnfil.nlm \ - $(OBJDIR)/authnzldap.nlm \ $(OBJDIR)/authzdbm.nlm \ $(OBJDIR)/authzdef.nlm \ $(OBJDIR)/authzgrp.nlm \ @@ -166,6 +165,12 @@ TARGET_nlm = \ $(OBJDIR)/authzusr.nlm \ $(EOLIST) +# If LDAPSDK has been defined then build the authnz_ldap module +ifneq "$(LDAPSDK)" "" +TARGET_nlm += $(OBJDIR)/authnzldap.nlm \ + $(EOLIST) +endif + # # If there is an LIB target, put it here # diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile index f391d37cf41..41934a35049 100644 --- a/modules/experimental/NWGNUmakefile +++ b/modules/experimental/NWGNUmakefile @@ -159,13 +159,6 @@ TARGET_nlm = \ $(OBJDIR)/dsk_cach.nlm \ $(EOLIST) -# If LDAPSDK has been defined then build the auth_ldap module -ifneq "$(LDAPSDK)" "" -TARGET_nlm += $(OBJDIR)/authldap.nlm \ - $(OBJDIR)/utilldap.nlm \ - $(EOLIST) -endif - # # If there is an LIB target, put it here #