httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1749922 - in /httpd/httpd/branches/2.4.x: acinclude.m4 modules/core/config.m4
Date Thu, 23 Jun 2016 15:31:00 GMT
Author: wrowe
Date: Thu Jun 23 15:31:00 2016
New Revision: 1749922

URL: http://svn.apache.org/viewvc?rev=1749922&view=rev
Log:
Revert r1749920, meant to apply this to trunk/

Modified:
    httpd/httpd/branches/2.4.x/acinclude.m4
    httpd/httpd/branches/2.4.x/modules/core/config.m4

Modified: httpd/httpd/branches/2.4.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/acinclude.m4?rev=1749922&r1=1749921&r2=1749922&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x/acinclude.m4 Thu Jun 23 15:31:00 2016
@@ -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])

Modified: httpd/httpd/branches/2.4.x/modules/core/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/config.m4?rev=1749922&r1=1749921&r2=1749922&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/core/config.m4 Thu Jun 23 15:31:00 2016
@@ -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])



Mime
View raw message