From cb60d8c127fd1c6b0796e73028130ad828e76101 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 30 Sep 2009 19:26:52 +0000 Subject: [PATCH] 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 --- modules/core/config.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/core/config.m4 b/modules/core/config.m4 index fe1aae78c6..830e6bb035 100644 --- 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, [ -- 2.50.1