svn commit: r1555792 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS build/config-stubs

[co...@apache.org]

Author: covener
Date: Mon Jan  6 14:12:41 2014
New Revision: 1555792

URL: http://svn.apache.org/r1555792
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/build/config-stubs

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1542615

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1555792&r1=1555791&r2=1555792&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jan  6 14:12:41 2014
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1555792&r1=1555791&r2=1555792&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jan  6 14:12:41 2014
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/build/config-stubs
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/config-stubs?rev=1555792&r1=1555791&r2=1555792&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/config-stubs (original)
+++ httpd/httpd/branches/2.4.x/build/config-stubs Mon Jan  6 14:12:41 2014
@@ -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#.* ##'`