From: Paul Querna <pquerna@apache.org>
Date: Sat, 15 Jul 2006 09:47:11 +0000 (+0000)
Subject: include/ap_config.h: Include the autoconf generated header that defines what is avail... 
X-Git-Tag: 2.3.0~2249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf508e3c681db312d092d06bbe9b144782dc5982;p=thirdparty%2Fapache%2Fhttpd.git

include/ap_config.h: Include the autoconf generated header that defines what is available.

configure.in: The times function is not really available on mingw32. Disable em.


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

diff --git a/configure.in b/configure.in
index 28f5f824792..14b1ba2d9f8 100644
--- a/configure.in
+++ b/configure.in
@@ -296,6 +296,7 @@ case $host in
   *mingw32*)
       APR_SETVAR(APACHE_MPM, [winnt])
       APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      APR_SETIFNULL(ac_cv_func_times, [no])
       ;;
   *aix*)
       aixver=`echo $host | sed 's/^[[^0-9]]*//' | sed 's/\.//g'`
diff --git a/include/ap_config.h b/include/ap_config.h
index f729adc0245..dd977a6ca03 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -230,7 +230,7 @@
         APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
 
 #include "os.h"
-#if !defined(WIN32) && !defined(NETWARE)
+#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
 #include "ap_config_auto.h"
 #include "ap_config_layout.h"
 #endif