From: Eric Covener Date: Mon, 6 Jan 2014 14:12:41 +0000 (+0000) Subject: Merge r1542615 from trunk: X-Git-Tag: 2.4.8~265 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28e6f7a08ee04af1123fec4045767a4ff318178f;p=apache 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 5d2db0a303..44c29715ec 100644 --- 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 d77da480aa..3f4e6b0602 100644 --- 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 425dc80268..3cc6991175 100755 --- 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#.* ##'`