httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1154118 - /httpd/httpd/trunk/modules/core/config.m4
Date Fri, 05 Aug 2011 08:20:56 GMT
Author: sf
Date: Fri Aug  5 08:20:56 2011
New Revision: 1154118

URL: http://svn.apache.org/viewvc?rev=1154118&view=rev
Log:
Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
being built shared even with --enable-mods-static=reallyall.

Modified:
    httpd/httpd/trunk/modules/core/config.m4

Modified: httpd/httpd/trunk/modules/core/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/config.m4?rev=1154118&r1=1154117&r2=1154118&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/config.m4 (original)
+++ httpd/httpd/trunk/modules/core/config.m4 Fri Aug  5 08:20:56 2011
@@ -45,19 +45,11 @@ fi
 
 APACHE_MODULE(so, DSO capability.  This module will be automatically enabled unless you build
all modules statically., , , $enable_so)
 
-APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
-
-if test -z "$enable_watchdog"; then
-    if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-        enable_watchdog="no"
-    else
-        enable_watchdog=""
-    fi
-fi
-
-APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
+APACHE_MODULE(watchdog, Watchdog module, , , , [
+    APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
     if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-        AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
+        AC_MSG_WARN([mod_watchdog requires apr to be built with --enable-threads])
+        enable_watchdog=no
     fi
 ])
 



Mime
View raw message