From: Jim Jagielski <jim@apache.org>
Date: Mon, 8 Dec 2008 14:28:28 +0000 (+0000)
Subject: Force the lbmethod submodules to be loaded AFTER
X-Git-Tag: 2.3.1~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=826cb7f002eb2d607a9fcbcf7d6b689fb6bc0270;p=thirdparty%2Fapache%2Fhttpd.git

Force the lbmethod submodules to be loaded AFTER
mod_proxy.


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

diff --git a/modules/proxy/balancers/config.m4 b/modules/proxy/balancers/config.m4
deleted file mode 100644
index 55c6add5b9f..00000000000
--- a/modules/proxy/balancers/config.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-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
diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index 54b180552c1..1ffd9274b04 100644
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -79,3 +79,25 @@ 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