From: Stefan Fritsch <sf@apache.org>
Date: Fri, 5 Aug 2011 08:20:56 +0000 (+0000)
Subject: Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
X-Git-Tag: 2.3.15~415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9026104550501f5280eb979574ea107bdc24e695;p=apache

Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
being built shared even with --enable-mods-static=reallyall.


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

diff --git a/modules/core/config.m4 b/modules/core/config.m4
index d923056a82..e2799c91a9 100644
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -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
 ])