httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r722920 - in /httpd/httpd/trunk/modules/proxy: Makefile.in balancers/Makefile.in balancers/config.m4 config.m4 mod_lbmethod_heartbeat.c
Date Wed, 03 Dec 2008 15:04:18 GMT
Author: jim
Date: Wed Dec  3 07:04:17 2008
New Revision: 722920

URL: http://svn.apache.org/viewvc?rev=722920&view=rev
Log:
And allow for the submod to be built

Added:
    httpd/httpd/trunk/modules/proxy/balancers/Makefile.in   (with props)
    httpd/httpd/trunk/modules/proxy/balancers/config.m4   (with props)
Removed:
    httpd/httpd/trunk/modules/proxy/mod_lbmethod_heartbeat.c
Modified:
    httpd/httpd/trunk/modules/proxy/Makefile.in
    httpd/httpd/trunk/modules/proxy/config.m4

Modified: httpd/httpd/trunk/modules/proxy/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/Makefile.in?rev=722920&r1=722919&r2=722920&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/Makefile.in (original)
+++ httpd/httpd/trunk/modules/proxy/Makefile.in Wed Dec  3 07:04:17 2008
@@ -1,3 +1,4 @@
 # a modules Makefile has no explicit targets -- they will be defined by
 # whatever modules are enabled. just grab special.mk to deal with this.
+#SUBDIRS = balancers
 include $(top_srcdir)/build/special.mk

Added: httpd/httpd/trunk/modules/proxy/balancers/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/Makefile.in?rev=722920&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/Makefile.in (added)
+++ httpd/httpd/trunk/modules/proxy/balancers/Makefile.in Wed Dec  3 07:04:17 2008
@@ -0,0 +1,3 @@
+# a modules Makefile has no explicit targets -- they will be defined by
+# whatever modules are enabled. just grab special.mk to deal with this.
+include $(top_srcdir)/build/special.mk

Propchange: httpd/httpd/trunk/modules/proxy/balancers/Makefile.in
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/proxy/balancers/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/config.m4?rev=722920&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/config.m4 (added)
+++ httpd/httpd/trunk/modules/proxy/balancers/config.m4 Wed Dec  3 07:04:17 2008
@@ -0,0 +1,13 @@
+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_hb_objs="mod_lbmethod_heartbeat.lo"
+APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, $proxy_lb_hb_objs,
, $proxy_mods_enable)
+
+APACHE_MODPATH_FINISH

Propchange: httpd/httpd/trunk/modules/proxy/balancers/config.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=722920&r1=722919&r2=722920&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Wed Dec  3 07:04:17 2008
@@ -19,7 +19,6 @@
 proxy_fcgi_objs="mod_proxy_fcgi.lo"
 proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo"
 proxy_balancer_objs="mod_proxy_balancer.lo"
-proxy_lb_hb_objs="mod_lbmethod_heartbeat.lo"
 
 case "$host" in
   *os2*)
@@ -31,7 +30,6 @@
     proxy_fcgi_objs="$proxy_fcgi_objs mod_proxy.la"
     proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la"
     proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la"
-    proxy_lb_hb_objs="$proxy_lb_hb_objs mod_proxy.la"
     ;;
 esac
 
@@ -41,7 +39,6 @@
 APACHE_MODULE(proxy_fcgi, Apache proxy FastCGI module, $proxy_fcgi_objs, , $proxy_mods_enable)
 APACHE_MODULE(proxy_ajp, Apache proxy AJP module, $proxy_ajp_objs, , $proxy_mods_enable)
 APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module, $proxy_balancer_objs, , $proxy_mods_enable)
-APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, $proxy_lb_hb_objs,
, $proxy_mods_enable)
 
 
 AC_DEFUN([CHECK_SERF], [
@@ -81,5 +78,4 @@
 ])
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators])
-
 APACHE_MODPATH_FINISH



Mime
View raw message