add back the DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR stuff

[apache] / configure.in

diff --git a/configure.in b/configure.in
index ead96cd09aaa3c2298888963ac2d988382434c21..4ae175106b27d581694596aeadd46fa8688414d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -93,7 +93,16 @@ if test "x$with_included_apr" = "xyes"; then
     AC_MSG_ERROR([Bundled APR requested but not found at ./srclib/. Download and unpack the corresponding apr and apr-util packages to ./srclib/.])
   fi
 else 
-  APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2)
+  APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2, [
+    version=`$apr_config --version`
+    case x${version} in
+    x1.[[0-3]].*) 
+      AC_MSG_WARN([APR version 1.4.0 or later is required, found $version])
+      apr_acceptable=no
+      ;;
+    esac
+    unset version
+   ])
 fi
 
 if test "$apr_found" = "no"; then
@@ -342,6 +351,7 @@ case $host in
       ;;
   *mingw32*)
       APR_ADDTO(INTERNAL_CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      APR_ADDTO(INTERNAL_CPPFLAGS, [-DAPREQ_DECLARE_EXPORT])
       APR_SETIFNULL(ac_cv_func_times, [no])
       APR_SETIFNULL(ac_cv_func_getpwnam, [no])
       APR_SETIFNULL(ac_cv_func_getgrnam, [no])
@@ -717,6 +727,8 @@ APACHE_HELP_STRING(--with-suexec-gidmin,Minimal allowed GID),[
 AC_ARG_WITH(suexec-logfile,
 APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[
   if test "x$withval" = "xyes"; then
+    AC_MSG_ERROR([log filename required for --with-suexec-logfile option])
+  elif test "x$withval" != "xno"; then
     AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file])
   fi
 ])