don't override the user's choice (e.g., --enable-watchdog)

when deciding how it is enabled by default

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

diff --git a/modules/core/config.m4 b/modules/core/config.m4
index fe1aae78c675d16c3d5840313b619de4c90b21b3..830e6bb03548cbe2588b723aae7b07eed4479f30 100644 (file)
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -49,10 +49,12 @@ APACHE_MODULE(so, DSO capability, , , $enable_so)
 
 APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
 
-if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-    enable_watchdog="no"
-else
-    enable_watchdog="most"
+if test -z "$enable_watchdog"; then
+    if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+        enable_watchdog="no"
+    else
+        enable_watchdog="most"
+    fi
 fi
 
 APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [