*) simplify config file list construction (especially the second sed

   expression).
*) comment extensively.
*) process into lines which are always guaranteed to sort properly -- don't
   rely on sort switches or whether "" sorts (numerically) less than "1".


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

1 files changed, 23 insertions, 6 deletions

diff --git a/build/config-stubs b/build/config-stubs
index 918f6ed755..425dc80268 100755
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -1,10 +1,27 @@
 #!/bin/sh
 
-for configfiles in `find . -name "config*.m4" | \
-         sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \
-         sort -n -b | \
-         sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#g'`; do
-    if [ -r $configfiles ]; then
-        echo "sinclude($configfiles)"
+#
+# 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 . -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