From 11128b2991ec9afea1b12d805b716ff97873e3c0 Mon Sep 17 00:00:00 2001
From: Bradley Nicholes <bnicholes@apache.org>
Date: Fri, 11 Oct 2002 21:35:06 +0000
Subject: [PATCH] NetWare makefile changes to facilitate building the auth_ldap
 modules

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97182 13f79535-47bb-0310-9956-ffa450edef68
---
 build/NWGNUenvironment.inc         |  3 +++
 modules/NWGNUmakefile              | 12 ------------
 modules/experimental/NWGNUauthldap |  1 -
 modules/experimental/NWGNUmakefile |  7 +++++++
 modules/experimental/NWGNUutilldap |  1 -
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 099bfe5cf02..0f8c97f1d4a 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -114,6 +114,9 @@ LIB		= mwldnlm -type library -w nocmdline
 NOVI	= $(NOVELLLIBC)\imports
 
 INCDIRS 	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
+ifneq "$(LDAPSDK)" ""
+INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
+endif
 
 DEFINES		= -DNETWARE
 
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 2a1f6c82369..4c7cfa89b2b 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -16,18 +16,6 @@ SUBDIRS = \
 	proxy \
 	$(EOLIST) 
 
-# If the ldap-aaa directory exists then build the auth_ldap module
-ifeq "$(wildcard $(AP_WORK)\modules\ldap-aaa)" "$(AP_WORK)\modules\ldap-aaa"
-SUBDIRS += ldap-aaa \
-		   $(EOLIST)
-endif
-
-#If the ldap-cache directory exists then build the ldaputil module
-ifeq "$(wildcard $(AP_WORK)\modules\ldap-cache)" "$(AP_WORK)\modules\ldap-cache"
-SUBDIRS += ldap-cache \
-	       $(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/experimental/NWGNUauthldap b/modules/experimental/NWGNUauthldap
index 0c13a9c7f3b..0e8d0f3d434 100644
--- a/modules/experimental/NWGNUauthldap
+++ b/modules/experimental/NWGNUauthldap
@@ -21,7 +21,6 @@ XINCDIRS	+= \
 			$(AP_WORK)/srclib/apr/include \
 			$(AP_WORK)/srclib/apr-util/include \
 			$(AP_WORK)/srclib/apr \
-			$(LDAPSDK)/inc \
 			$(EOLIST)
 
 #
diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index b156252c4ed..6045155770e 100644
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -158,6 +158,13 @@ TARGET_nlm = \
 	$(OBJDIR)/dsk_cach.nlm \
 	$(OBJDIR)/extfiltr.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
diff --git a/modules/experimental/NWGNUutilldap b/modules/experimental/NWGNUutilldap
index eb84d7ed09a..a43aef2dfb0 100644
--- a/modules/experimental/NWGNUutilldap
+++ b/modules/experimental/NWGNUutilldap
@@ -21,7 +21,6 @@ XINCDIRS	+= \
 			$(AP_WORK)/srclib/apr/include \
 			$(AP_WORK)/srclib/apr-util/include \
 			$(AP_WORK)/srclib/apr \
-			$(LDAPSDK)/inc \
 			$(EOLIST)
 
 #
-- 
2.47.3