From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 29 Oct 2011 14:27:14 +0000 (+0000)
Subject: Some NetWare build tweaks: removed obsolete include paths.
X-Git-Tag: 2.3.15~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b26aee8d1561c6c570a4c83aeb684600d896c0a;p=thirdparty%2Fapache%2Fhttpd.git

Some NetWare build tweaks: removed obsolete include paths.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194893 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/session/NWGNUmakefile b/modules/session/NWGNUmakefile
index ff84dd889c2..a2bda93e288 100644
--- a/modules/session/NWGNUmakefile
+++ b/modules/session/NWGNUmakefile
@@ -157,7 +157,10 @@ TARGET_nlm = \
 	$(OBJDIR)/session_dbd.nlm \
 	$(EOLIST)
 
-#	$(OBJDIR)/session_crypto.nlm \
+# If the APU library has cryptp API then build the mod_session_crypto module
+ifdef APU_HAVE_CRYPTO
+TARGET_nlm += $(OBJDIR)/session_crypto.nlm
+endif
 
 #
 # If there is an LIB target, put it here
diff --git a/modules/session/NWGNUsession b/modules/session/NWGNUsession
index deed69140e0..635e8c1cc95 100644
--- a/modules/session/NWGNUsession
+++ b/modules/session/NWGNUsession
@@ -18,10 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/session/NWGNUsession_cookie b/modules/session/NWGNUsession_cookie
index 60dfe0d2c91..93f92008a98 100644
--- a/modules/session/NWGNUsession_cookie
+++ b/modules/session/NWGNUsession_cookie
@@ -18,10 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/session/NWGNUsession_crypto b/modules/session/NWGNUsession_crypto
index cc4eb315471..825065fb0ab 100644
--- a/modules/session/NWGNUsession_crypto
+++ b/modules/session/NWGNUsession_crypto
@@ -18,10 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/session/NWGNUsession_dbd b/modules/session/NWGNUsession_dbd
index 252a70fed81..9473d630c04 100644
--- a/modules/session/NWGNUsession_dbd
+++ b/modules/session/NWGNUsession_dbd
@@ -18,12 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/database \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(STDMOD)/database \
 			$(NWOS) \
 
 #