Commit d25360a7 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Kill some NetWare build warnings (backport r1481040). 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1481055 13f79535-47bb-0310-9956-ffa450edef68
parent 52ac58ca

build/NWGNUhead.inc

+2 −0
Original line number Diff line number Diff line
@@ -82,8 +82,10 @@ clobber_prebuild :: 


$(SUBDIRS) : FORCE

ifneq "$(MAKECMDGOALS)" "clean"

ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"

	@$(ECHONL)

	@echo $(DL)Building $(CURDIR)/$@$(DL)

endif

endif

	$(MAKE) -C $@ $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)"

	@$(ECHONL)

build/NWGNUtail.inc

+3 −2
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ CPPOPT_DEPENDS = $(CCOPT_DEPENDS) 
# Generic compiler rules

#



ifneq ($(MAKECMDGOALS),clean)

ifneq "$(MAKECMDGOALS)" "clean"

ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"

$(APBUILD)/NWGNUversion.inc: $(APBUILD)/nw_ver.awk $(SRC)/include/ap_release.h

#	@echo Generating $@

	@echo $(DL)GEN  $@$(DL)

	$(AWK) -f $^ > $@
@@ -111,6 +111,7 @@ VERSION_STR = 2.2.0 
VERSION_MAJMIN	= 22

endif

endif

endif





ifeq "$(words $(strip $(TARGET_nlm)))" "1"

modules/NWGNUmakefile

+3 −2
Original line number Diff line number Diff line
@@ -11,12 +11,13 @@ include $(AP_WORK)/build/NWGNUenvironment.inc 
ifeq "$(wildcard $(APRUTIL)/include/apr_ldap.h)" "$(APRUTIL)/include/apr_ldap.h"

WITH_LDAP = $(shell $(AWK) '/^\#define APR_HAS_LDAP /{print $$3}' $(APRUTIL)/include/apr_ldap.h)

else

ifeq "$(MAKECMDGOALS)" "clean"

WITH_LDAP = 1

else

ifneq "$(MAKECMDGOALS)" "clean"

ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"

WITH_LDAP = 0

endif

endif

endif



# If USE_STDSOCKETS is defined we allways build mod_ssl

ifdef USE_STDSOCKETS