Temporary (hopefully) reversion to the previously used hack to

allow --prefix to work for now.  This means that part of the Apache
layout is duplicated in configure.in again.

There are a _LOT_ of inconsistencies in different places about what
items in config.layout are actually used and how they can be set.

Also, change the couple of other things that are necessary to make
/usr/local/apache2 the default prefix when using this way of doing
things.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/STATUS b/STATUS
index b7ea0a9995027edede933988678b037dda87653e..3af888072fe8f9e455ee27bd367aaa0a7c9d478d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/04/03 22:56:48 $]
+Last modified at [$Date: 2001/04/03 23:47:39 $]
 
 Release:
 
@@ -98,6 +98,13 @@ RELEASE SHOWSTOPPERS:
 
 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 
+    * 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>
+
     * mod_status ExtendedStatus SS (seconds since last request) is
       bogus because of an uninitialized field in the scoreboard.
         Status: Cliff is working on this

diff --git a/acinclude.m4 b/acinclude.m4
index 1dd250ac52d0cb8c5b91a86a274f477437f365f4..56d962db706cbc7a86b4caa259640a575f21ed69 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -329,9 +329,19 @@ AC_ARG_ENABLE(layout,
 ])
 
 if test -z "$LAYOUT"; then
-  LAYOUT="Apache"
+  # XXX FIXME: this isn't a complete list of things that have to be set to 
+  # create the Apache layout in config.layout, and it really should just
+  # use what is specified in config.layout instead of duping it.
+  htdocsdir='$(prefix)/htdocs'
+  iconsdir='$(prefix)/icons'
+  cgidir='$(prefix)/cgi-bin'
+  logfiledir='$(prefix)/logs'
+  sysconfdir='${prefix}/conf'
+  libexecdir='${prefix}/modules'
+  layout_name=Apache
+else 
+  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
 fi
-APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
 
 AC_MSG_CHECKING(for chosen layout)
 AC_MSG_RESULT($layout_name)

diff --git a/configure.in b/configure.in
index dab4e3b9ac91bbabb1ba70026f25f68d902a8c35..6fb9aa86a7736c727f8e9fc5b348855d7385b8ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,8 +31,12 @@ dnl Generate ./config.nice for reproducing runs of configure
 dnl
 APR_CONFIG_NICE(config.nice)
 
+dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
+dnl by configure until it is too late.  Is that how it should be or not?
+dnl Something seems broken here.
+AC_PREFIX_DEFAULT(/usr/local/apache2)
+test "$prefix" = "NONE" && prefix='/usr/local/apache2'
 test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
-test "$prefix" = "NONE" && prefix='/usr/local'
 
 dnl Absolute source/build directory
 abs_srcdir=`(cd $srcdir && pwd)`