Fix --sysconfdir and --localstatedir, which were being ignored.

Fix --enable-layout to work.

showstoppers--

Note: As far as we can tell, autoconf will not let us override our layout
settings from paramers like --prefix, etc. This is unfortunate, but
we will not let this get in the way of --enable-layout working. This
will be made clear in the docs.

PR: 9124, 9873, 9885, 9888

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

diff --git a/CHANGES b/CHANGES
index 4b4e95da734fd8193c0976bcb89f94956e1b67d5..f023c8ba83cbdb8df30b9e7063a0725133952ef7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,15 @@
 Changes with Apache 2.0.33-dev
 
+  *) Fix bug where --sysconfdir and --localstatedir were being
+     ignored.  [Thom May <thom@planetarytramp.net>, Aaron Bannert]
+     PR 9888
+
+  *) Fix --enable-layout to work again. Caution: When specifying
+     --enable-layout, common arguments like --prefix, --exec-prefix,
+     etc. will be ignored and the settings from the layout will be
+     used instead.  [Thom May <thom@planetarytramp.net>, Aaron Bannert]
+     PR 9124, 9873, 9885
+
   *) New Directive for mod_proxy: ProxyRemoteMatch. This provides
      regex pattern matching for the determination of which requests
      to use the remote proxy for. [Jim Jagielski]

diff --git a/STATUS b/STATUS
index 2292eb3387dcaa9b4493f35e49512e86375807a2..afdfe79d73e3291ffeff7effee18c5f1dfb4ebff 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2002/02/27 17:06:35 $]
+Last modified at [$Date: 2002/02/27 17:16:29 $]
 
 Release:
 
@@ -96,7 +96,6 @@ FINAL RELEASE SHOWSTOPPERS:
 
     * Address popular PRs
         * Win32 doesn't install as service correctly [9863, 9914, 9961]
-        * --enable-layout doesn't work [9873, 9885]
 
 CURRENT VOTES:
 
@@ -348,13 +347,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
         Status: Ken asks, didn't Jeff fix this when he fixed the queue
                 overrun?
 
-    * the autoconf setup should be fixed to default to using the 
-      "Apache" layout from config.layout, and each variable settable
-      in a layout should be overridable on the command line.  Plus,
-      what we do right now just doesn't seem to fully fit into how autoconf
-      works, eg. AC_PREFIX_DEFAULT issues.
-        Message-ID: <Pine.BSF.4.20.0104031557420.20876-100000@alive.znep.com>
-
     * Combine log_child and piped_log_spawn. Clean up http_log.c.
       Common logging API.