Commit af0e92b7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

OK, instead of an igly hack, just use the normal 

build system impl to force balancer's config to
happen post proxy 


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

modules/proxy/balancers/WHERE_IS_CONFIG_M4.txt

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
The config.m4 file that normally would be located

in this directory is actually concatted to the end

of ../config.m4 (ie: modules/proxy/config.m4).



This is done to force the correct loading of the

submodules. So if additional bundled LB submodules are

added, ../config.m4 must be updated as well.



There is likely a better way to do this...

modules/proxy/balancers/config2.m4

0 → 100644
+20 −0
Original line number Diff line number Diff line 
APACHE_MODPATH_INIT(proxy/balancers)

if test "$enable_proxy" = "shared"; then

  proxy_mods_enable=shared

elif test "$enable_proxy" = "yes"; then

  proxy_mods_enable=yes

else

  proxy_mods_enable=no

fi



proxy_lb_br_objs="mod_lbmethod_byrequests.lo"

proxy_lb_bt_objs="mod_lbmethod_bytraffic.lo"

proxy_lb_bb_objs="mod_lbmethod_bybusyness.lo"

proxy_lb_hb_objs="mod_lbmethod_heartbeat.lo"



APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, $proxy_lb_br_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, $proxy_lb_bt_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, $proxy_lb_bb_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, $proxy_lb_hb_objs, , $proxy_mods_enable)



APACHE_MODPATH_FINISH

modules/proxy/config.m4

+0 −21
Original line number Diff line number Diff line
@@ -80,24 +80,3 @@ APACHE_MODULE(serf, [Reverse proxy module using Serf], $serf_objects, , no, [ 
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators])

APACHE_MODPATH_FINISH



APACHE_MODPATH_INIT(proxy/balancers)

if test "$enable_proxy" = "shared"; then

  proxy_mods_enable=shared

elif test "$enable_proxy" = "yes"; then

  proxy_mods_enable=yes

else

  proxy_mods_enable=no

fi



proxy_lb_br_objs="mod_lbmethod_byrequests.lo"

proxy_lb_bt_objs="mod_lbmethod_bytraffic.lo"

proxy_lb_bb_objs="mod_lbmethod_bybusyness.lo"

proxy_lb_hb_objs="mod_lbmethod_heartbeat.lo"



APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, $proxy_lb_br_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, $proxy_lb_bt_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, $proxy_lb_bb_objs, , $proxy_mods_enable)

APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, $proxy_lb_hb_objs, , $proxy_mods_enable)



APACHE_MODPATH_FINISH