NetWare build overhaul in order to compile on Linux.

Some more fixes ...

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 4fa1afdf45adea99b1f86d68eefa528fdb394700..b30ada8d7e1912780f47de6f13e9730d2981a162 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -405,19 +405,19 @@ install :: nlms instscripts FORCE
        $(call COPY,docs/conf/mime.types,        $(INSTALL)/$(BASEDIR)/conf/)
        $(call COPY,docs/conf/charset.conv,      $(INSTALL)/$(BASEDIR)/conf/)
        $(call COPY,docs/cgi-examples/printenv,  $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl)
-       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf
        $(call MKDIR,$(INSTALL)/$(BASEDIR)/conf/extra)
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs/conf/extra/httpd-vhosts.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs/conf/extra/httpd-ssl.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build/mkconfNW.awk docs/conf/extra/httpd-vhosts.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf
+       -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build/mkconfNW.awk docs/conf/extra/httpd-ssl.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf
        $(call COPYR,docs/docroot,               $(INSTALL)/$(BASEDIR)/htdocs)
        $(call COPYR,docs/error,                 $(INSTALL)/$(BASEDIR)/)
        $(call COPYR,docs/icons,                 $(INSTALL)/$(BASEDIR)/)

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index 01809624c3be35a4fc4bae51f4bfb5ddeab5f4b0..ecd18c2086131904f0d73c8ee192a850fd884ae0 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -3,42 +3,41 @@
 instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf\r
 \r
 $(INSTALL)/$(BASEDIR)/ap2start.ncf:\r
-       @echo # NCF to start Apache 2.x in own address space > $@\r
-       @echo # Make sure that httpstk isn't listening on 80 >> $@\r
-       @echo # httpcloseport 80 /silent >> $@\r
-       @echo # search add SYS:/$(BASEDIR) >> $@\r
-       @echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@\r
-       @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@\r
-       @echo # load SYS:/$(BASEDIR)/apache2 >> $@\r
-       @echo. >> $@\r
+       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
+       @echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@\r
+       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
+       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
+       @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
+       @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@\r
+       @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
+       @$(ECHONL)>> $@\r
 \r
 $(INSTALL)/$(BASEDIR)/ap2auto.ncf:\r
-       @echo # NCF to start Apache 2.x in own address space > $@\r
-       @echo # and let automatically restart in case it crashes >> $@\r
-       @echo # Make sure that httpstk isn't listening on 80 >> $@\r
-       @echo # httpcloseport 80 /silent >> $@\r
-       @echo # search add SYS:/$(BASEDIR) >> $@\r
-       @echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@\r
-       @echo. >> $@\r
+       @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
+       @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@\r
+       @echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@\r
+       @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
+       @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
+       @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
+       @$(ECHONL)>> $@\r
 \r
 $(INSTALL)/$(BASEDIR)/ap2rest.ncf:\r
-       @echo # NCF to restart Apache 2.x in own address space > $@\r
-       @echo apache2 restart -p $(BASEDIR) >> $@\r
-       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@\r
-       @echo # apache2 restart >> $@\r
-       @echo. >> $@\r
+       @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@\r
+       @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@\r
+       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
+       @echo $(DL)# apache2 restart$(DL)>> $@\r
+       @$(ECHONL)>> $@\r
 \r
 $(INSTALL)/$(BASEDIR)/ap2stop.ncf:\r
-       @echo # NCF to stop Apache 2.x in own address space > $@\r
-       @echo apache2 shutdown -p $(BASEDIR) >> $@\r
-       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@\r
-       @echo # apache2 shutdown >> $@\r
-       @echo. >> $@\r
+       @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@\r
+       @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@\r
+       @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@\r
+       @echo $(DL)# apache2 shutdown$(DL)>> $@\r
+       @$(ECHONL)>> $@\r
 \r
 $(INSTALL)/$(BASEDIR)/ap2prod.ncf:\r
-       @echo # NCF to create a product record for Apache 2.x in product database > $@\r
-       @echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@\r
-       @echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@\r
-       @echo. >> $@\r
-\r
+       @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@\r
+       @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@\r
+       @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@\r
+       @$(ECHONL)>> $@\r
 \r

diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 4dbc4ca20211a9d0308bf605e87cb446f05cdcd3..628ea60ff1f2e6953c8e6f9c3bad620e0c2b8de8 100644 (file)
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -76,7 +76,7 @@ BEGIN {
     next
 }
 
-/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;$/ {
+/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;/ {
     gsub(/[*;]/, "", $NF)
     gsub(/\[.*\]/, "", $NF)
     add_symbol($NF)

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index 5554cbf553d886c7b955cba607eef1653545baf2..dcbb12d0eff34b4a8d820310e9d3ed5f6b1ad02a 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -252,7 +252,8 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+
 #
 # Any specialized rules here
 #

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 269721e85fec689ae2f3eab7b934628bff17a904..f790e7f1733b830872cf2b2d0eb6fe65f00521ff 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -243,7 +243,8 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
+
 #
 # Any specialized rules here
 #

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 5f25e953c07cc5463becebbdccaed43ef66da4ac..bb52da97551d1634888387d16d3067280cfed3e8 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -252,7 +252,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)
 
 #
 # Any specialized rules here

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index d13d93fadaa3157db0732b606831fae2b47f64cb..538001b11e6ad1036e6d383030999d21c3b357c7 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -252,19 +252,19 @@ install :: nlms FORCE
 vpath %.c ../arch/netware
 
 $(OBJDIR)/mod_proxy.imp:
-       @echo Creating $@
-       @echo # Exports of mod_proxy > $@
-       @echo   (AP$(VERSION_MAJMIN)) >> $@
-       @echo   proxy_module, >> $@
-       @echo   proxy_hook_canon_handler, >> $@
-       @echo   proxy_hook_post_request, >> $@
-       @echo   proxy_hook_pre_request, >> $@
-       @echo   proxy_hook_scheme_handler, >> $@
-       @echo   proxy_run_fixups, >> $@
-       @echo   ap_proxy_conn_is_https, >> $@
-       @echo   ap_proxy_ssl_enable, >> $@
-       @echo   ap_proxy_ssl_disable, >> $@
-       @echo   ap_proxy_ssl_val >> $@
+       @echo $(DL)GEN  $@$(DL)
+       @echo $(DL)# Exports of mod_proxy$(DL)> $@
+       @echo $(DL)  (AP$(VERSION_MAJMIN))$(DL)>> $@
+       @echo $(DL)  proxy_module,$(DL)>> $@
+       @echo $(DL)  proxy_hook_canon_handler,$(DL)>> $@
+       @echo $(DL)  proxy_hook_post_request,$(DL)>> $@
+       @echo $(DL)  proxy_hook_pre_request,$(DL)>> $@
+       @echo $(DL)  proxy_hook_scheme_handler,$(DL)>> $@
+       @echo $(DL)  proxy_run_fixups,$(DL)>> $@
+       @echo $(DL)  ap_proxy_conn_is_https,$(DL)>> $@
+       @echo $(DL)  ap_proxy_ssl_enable,$(DL)>> $@
+       @echo $(DL)  ap_proxy_ssl_disable,$(DL)>> $@
+       @echo $(DL)  ap_proxy_ssl_val$(DL)>> $@
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile
index 91020579b1dc757560193f4fb14562126eff50e4..dce466fd0a3faad653f97c53fe4f5e9963071530 100644 (file)
--- a/support/NWGNUmakefile
+++ b/support/NWGNUmakefile
@@ -35,7 +35,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/bin/)
 
 #
 # Any specialized rules here