--with-module: Fix failure to integrate them into some existing

module directories.

modules/config?.m4 needs to run after the modules/*/config?.m4.
Otherwise, modules.mk as created for --with-module gets wiped
out first.

PR: 40097

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

diff --git a/CHANGES b/CHANGES
index 1452e77d95b62e594507053d3b294cd58aad6718..ddbf6f9f94c3269a26bfa6474c7e51f053f8e563 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) --with-module: Fix failure to integrate them into some existing
+     module directories.  PR 40097.  [Jeff Trawick]
+
   *) mod_headers: New params: %l for load averages, %i for an
      idle percentage rating of httpd, and %b for a busy percentage
      rating. [Jim Jagielski]

diff --git a/modules/config5.m4 b/modules/config7.m4
similarity index 100%
rename from modules/config5.m4
rename to modules/config7.m4