Commit 89b166e4 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

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
parent 9ac21a49

NWGNUmakefile

+12 −12
Changes for NWGNUmakefile: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -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)/)

build/NWGNUscripts.inc

+29 −30
Changes for build/NWGNUscripts.inc: 29 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -3,42 +3,41 @@ 
instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf



$(INSTALL)/$(BASEDIR)/ap2start.ncf:

	@echo # NCF to start Apache 2.x in own address space > $@

	@echo # Make sure that httpstk isn't listening on 80 >> $@

	@echo # httpcloseport 80 /silent >> $@

	@echo # search add SYS:/$(BASEDIR) >> $@

	@echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@

	@echo # If you have problems with 3rd-party modules try to load in OS space. >> $@

	@echo # load SYS:/$(BASEDIR)/apache2 >> $@

	@echo. >> $@

	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

	@echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@

	@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@

	@echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@

	@echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@

	@echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@

	@echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2auto.ncf:

	@echo # NCF to start Apache 2.x in own address space > $@

	@echo # and let automatically restart in case it crashes >> $@

	@echo # Make sure that httpstk isn't listening on 80 >> $@

	@echo # httpcloseport 80 /silent >> $@

	@echo # search add SYS:/$(BASEDIR) >> $@

	@echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@

	@echo. >> $@

	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

	@echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@

	@echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@

	@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@

	@echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@

	@echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2rest.ncf:

	@echo # NCF to restart Apache 2.x in own address space > $@

	@echo apache2 restart -p $(BASEDIR) >> $@

	@echo # If you have loaded Apache2.x in OS space use the line below. >> $@

	@echo # apache2 restart >> $@

	@echo. >> $@

	@echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@

	@echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@

	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

	@echo $(DL)# apache2 restart$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2stop.ncf:

	@echo # NCF to stop Apache 2.x in own address space > $@

	@echo apache2 shutdown -p $(BASEDIR) >> $@

	@echo # If you have loaded Apache2.x in OS space use the line below. >> $@

	@echo # apache2 shutdown >> $@

	@echo. >> $@

	@echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@

	@echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@

	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

	@echo $(DL)# apache2 shutdown$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2prod.ncf:

	@echo # NCF to create a product record for Apache 2.x in product database > $@

	@echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@

	@echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@

	@echo. >> $@



	@echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@

	@echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@

	@echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@

	@$(ECHONL)>> $@

build/make_nw_export.awk

+1 −1
Changes for build/make_nw_export.awk: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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)

modules/dav/fs/NWGNUmakefile

+2 −1
Changes for modules/dav/fs/NWGNUmakefile: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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

#

modules/dav/lock/NWGNUmakefile

+2 −1
Changes for modules/dav/lock/NWGNUmakefile: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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

#