MPM's are now dynamically loadable; so must mod_watchdog be.

The only module with an excuse now is mod_so which implements
LoadModule itself.

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

diff --git a/libhttpd.dsp b/libhttpd.dsp
index e6e9ce177ce64e3aa05b61042400e61cf9878722..72856b9e0875edfc5f7286c721d8e912c8a1814e 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -423,10 +423,6 @@ SOURCE=.\modules\mappers\mod_so.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_watchdog.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\modules\arch\win32\mod_win32.c
 # End Source File
 # Begin Source File

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index ee916a2f19c34af322d98e1cfa239e4692b89cf7..88e8c8a9a8d2ecfada693f98e881633c8860473c 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -61,30 +61,16 @@ APACHE_MODULE(so, DSO capability, , , $enable_so)
 
 APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
 
-case "x$enable_watchdog" in
-    "xyes")
-        if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-            AC_MSG_ERROR([mod_watchdog has been requested but cannot be built on your system])
-        fi
-        ;;
-    "xshared")
-        AC_MSG_ERROR([mod_watchdog can not be built as a shared DSO])
-        ;;
-    "xno")
-        ;;
-    "x")
-        enable_watchdog=$ac_cv_define_APR_HAS_THREADS
-        ;;
-esac
-
-dnl mod_watchdog can only be built statically.
-if test "x$enable_watchdog" = "xyes"; then
-    enable_watchdog="static"
+if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+    enable_watchdog="no"
+else
+    enable_watchdog="most"
 fi
 
-APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog)
-
-dnl ### why save the cache?
-AC_CACHE_SAVE
+APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
+    if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+        AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
+    fi
+])
 
 APACHE_MODPATH_FINISH

diff --git a/os/win32/modules.c b/os/win32/modules.c
index fb34b3db43cdcced77af2e3877c3cbfb3d1a6754..6e1adae2c2f2713f07f1400d0ed722006e1f8566 100644 (file)
--- a/os/win32/modules.c
+++ b/os/win32/modules.c
@@ -35,7 +35,6 @@ AP_DECLARE_DATA module *ap_prelinked_modules[] = {
   &mpm_winnt_module,
   &http_module,
   &so_module,
-  &watchdog_module,
   NULL
 };
 
@@ -45,7 +44,6 @@ ap_module_symbol_t ap_prelinked_module_symbols[] = {
   {"mpm_winnt_module", &mpm_winnt_module},
   {"http_module", &http_module},
   {"so_module", &so_module},
-  {"watchdog_module", &watchdog_module},
   {NULL, NULL}
 };