diff options
| author | Aaron Bannert <aaron@apache.org> | 2002-02-27 19:40:27 +0000 |
|---|---|---|
| committer | Aaron Bannert <aaron@apache.org> | 2002-02-27 19:40:27 +0000 |
| commit | bb7ef8124cebaa3be5d8de6eb13ba3f6d2aeac9c (patch) | |
| tree | 6ba60e98257be07878e68bc280affd03d3bb2ed7 /acinclude.m4 | |
| parent | d057840899a704974f45073f0aea30c4064fb798 (diff) | |
| download | httpd-bb7ef8124cebaa3be5d8de6eb13ba3f6d2aeac9c.tar.gz | |
Set defaults for non-autoconf path variables. Also export a couple
variables that for whatever reason weren't being placed into
config_vars.mk.
Warning: This commit alters the "default" layout (ie. when no --enable-layout
is specified). The most notable change will be htdocs in $prefix/share/htdocs,
which works with the autoconf defaults, but may not be what we want. This
will require more work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93605 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index abf2fe0aaf..2ae8ebb9e9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -55,6 +55,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(iconsdir) APACHE_SUBST(sysconfdir) APACHE_SUBST(installbuilddir) + APACHE_SUBST(runtimedir) + APACHE_SUBST(proxycachedir) APACHE_SUBST(other_targets) APACHE_SUBST(progname) APACHE_SUBST(prefix) @@ -275,8 +277,26 @@ AC_DEFUN(APACHE_MODULE,[ APACHE_MODPATH_ADD($1, $shared, $3) fi ])dnl + +dnl +dnl APACHE_LAYOUT_DEFAULTS +dnl +AC_DEFUN(APACHE_LAYOUT_DEFAULTS,[ + dnl We only need to check the non-autoconf variables. + test "x${cgidir}" = "x" && cgidir='${datadir}/error' + test "x${logfiledir}" = "x" && logfiledir='${localstatedir}/logs' + test "x${htdocsdir}" = "x" && htdocsdir='${datadir}/htdocs' + test "x${manualdir}" = "x" && manualdir='${datadir}/manual' + test "x${errordir}" = "x" && errordir='${datadir}/error' + test "x${iconsdir}" = "x" && iconsdir='${datadir}/icons' + test "x${installbuilddir}" = "x" && installbuilddir='${datadir}/build' + test "x${runtimedir}" = "x" && runtimedir='${localstatedir}/logs' + test "x${proxycachedir}" = "x" && proxycachedir='${localstatedir}/proxy' +])dnl + dnl dnl APACHE_LAYOUT(configlayout, layoutname) +dnl AC_DEFUN(APACHE_LAYOUT,[ if test ! -f $srcdir/config.layout; then echo "** Error: Layout file $srcdir/config.layout not found" |