Follow up to r1847232.

[apache] / build / config-stubs

diff --git a/build/config-stubs b/build/config-stubs
index aff00a57d48c27562c2f2c1a75f0125aa72ab740..3cc6991175ae978a31fa771f8b74235da8327449 100755 (executable)
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -1,8 +1,27 @@
 #!/bin/sh
 
-dir=$1
-for stubdir in `find $dir -type d`; do
-    if [ -r $stubdir/config.m4 ]; then
-        echo "sinclude($stubdir/config.m4)"
+#
+# Find all config files (config*.m4) and map them into lines with the
+# form: NUM? '0' ' ' PATH
+#
+# For example:
+#
+#  50 ./modules/generators/config5.m4
+#  0 ./modules/aaa/config.m4
+#  10 ./example/config1.m4
+#
+# These lines are sorted, then the first field is removed. Thus, we
+# have a set of paths sorted on the config-number (if present). All
+# config files without a number are sorted before those with a number.
+#
+
+configfiles=`find os server modules support -name "config*.m4" | \
+       sed 's#\(.*/config\)\(.*\).m4#\20 \1\2.m4#' | \
+       sort | \
+       sed 's#.* ##'`
+
+for configfile in $configfiles; do
+    if [ -r $configfile ]; then
+        echo "sinclude($configfile)"
     fi
 done