Fix a typo in the default cgidir variable.

Set a couple more defaults if they haven't already been set, just
as a precaution.

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

diff --git a/acinclude.m4 b/acinclude.m4
index 2ae8ebb9e9efb5e734098ca6be2fa13add329049..c6f4e438b44791af835b481686f822cc38ad817a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -282,8 +282,11 @@ 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'
+  dnl Apache defaults for autoconf variables.
+  test "x${prefix}" = "xNONE" && prefix='/usr/local/apache2'
+  test "x${exec_prefix}" = "xNONE" && exec_prefix='${prefix}'
+  dnl Now we need to check the non-autoconf variables.
+  test "x${cgidir}" = "x" && cgidir='${datadir}/cgi-bin'
   test "x${logfiledir}" = "x" && logfiledir='${localstatedir}/logs'
   test "x${htdocsdir}" = "x" && htdocsdir='${datadir}/htdocs'
   test "x${manualdir}" = "x" && manualdir='${datadir}/manual'

diff --git a/configure.in b/configure.in
index 72d5bf3288c1baaa9e1ea590117f768c0919d28d..08819da8db87d73cb4ab89d052b268c063c6a05e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,7 @@ dnl     Use ./buildconf to produce a configure script
 dnl
 
 AC_PREREQ(2.13)
+AC_PREFIX_DEFAULT(/usr/local/apache2)
 AC_INIT(ABOUT_APACHE)
 
 AC_CONFIG_HEADER(include/ap_config_auto.h)
@@ -47,13 +48,6 @@ APR_CONFIG_NICE(config.nice)
 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