Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1749659 - /httpd/httpd/trunk/modules/proxy/config.m4
Date: Wed, 22 Jun 2016 12:23:34 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
Message-Id: <20160622122334.B9D443A0056@svn01-us-west.apache.org>
archived-at: Wed, 22 Jun 2016 12:23:40 -0000

Author: wrowe
Date: Wed Jun 22 12:23:34 2016
New Revision: 1749659

URL: http://svn.apache.org/viewvc?rev=1749659&view=rev
Log:
Simplify, and correct the dependency handling of mod_proxy_hcheck

Modified:
    httpd/httpd/trunk/modules/proxy/config.m4

Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=1749659&r1=1749658&r2=1749659&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Wed Jun 22 12:23:34 2016
@@ -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 modul
 ])
 
 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])