From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 22 Jun 2016 12:23:34 +0000 (+0000)
Subject: Simplify, and correct the dependency handling of mod_proxy_hcheck
X-Git-Tag: 2.5.0-alpha~1485
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c5c8a9d4ca9d71bec625045f40af311df4770d8;p=thirdparty%2Fapache%2Fhttpd.git

Simplify, and correct the dependency handling of mod_proxy_hcheck

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

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index 4d95050f4c8..c6d197e1c14 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)
 
@@ -76,7 +68,14 @@ APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
 ])
 
 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=no;
+  fi
+], , [proxy,watchdog])
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])