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 ff84dd889c24d2df4dcbfef0ee51a81eefa102ea..a2bda93e288f890435bd02c2bf82896db5f67272 100644 (file)
--- 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 deed69140e0250470780c6dd5467467bc554f881..635e8c1cc95a274cbf2864d6db21a6948c8eacdd 100644 (file)
--- 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 60dfe0d2c9141e3047bd29273428aba39368a74f..93f92008a98712341e5b482287ae5a5638be0b01 100644 (file)
--- 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 cc4eb3154719e1c78ed4e76d17853e6e81289389..825065fb0ab55d3c818463a87715b33ff8d6ebb8 100644 (file)
--- 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 252a70fed81d81680f5c3cca3da085fa52696a5e..9473d630c048c60a66a6f0b762842eb05b567ec3 100644 (file)
--- 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) \
 
 #