[email protected] wrote: > Author: wrowe > Date: Tue May 5 06:23:29 2009 > New Revision: 771579 > > URL: http://svn.apache.org/viewvc?rev=771579&view=rev > Log: > 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.
This appears to almost work; > Modified: httpd/httpd/trunk/modules/mappers/config9.m4 > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config9.m4?rev=771579&r1=771578&r2=771579&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/mappers/config9.m4 (original) > +++ httpd/httpd/trunk/modules/mappers/config9.m4 Tue May 5 06:23:29 2009 > @@ -61,30 +61,16 @@ > > 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 but LoadModule mod_watchdog falls after other modules. Now I don't recall precisely how Jeff worked out the MPM hooks, and am too tired to work it out just at this moment, but would renaming this config3.m4 work out this ordering issue?
