From: Guenter Knauf Date: Thu, 22 Jul 2010 23:38:58 +0000 (+0000) Subject: Removed obsolete include paths from NetWare makefiles. X-Git-Tag: 2.3.7~62 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e8988e256df6953f328ff963a4c520160471e92;p=thirdparty%2Fapache%2Fhttpd.git Removed obsolete include paths from NetWare makefiles. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat index ac2ab1d9e7c..5bdd2dc5ebd 100644 --- a/modules/aaa/NWGNUaccesscompat +++ b/modules/aaa/NWGNUaccesscompat @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano index 7f42bdb6d23..16fc021c566 100644 --- a/modules/aaa/NWGNUauthnano +++ b/modules/aaa/NWGNUauthnano @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd index 81c6240660c..b514b31d158 100644 --- a/modules/aaa/NWGNUauthndbd +++ b/modules/aaa/NWGNUauthndbd @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/database \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm index 40f72be144e..3c4769d4598 100644 --- a/modules/aaa/NWGNUauthndbm +++ b/modules/aaa/NWGNUauthndbm @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil index 55e379560fa..51ee57f157f 100644 --- a/modules/aaa/NWGNUauthnfil +++ b/modules/aaa/NWGNUauthnfil @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache index 912b5047337..2792f495d5c 100644 --- a/modules/aaa/NWGNUauthnsocache +++ b/modules/aaa/NWGNUauthnsocache @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/database \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap index d86cc13ecae..8c1bd689b98 100644 --- a/modules/aaa/NWGNUauthnzldap +++ b/modules/aaa/NWGNUauthnzldap @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd index 11cf1260627..115fbdb22fe 100644 --- a/modules/aaa/NWGNUauthzdbd +++ b/modules/aaa/NWGNUauthzdbd @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/database \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm index 4d4f7b44ad4..9af94c5bc87 100644 --- a/modules/aaa/NWGNUauthzdbm +++ b/modules/aaa/NWGNUauthzdbm @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp index 672d9c790df..837f6f359c2 100644 --- a/modules/aaa/NWGNUauthzgrp +++ b/modules/aaa/NWGNUauthzgrp @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat index 6b069cd176d..ba208472b02 100644 --- a/modules/cluster/NWGNUmodheartbeat +++ b/modules/cluster/NWGNUmodheartbeat @@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/core \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/core \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor index d5f01fd67ec..bdb96755c5a 100644 --- a/modules/cluster/NWGNUmodheartmonitor +++ b/modules/cluster/NWGNUmodheartmonitor @@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/core \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/core \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index a5768dc13d9..59d4e8234f3 100644 --- a/modules/database/NWGNUmakefile +++ b/modules/database/NWGNUmakefile @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 69bb334e715..baa80576a7f 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -29,7 +29,6 @@ XINCDIRS += \ $(AP_WORK)/include \ $(AP_WORK)/server/mpm/netware \ $(AP_WORK)/modules/dav/main \ - $(AP_WORK)/modules/arch/netware \ $(NWOS) \ $(EOLIST) diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer index 8c5415e8a84..8dd4ce8d878 100644 --- a/modules/debugging/NWGNUmodbucketeer +++ b/modules/debugging/NWGNUmodbucketeer @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio index ceb1cfb3ab7..7801aae2f65 100644 --- a/modules/debugging/NWGNUmoddumpio +++ b/modules/debugging/NWGNUmoddumpio @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index 13a5beac11d..e6f661c8d24 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt index f696b86369f..18f55f3dc01 100644 --- a/modules/examples/NWGNUcase_flt +++ b/modules/examples/NWGNUcase_flt @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in index d9ec3113a68..fedecb769f2 100644 --- a/modules/examples/NWGNUcase_flt_in +++ b/modules/examples/NWGNUcase_flt_in @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks index 007bde676fa..522ee887666 100644 --- a/modules/examples/NWGNUexample_hooks +++ b/modules/examples/NWGNUexample_hooks @@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/server/mpm/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/server/mpm/netware \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc index 5749439a012..7a9dc257560 100644 --- a/modules/examples/NWGNUexample_ipc +++ b/modules/examples/NWGNUexample_ipc @@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/server/mpm/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/server/mpm/netware \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/experimental/NWGNUnoloris b/modules/experimental/NWGNUnoloris index fbe990d3bc7..e25a89c9c7a 100644 --- a/modules/experimental/NWGNUnoloris +++ b/modules/experimental/NWGNUnoloris @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl index 8e28c2855f5..b4e4f5959ff 100644 --- a/modules/filters/NWGNUcharsetl +++ b/modules/filters/NWGNUcharsetl @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index 635746d676d..03138e3561a 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -27,12 +27,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr index 589fff39172..8aa5b2081b4 100644 --- a/modules/filters/NWGNUextfiltr +++ b/modules/filters/NWGNUextfiltr @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter index 9a01213bce0..f6a78e0f629 100644 --- a/modules/filters/NWGNUmod_filter +++ b/modules/filters/NWGNUmod_filter @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmod_request b/modules/filters/NWGNUmod_request index 9c8f4214d9b..fb53390d7eb 100644 --- a/modules/filters/NWGNUmod_request +++ b/modules/filters/NWGNUmod_request @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer index e82360539f3..8bb11d4a0d1 100644 --- a/modules/filters/NWGNUmodbuffer +++ b/modules/filters/NWGNUmodbuffer @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmodsed b/modules/filters/NWGNUmodsed index 0ae066c1505..7b41439bd8f 100644 --- a/modules/filters/NWGNUmodsed +++ b/modules/filters/NWGNUmodsed @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit index bd2e2ac1146..cbbf833e002 100644 --- a/modules/filters/NWGNUratelimit +++ b/modules/filters/NWGNUratelimit @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUreflector b/modules/filters/NWGNUreflector index 9db5a02cbff..81a59ebf472 100644 --- a/modules/filters/NWGNUreflector +++ b/modules/filters/NWGNUreflector @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout index bb682fa1dfb..f48540ba443 100644 --- a/modules/filters/NWGNUreqtimeout +++ b/modules/filters/NWGNUreqtimeout @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute index ca19eb11632..6c0d0db4226 100644 --- a/modules/filters/NWGNUsubstitute +++ b/modules/filters/NWGNUsubstitute @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex index 8305c554448..2d310934ef1 100644 --- a/modules/generators/NWGNUautoindex +++ b/modules/generators/NWGNUautoindex @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo index 0477dbf9770..ae6c25e4a09 100644 --- a/modules/generators/NWGNUinfo +++ b/modules/generators/NWGNUinfo @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis index 58f6ce203fb..d1f209a06ee 100644 --- a/modules/generators/NWGNUmod_asis +++ b/modules/generators/NWGNUmod_asis @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi index 341fac02b4e..4763d0d0f7f 100644 --- a/modules/generators/NWGNUmod_cgi +++ b/modules/generators/NWGNUmod_cgi @@ -16,14 +16,12 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/http \ $(AP_WORK)/modules/filters \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus index a6658ad2823..01cbef5af87 100644 --- a/modules/generators/NWGNUstatus +++ b/modules/generators/NWGNUstatus @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile index 91818800351..4a92ef2837b 100644 --- a/modules/ldap/NWGNUmakefile +++ b/modules/ldap/NWGNUmakefile @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(LDAPSDK)/inc \ $(EOLIST) diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index 0a979dae06d..7abee9b06bb 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -24,12 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index ee367f3598a..7d18cf7d712 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -24,12 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile index 58385dff97b..d1adaa86680 100644 --- a/modules/lua/NWGNUmakefile +++ b/modules/lua/NWGNUmakefile @@ -24,13 +24,12 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(LUASRC)/src \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ + $(LUASRC)/src \ $(EOLIST) # diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions index 0429f7809d0..04c8fd33a1d 100644 --- a/modules/mappers/NWGNUactions +++ b/modules/mappers/NWGNUactions @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap index a5e7f37c00c..fa511589a0e 100644 --- a/modules/mappers/NWGNUimagemap +++ b/modules/mappers/NWGNUimagemap @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite index f03d00537ec..ae91a2d588b 100644 --- a/modules/mappers/NWGNUrewrite +++ b/modules/mappers/NWGNUrewrite @@ -16,14 +16,12 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/database \ $(AP_WORK)/modules/ssl \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling index 57ca91f08fe..550def1a8f2 100644 --- a/modules/mappers/NWGNUspeling +++ b/modules/mappers/NWGNUspeling @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir index 269722bf836..7b230180d58 100644 --- a/modules/mappers/NWGNUuserdir +++ b/modules/mappers/NWGNUuserdir @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost index 886bd1d372c..65ea2c188fe 100644 --- a/modules/mappers/NWGNUvhost +++ b/modules/mappers/NWGNUvhost @@ -16,12 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta index d92e0ac49ee..b194cdba784 100644 --- a/modules/metadata/NWGNUcernmeta +++ b/modules/metadata/NWGNUcernmeta @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires index ea98ce4eb51..07de9e892c4 100644 --- a/modules/metadata/NWGNUexpires +++ b/modules/metadata/NWGNUexpires @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders index 7283c33c535..bd5487196e0 100644 --- a/modules/metadata/NWGNUheaders +++ b/modules/metadata/NWGNUheaders @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi index 4bfac168ca3..c2aa84daa7c 100644 --- a/modules/metadata/NWGNUmimemagi +++ b/modules/metadata/NWGNUmimemagi @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident index ef80af9e3f2..e06ef8d8833 100644 --- a/modules/metadata/NWGNUmodident +++ b/modules/metadata/NWGNUmodident @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion index c06cd657e93..fdece687ebb 100644 --- a/modules/metadata/NWGNUmodversion +++ b/modules/metadata/NWGNUmodversion @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUremoteip b/modules/metadata/NWGNUremoteip index 23df23af8b5..2ad383b10b0 100644 --- a/modules/metadata/NWGNUremoteip +++ b/modules/metadata/NWGNUremoteip @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index 52c5086da21..6c7ccb05ff4 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk index 41cb1a5fe54..49ee8f847d1 100644 --- a/modules/metadata/NWGNUusertrk +++ b/modules/metadata/NWGNUusertrk @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index bc284fc7397..925e2364a5d 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -16,15 +16,13 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp index 506de20aca8..5ba2af65435 100644 --- a/modules/proxy/NWGNUproxyajp +++ b/modules/proxy/NWGNUproxyajp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer index 52824cfd8bd..c59b1bc8cd4 100644 --- a/modules/proxy/NWGNUproxybalancer +++ b/modules/proxy/NWGNUproxybalancer @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon index 45d8b4b4726..f474a4f1e2a 100644 --- a/modules/proxy/NWGNUproxycon +++ b/modules/proxy/NWGNUproxycon @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi index 959d1800142..acb9a364984 100644 --- a/modules/proxy/NWGNUproxyfcgi +++ b/modules/proxy/NWGNUproxyfcgi @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index aee359d483b..5d4019fedd3 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index f7b0e211672..98acbd9d57a 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi index 4c51621f5b3..152d1aa7700 100644 --- a/modules/proxy/NWGNUproxyscgi +++ b/modules/proxy/NWGNUproxyscgi @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(AP_WORK)/modules/http \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf index 9f869af55fa..8bdd4befc51 100644 --- a/modules/proxy/NWGNUserf +++ b/modules/proxy/NWGNUserf @@ -28,15 +28,13 @@ XINCDIRS += \ $(V_PATH) \ $(OSSLINC) \ $(OSSLINC)/openssl \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession b/modules/session/NWGNUsession index dc30233bea9..448d3da94f5 100644 --- a/modules/session/NWGNUsession +++ b/modules/session/NWGNUsession @@ -16,15 +16,13 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_cookie b/modules/session/NWGNUsession_cookie index b90950048a7..ddf0ad4f44d 100644 --- a/modules/session/NWGNUsession_cookie +++ b/modules/session/NWGNUsession_cookie @@ -16,15 +16,13 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_crypto b/modules/session/NWGNUsession_crypto index 8abea588297..df791acaf39 100644 --- a/modules/session/NWGNUsession_crypto +++ b/modules/session/NWGNUsession_crypto @@ -16,15 +16,13 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/modules/ssl \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_dbd b/modules/session/NWGNUsession_dbd index 876694a8a66..a70a88f6d35 100644 --- a/modules/session/NWGNUsession_dbd +++ b/modules/session/NWGNUsession_dbd @@ -16,18 +16,15 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/database \ - $(AP_WORK)/modules/ssl \ $(AP_WORK)/modules/generators \ + $(AP_WORK)/modules/ssl \ $(AP_WORK)/server/mpm/netware \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ - $(EOLIST) + $(NWOS) \ # # These flags will come after CFLAGS diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 419844429cf..a63b6e48bf5 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -1,6 +1,9 @@ # # This Makefile requires the environment var OSSLSDK # pointing to the base directory of your OpenSSL SDK. +# If you want to use the Novell NTLS SDK instead then +# define NTLSSDK pointing to the base directory of the +# SDK, and also set USE_NTLS=1 # # @@ -23,25 +26,37 @@ include $(AP_WORK)\build\NWGNUhead.inc # Make sure all needed macro's are defined # -OSSLINC = $(OSSLSDK)/outinc_nw_libc -OSSLLIB = $(OSSLSDK)/out_nw_libc -OSSLAPP = $(OSSLSDK)/apps +ifeq "$(USE_NTLS)" "1" +SSL_INC = $(NTLSSDK)/inc +SSL_LIB = $(NTLSSDK)/imp +SSL_BIN = $(NTLSSDK)/bin +SSL_APP = $(NTLSSDK)/apps +ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h" +$(error '$(NTLSSDK)' does NOT point to a valid NTLS SDK!) +endif +else +SSL_INC = $(OSSLSDK)/outinc_nw_libc +SSL_LIB = $(OSSLSDK)/out_nw_libc +SSL_BIN = $(OSSLSDK)/out_nw_libc +SSL_APP = $(OSSLSDK)/apps +ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h" +$(error '$(OSSLSDK)' does NOT point to a valid OpenSSL SDK!) +endif +endif # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ - $(OSSLINC) \ - $(OSSLINC)/openssl \ + $(SSL_INC) \ + $(SSL_INC)/openssl \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/modules/cache \ $(AP_WORK)/modules/generators \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ $(EOLIST) @@ -62,7 +77,7 @@ XDEFINES += \ # These flags will be added to the link.opt file # XLFLAGS += \ - -l $(OSSLLIB) \ + -l $(SSL_LIB) \ $(EOLIST) # @@ -122,7 +137,11 @@ NLM_NAME = mod_ssl # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # +ifeq "$(USE_NTLS)" "1" +NLM_DESCRIPTION = Apache $(VERSION_STR) SSL module (NTLS) +else NLM_DESCRIPTION = Apache $(VERSION_STR) SSL module +endif # # This is used by the '-threadname' directive. If left blank, @@ -199,10 +218,15 @@ FILES_nlm_objs := $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard *.c)) # FILES_nlm_libs = \ libcpre.o \ - $(OSSLLIB)/crypto.lib \ - $(OSSLLIB)/ssl.lib \ $(EOLIST) +ifneq "$(USE_NTLS)" "1" +FILES_nlm_libs += \ + $(SSL_LIB)/crypto.lib \ + $(SSL_LIB)/ssl.lib \ + $(EOLIST) +endif + # # These are the modules that the above NLM target depends on to load. # These will be added as a module command in the link.opt file. @@ -212,6 +236,11 @@ FILES_nlm_modules = \ Libc \ $(EOLIST) +ifeq "$(USE_NTLS)" "1" +FILES_nlm_modules += ntls \ + $(EOLIST) +endif + # # If the nlm has a msg file, put it's path here # @@ -234,17 +263,25 @@ FILES_nlm_Ximports = \ @libc.imp \ @$(APR)/aprlib.imp \ @httpd.imp \ - GetProcessSwitchCount \ - RunningProcess \ - GetSuperHighResolutionTimer \ $(EOLIST) # Don't link with Winsock if standard sockets are being used -ifndef USE_STDSOCKETS +ifneq "$(USE_STDSOCKETS)" "1" FILES_nlm_Ximports += @ws2nlm.imp \ $(EOLIST) endif +ifeq "$(USE_NTLS)" "1" +FILES_nlm_Ximports += @ntls.imp \ + $(EOLIST) +else +FILES_nlm_Ximports += \ + GetProcessSwitchCount \ + RunningProcess \ + GetSuperHighResolutionTimer \ + $(EOLIST) +endif + # # Any symbols exported to here # @@ -273,8 +310,8 @@ nlms :: libs $(TARGET_nlm) # install :: nlms FORCE copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.* - -copy $(subst /,\,$(OSSLLIB))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.* - -copy $(subst /,\,$(OSSLAPP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.* + -copy $(subst /,\,$(SSL_BIN))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.* + -copy $(subst /,\,$(SSL_APP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.* # # Any specialized rules here diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport index 0b85ff71540..5ec813267eb 100644 --- a/modules/test/NWGNUoptfnexport +++ b/modules/test/NWGNUoptfnexport @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport index 3466b9a44f6..233edbcad57 100644 --- a/modules/test/NWGNUoptfnimport +++ b/modules/test/NWGNUoptfnimport @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport index f3d728e674b..23427cc4b9e 100644 --- a/modules/test/NWGNUopthookexport +++ b/modules/test/NWGNUopthookexport @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport index cc3745b5eeb..73a01292564 100644 --- a/modules/test/NWGNUopthookimport +++ b/modules/test/NWGNUopthookimport @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/support/NWGNUab b/support/NWGNUab index ea22b8fadab..25114cb09cb 100644 --- a/support/NWGNUab +++ b/support/NWGNUab @@ -55,7 +55,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean index 17d03d362ac..aa9e6ea852b 100644 --- a/support/NWGNUhtcacheclean +++ b/support/NWGNUhtcacheclean @@ -20,7 +20,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm index 492d22924e4..e427d5295e3 100644 --- a/support/NWGNUhtdbm +++ b/support/NWGNUhtdbm @@ -20,7 +20,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest index 4fbdc040cce..21a4f0974e6 100644 --- a/support/NWGNUhtdigest +++ b/support/NWGNUhtdigest @@ -20,7 +20,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd index 2b692db4b8b..daa1d39e1ad 100644 --- a/support/NWGNUhtpasswd +++ b/support/NWGNUhtpasswd @@ -20,7 +20,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm index 17710de6bbb..a97ddcdb389 100644 --- a/support/NWGNUhttxt2dbm +++ b/support/NWGNUhttxt2dbm @@ -20,7 +20,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUlogres b/support/NWGNUlogres index 982cdb78b1f..e861d63e234 100644 --- a/support/NWGNUlogres +++ b/support/NWGNUlogres @@ -21,7 +21,6 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) # diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs index 9a55095208e..83b46a8378b 100644 --- a/support/NWGNUrotlogs +++ b/support/NWGNUrotlogs @@ -19,7 +19,6 @@ XINCDIRS += \ $(NWOS) \ $(APR)/include \ $(APR)/misc/netware \ - $(APR) \ $(EOLIST) #