Revert r1749920, meant to apply this to trunk/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749922 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 79e395e1e95c20b6bf9307fd1c8e8e29855daa5e..e26de5f1ee07bddfaaf367ebe1bcb34146e7797d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -365,8 +365,8 @@ AC_DEFUN([APACHE_MODULE],[
                               enable_$1=no
                               AC_MSG_WARN("mod_[]prereq is disabled but required for mod_$1")
                             elif test "$enable_$1" = "static" && test "$enable_[]prereq" != "static" ; then
-                              enable_$1=shared
-                              AC_MSG_WARN("building mod_$1 shared because mod_[]prereq is built shared")
+                              enable_$1=no
+                              AC_MSG_WARN("cannot build mod_$1 statically if mod_[]prereq is built shared")
                             el])se])
             ifelse([$6],,:,[  $6])
             ifelse([$7],,:,[fi])

diff --git a/modules/core/config.m4 b/modules/core/config.m4
index 8bb39a5cb235757da1883966a884a1afa3b8d983..94fb4a12483d97e49277056b4374401ea7d4d33e 100644 (file)
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -45,7 +45,7 @@ fi
 
 APACHE_MODULE(so, DSO capability.  This module will be automatically enabled unless you build all modules statically., , , $enable_so)
 
-APACHE_MODULE(watchdog, Watchdog module, , , , [
+APACHE_MODULE(watchdog, Watchdog module, , , most, [
     APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
     if test $ac_cv_define_APR_HAS_THREADS = "no"; then
         AC_MSG_WARN([mod_watchdog requires apr to be built with --enable-threads])