From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 8 Aug 2007 13:08:52 +0000 (+0000)
Subject: added check for minimum APR version.
X-Git-Tag: 2.3.0~1621
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c1dfa2b1dcbeff046fcf36637bcde20f990795;p=thirdparty%2Fapache%2Fhttpd.git

added check for minimum APR version.


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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 631d6ec66fb..d79eedb495b 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -119,6 +119,9 @@ LIB	= mwldnlm -type library -w nocmdline
 # Setup build tools
 AWK	= awk
 
+# Define minimum APR version to check for
+APR_WANTED = 1003000
+
 ifdef IPV6
 ifndef USE_STDSOCKETS
 USE_STDSOCKETS=1
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 43bd741965d..8cd578498b6 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -21,7 +21,7 @@ FILES_prebuild_headers = \
 	$(PCRE)/pcre.h \
 	$(EOLIST) 
     
-nlms :: $(NWOS)/httpd.imp
+nlms :: chkapr $(NWOS)/httpd.imp
 
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 	@echo Generating $(subst /,\,$@)
@@ -52,6 +52,13 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 	@echo Creating $(subst /,\,$@)
 	copy $< $(subst /,\,$(PCRE))\$(@F)
 
+#
+# Check for minimum APR version
+#
+chkapr: $(APR)\build\nw_ver.awk $(APR)\include\apr_version.h
+	@echo Checking for APR version...
+	@$(AWK) -v WANTED=$(APR_WANTED) -f $^
+
 #
 # You can use this target if all that is needed is to copy files to the
 # installation area