From 9026104550501f5280eb979574ea107bdc24e695 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 5 Aug 2011 08:20:56 +0000 Subject: [PATCH] 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 --- modules/core/config.m4 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/modules/core/config.m4 b/modules/core/config.m4 index d923056a82a..e2799c91a94 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 ]) -- 2.47.2