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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 099bfe5cf023c29dfc3eb9c94b54c5e80006ed5b..0f8c97f1d4a9a3a23cc5b8453f2754c090e85fac 100644 (file)
--- 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 2a1f6c82369103f7fcad4ad9ffcbb2dab60d7f5e..4c7cfa89b2bf703318e3d4290d4dc535ed8731df 100644 (file)
--- 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 0c13a9c7f3b0bf17fb1c45ba596aeb56742d89d2..0e8d0f3d434402c890e7f596d995806c6dbc673f 100644 (file)
--- 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 b156252c4ed9d09df1394ec55f1777ff42ef6c03..6045155770ee2e5b484104f8e78dbe4101a515f4 100644 (file)
--- 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 eb84d7ed09a001077ca9c9dce6d1ce001f6b288d..a43aef2dfb078ee2be274ffebf8baa65c8322efa 100644 (file)
--- 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)
 
 #