On Wed, Jun 22, 2016 at 10:19 AM, William A Rowe Jr <[email protected]>
wrote:
> On Wed, Jun 22, 2016 at 7:26 AM, William A Rowe Jr <[email protected]>
> wrote:
>
>>
>>> Have a look at r1749658 & r1749659 for the simplest solution I could
>> come up with, and let me know what you think?
>>
>
> r1749679 improves this a bit further by explaining to the user why
> proxy_hcheck
> isn't built - with a warning that mod_watchdog was disabled.
>
> Attached is a roll-up patch to apply to 2.4.21/.22 to confirm the new
> behavior,
> before 2.4.23 is rolled.
>
Attached /was/ a patch, now attached again...
Index: acinclude.m4
===================================================================
--- acinclude.m4 (revision 1748761)
+++ acinclude.m4 (working copy)
@@ -360,13 +360,14 @@
dnl that may disable it because of missing dependencies.
ifelse([$6$7],,:,
[AC_MSG_RESULT([checking dependencies])
- ifelse([$7],,:,[if test "$enable_$7" = "no" ; then
+ ifelse([$7],,:,[m4_foreach([prereq],[$7],
+ [if test "$enable_[]prereq" = "no" ; then
enable_$1=no
- AC_MSG_WARN("mod_$7 is disabled but required for mod_$1")
- elif test "$enable_$1" = "static" && test "$enable_$7" != "static" ; then
+ AC_MSG_WARN("mod_[]prereq is disabled but required for mod_$1")
+ elif test "$enable_$1" = "static" && test "$enable_[]prereq" != "static" ; then
enable_$1=no
- AC_MSG_WARN("cannot build mod_$1 statically if mod_$7 is built shared")
- else])
+ AC_MSG_WARN("cannot build mod_$1 statically if mod_[]prereq is built shared")
+ el])se])
ifelse([$6],,:,[ $6])
ifelse([$7],,:,[fi])
AC_MSG_CHECKING(whether to enable mod_$1)
Index: modules/proxy/config.m4
===================================================================
--- modules/proxy/config.m4 (revision 1748761)
+++ modules/proxy/config.m4 (working copy)
@@ -10,10 +10,6 @@
proxy_mods_enable=most
fi
-if test "$proxy_mods_enable" = "no"; then
- enable_proxy_hcheck=no
-fi
-
proxy_objs="mod_proxy.lo proxy_util.lo"
APACHE_MODULE(proxy, Apache proxy module, $proxy_objs, , $proxy_mods_enable)
@@ -63,7 +59,14 @@
APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module. Requires and is enabled by --enable-proxy., $proxy_balancer_objs, , $proxy_mods_enable,, proxy)
APACHE_MODULE(proxy_express, mass reverse-proxy module. Requires --enable-proxy., , , $proxy_mods_enable,, proxy)
-APACHE_MODULE(proxy_hcheck, reverse-proxy health-check module. Requires --enable-proxy and --enable-watchdog., , , $enable_proxy_hcheck,, watchdog)
+APACHE_MODULE(proxy_hcheck, [reverse-proxy health-check module. Requires --enable-proxy and --enable-watchdog.], , ,[
+ $proxy_mods_enable
+ dnl Verify that both proxy_mods_enable above and watchdog below are enabled
+ dnl when --enable-proxy-hcheck isn't explicitly elected
+ if test "$enable_watchdog" = "no"; then
+ enable_proxy_hcheck="";
+ fi
+], , [proxy,watchdog])
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
