Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.109
diff -u -r1.109 acinclude.m4
--- acinclude.m4	10 Jan 2002 04:55:19 -0000	1.109
+++ acinclude.m4	26 Feb 2002 19:37:19 -0000
@@ -310,7 +310,7 @@
         ;;
     esac
     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
-    val=`echo $val | sed -e 's:[\$]\([a-z_]*\):$(\1):g'`
+    val=`echo $val | sed -e 's:[\$]\([a-z_]*\):${\1}:g'`
     if test "$autosuffix" = "yes"; then
       if echo $val | grep apache >/dev/null; then
         addtarget=no
@@ -325,6 +325,7 @@
   done
   changequote([,])
 ])dnl
+
 dnl
 dnl APACHE_ENABLE_LAYOUT
 dnl
@@ -332,15 +333,15 @@
 AC_ARG_ENABLE(layout,
 APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
   LAYOUT=$enableval
+  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
 ])
 
+AC_MSG_CHECKING(for chosen layout)
 if test -z "$LAYOUT"; then
-  LAYOUT="Apache"
+  AC_MSG_RESULT($layout_name)
+else
+  AC_MSG_RESULT([Autoconf Defaults])
 fi
-APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
-
-AC_MSG_CHECKING(for chosen layout)
-AC_MSG_RESULT($layout_name)
 ])
 
 dnl
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.200
diff -u -r1.200 configure.in
--- configure.in	1 Feb 2002 23:22:29 -0000	1.200
+++ configure.in	26 Feb 2002 19:37:20 -0000
@@ -5,7 +5,13 @@
 dnl
 
 AC_PREREQ(2.13)
+AC_PREFIX_DEFAULT(/usr/local/apache2)
 AC_INIT(ABOUT_APACHE)
+test "$prefix" = "NONE" && prefix='/usr/local/apache2'
+test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
+
+dnl Get the layout here, so we can pass the required variables to apr
+APACHE_ENABLE_LAYOUT
 
 AC_CONFIG_HEADER(include/ap_config_auto.h)
 AC_CONFIG_AUX_DIR(srclib/apr/build)
@@ -34,13 +40,6 @@
 nl='
 '
 
-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}'
-
 dnl ## Run configure for packages Apache uses
 
 dnl shared library support for these packages doesn't currently
@@ -48,19 +47,17 @@
 
 AC_CANONICAL_SYSTEM
 
-orig_prefix="$prefix"
-
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
 
@@ -277,8 +274,6 @@
   APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
 ])dnl
 
-APACHE_ENABLE_LAYOUT
-prefix="$orig_prefix"
 APACHE_ENABLE_MODULES
 
 dnl reading config stubs