Find all config.m4 files when building generated_lists. Also, convert

the sort to use 'sort -n -b'.  These arguments are specified by single
unix, so they should be portable.  This restores the ability to order
the config.m4 files.
Submitted by:	Dale Ghent <daleg@elemental.org>

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

diff --git a/build/build.mk b/build/build.mk
index a45069dcbaf68158386e10fa76eac8e6e13f36c6..0f3b2024f53f93b21f7ad2a09348ccc0dcdccaec 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -91,7 +91,7 @@ generated_lists:
                echo "libtoolize not found in path"; \
                exit 1; \
        fi; 
-       @echo config_m4_files = `find . -name config.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 533b5a072b8eaff3ac3c443a4cdb5fe758a113c5..918f6ed75535a7e0f6fddab5cd7f2b5a2428fcfe 100755 (executable)
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -2,7 +2,7 @@
 
 for configfiles in `find . -name "config*.m4" | \
          sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \
-         sort | \
+         sort -n -b | \
          sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#g'`; do
     if [ -r $configfiles ]; then
         echo "sinclude($configfiles)"