From: Ryan Bloom <rbb@apache.org>
Date: Tue, 26 Dec 2000 22:48:49 +0000 (+0000)
Subject: Finish up the config.m4 file overhaul, so that we can load config.m4 files
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84ed4234861e798caf0b6519b6c6ea56eb17f493;p=apache

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 514f118c1a..a45069dcba 100644
--- 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 aff00a57d4..6c83b5119c 100755
--- 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