httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r820407 - /httpd/httpd/trunk/modules/core/config.m4
Date Wed, 30 Sep 2009 19:26:53 GMT
Author: trawick
Date: Wed Sep 30 19:26:52 2009
New Revision: 820407

URL: http://svn.apache.org/viewvc?rev=820407&view=rev
Log:
don't override the user's choice (e.g., --enable-watchdog)
when deciding how it is enabled by default

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=820407&r1=820406&r2=820407&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/config.m4 (original)
+++ httpd/httpd/trunk/modules/core/config.m4 Wed Sep 30 19:26:52 2009
@@ -49,10 +49,12 @@
 
 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, [



Mime
View raw message