Make the test for APR a bit more stringent and add a check for apr-util

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

diff --git a/build/build.mk b/build/build.mk
index bff40b17a0b2482e6a7381118ea4ff880130ad1c..af7a7ad53be8e42add1d16438531a29ec581a869 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -61,12 +61,18 @@
 STAMP = buildmk.stamp
 
 all: $(STAMP) generated_lists
-       @if [ ! -d srclib/apr ]; then \
+       @if [ ! -d srclib/apr -o ! -f srclib/apr/apr_common.m4 ]; then \
            echo "APR not found."; \
            echo "Please check-out a working version of APR, the anonymous"; \
            echo "CVS root is :pserver:anoncvs@www.apache.org:/home/cvspublic"; \
            exit 1; \
        fi
+       @if [ ! -d srclib/apr-util -o ! -f srclib/apr-util/Makefile.in ]; then \
+           echo "APR-util not found."; \
+           echo "Please check-out a working version of APR-util, the anonymous"; \
+           echo "CVS root is :pserver:anoncvs@www.apache.org:/home/cvspublic"; \
+           exit 1; \
+       fi
        @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
 
 generated_lists: