If the user doesn't specify a layout, then just use the Apache

layout.  This means that we don't have to re-specify options that are
already in config.layout.

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

diff --git a/acinclude.m4 b/acinclude.m4
index c40358af0640a9ac3450dee0d9ccc2dc46fabc56..d14f2d579dd5d9154b9622fecdfeb1ecbfd8021e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -317,23 +317,9 @@ AC_ARG_ENABLE(layout,
 ])
 
 if test -z "$LAYOUT"; then
-  # 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'
-  manualdir='$(prefix)/manual'
-  errordir='$(prefix)/error'
-  iconsdir='$(prefix)/icons'
-  cgidir='$(prefix)/cgi-bin'
-  logfiledir='$(prefix)/logs'
-  sysconfdir='${prefix}/conf'
-  libexecdir='${prefix}/modules'
-  mandir='${prefix}/man'
-  layout_name=Apache
-  installbuilddir='${prefix}/build'
-else 
-  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
+  LAYOUT="Apache"
 fi
+APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
 
 AC_MSG_CHECKING(for chosen layout)
 AC_MSG_RESULT($layout_name)