Merge r1542615 from trunk:

Explicitly list in which directories to look for config*.m4 files.

If some distributor patches a config*.m4 file with quilt, that will
place a copy of the original file in .pc/ . Doing a naive "find ."
will then cause both the original and the patched m4 file to be included,
causing havoc later on.

PR: 55787

Submitted by: sf
Reviewed by: trawick, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555792 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5d2db0a3031293d64003877e63c6576d4fc5e53f..44c29715ec93ee24bbabf9115c21a2b8cf973362 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.8
 
+  *) build: only search for modules (config*.m4) in known subdirectories, see
+     build/config-stubs. [Stefan Fritsch]
+
   *) mod_cache_disk: Fix potential hangs on Windows when using mod_cache_disk. 
      PR55833. [Eric Covener]
 

diff --git a/STATUS b/STATUS
index d77da480aaf1fa5af08731ed64f84a7bf94993f3..3f4e6b0602a9d8a75383be4079fdae4352376493 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,12 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: Look for config*.m4 files only in the correct directories.
-    trunk patch: https://svn.apache.org/r1542615
-    2.4.x patch: trunk patch works
-    +1: sf, trawick, covener
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/build/config-stubs b/build/config-stubs
index 425dc80268a9ff2d80707cb463a9b6309d34b45d..3cc6991175ae978a31fa771f8b74235da8327449 100755 (executable)
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -15,7 +15,7 @@
 # config files without a number are sorted before those with a number.
 #
 
-configfiles=`find . -name "config*.m4" | \
+configfiles=`find os server modules support -name "config*.m4" | \
        sed 's#\(.*/config\)\(.*\).m4#\20 \1\2.m4#' | \
        sort | \
        sed 's#.* ##'`