summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2001-09-04 22:32:56 +0000
committerRyan Bloom <rbb@apache.org>2001-09-04 22:32:56 +0000
commit273f948bb88c6a7f5995e090b5bf263e0cf663fc (patch)
tree33807fbeb3a4829067d7c1bdba5ab65b6dcad96e /acinclude.m4
parent0fbd80ebb0fb64fd14760446264af6e60e8263fb (diff)
downloadhttpd-273f948bb88c6a7f5995e090b5bf263e0cf663fc.tar.gz
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
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m418
1 files changed, 2 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index c40358af06..d14f2d579d 100644
--- 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)