From 9c5d2dc6e9818e694bbd67c38b25b9eb11f487b1 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 22 Jun 2016 20:00:39 +0000 Subject: [PATCH] Merge r1749659, r1749678 from trunk: Simplify, and correct the dependency handling of mod_proxy_hcheck Cause missing mod_watchdog to 'unset' the --enable-proxy default, rather than disable the module. This forces the module logic to emit a warning of the missing dependency; changes the output from checking whether to enable mod_proxy_hcheck... no to configure: WARNING: "mod_watchdog is disabled but required for mod_proxy_hcheck" checking whether to enable mod_proxy_hcheck... no (disabled) Submitted by: wrowe Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749774 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ modules/proxy/config.m4 | 17 ++++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/STATUS b/STATUS index e585dbbc5e..4e591ba9b9 100644 --- a/STATUS +++ b/STATUS @@ -116,12 +116,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) configure: Simplify, and correct dependency handling of mod_proxy_hcheck - trunk patch: http://svn.apache.org/r1749659 - http://svn.apache.org/r1749678 - 2.4.x: trunk patch works - http://apaste.info/iyv - +1: wrowe, jim, rpluem PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4 index 29394ce46c..d01178cf3b 100644 --- a/modules/proxy/config.m4 +++ b/modules/proxy/config.m4 @@ -10,14 +10,6 @@ else proxy_mods_enable=most fi -if test "$proxy_mods_enable" = "no"; then - enable_proxy_hcheck=no -fi -dnl If enable_proxy_hcheck is unset handle it like other proxy modules -if test -z "$enable_proxy_hcheck" ; then - enable_proxy_hcheck="$proxy_mods_enable" -fi - proxy_objs="mod_proxy.lo proxy_util.lo" APACHE_MODULE(proxy, Apache proxy module, $proxy_objs, , $proxy_mods_enable) @@ -67,7 +59,14 @@ APACHE_MODULE(proxy_ajp, Apache proxy AJP module. Requires and is enabled by -- 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]) -- 2.40.0