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

diff --git a/acinclude.m4 b/acinclude.m4
index abf2fe0aafd5b218fb870d87f0c7137367efdb7c..2ae8ebb9e9efb5e734098ca6be2fa13add329049 100644 (file)
--- 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"

diff --git a/configure.in b/configure.in
index f9baec8fbf9f552b0efd9e92e6fbe32109b000ed..72d5bf3288c1baaa9e1ea590117f768c0919d28d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,7 @@ APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
   APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
   AC_MSG_RESULT($LAYOUT)
 ], [
+  APACHE_LAYOUT_DEFAULTS
   AC_MSG_RESULT([Autoconf Defaults])
 ])