Finish up the config.m4 file overhaul, so that we can load config.m4 files

in order.

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

diff --git a/build/build.mk b/build/build.mk
index 514f118c1aaf7742f17e467b49544e1d0568e0f4..a45069dcbaf68158386e10fa76eac8e6e13f36c6 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -91,10 +91,7 @@ generated_lists:
                echo "libtoolize not found in path"; \
                exit 1; \
        fi; 
-       @echo config_m4_files = `find . -name "config*.m4" | \
-                             sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \
-                             sort -g | \
-                             sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#'` > $@
+       @echo config_m4_files = `find . -name config.m4` > $@
        @n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@
 
 $(STAMP): build/buildcheck.sh

diff --git a/build/config-stubs b/build/config-stubs
index aff00a57d48c27562c2f2c1a75f0125aa72ab740..6c83b5119ca30526ef67a517f2773061fb06eb9c 100755 (executable)
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-dir=$1
-for stubdir in `find $dir -type d`; do
-    if [ -r $stubdir/config.m4 ]; then
-        echo "sinclude($stubdir/config.m4)"
+for configfiles in `find . -name "config*.m4" | \
+         sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \
+         sort -g | \
+         sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#g'`; do
+    if [ -r $configfiles ]; then
+        echo "sinclude($configfiles)"
     fi
 done