replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.

[apache] / modules / proxy / config.m4

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index 54b180552c1651f28979b7dc9b2a2f59dae976af..b0606a500f66978525389d7007dbadc611971c2f 100644 (file)
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -10,6 +10,15 @@ else
   proxy_mods_enable=no
 fi
 
+AC_CHECK_DECL(CMSG_DATA, [
+  proxy_mods_fdpass_enable="$proxy_mods_enable"
+], [
+  proxy_mods_fdpass_enable="no"
+], [
+  #include <sys/types.h>
+  #include <sys/socket.h>
+])
+
 proxy_objs="mod_proxy.lo proxy_util.lo"
 APACHE_MODULE(proxy, Apache proxy module, $proxy_objs, , $proxy_mods_enable)
 
@@ -17,6 +26,8 @@ proxy_connect_objs="mod_proxy_connect.lo"
 proxy_ftp_objs="mod_proxy_ftp.lo"
 proxy_http_objs="mod_proxy_http.lo"
 proxy_fcgi_objs="mod_proxy_fcgi.lo"
+proxy_scgi_objs="mod_proxy_scgi.lo"
+proxy_fdpass_objs="mod_proxy_fdpass.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"
 
@@ -28,54 +39,36 @@ case "$host" in
     proxy_ftp_objs="$proxy_ftp_objs mod_proxy.la"
     proxy_http_objs="$proxy_http_objs mod_proxy.la"
     proxy_fcgi_objs="$proxy_fcgi_objs mod_proxy.la"
+    proxy_scgi_objs="$proxy_scgi_objs mod_proxy.la"
+    proxy_fdpass_objs="$proxy_fdpass_objs mod_proxy.la"
     proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la"
     proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la"
     ;;
 esac
 
-APACHE_MODULE(proxy_connect, Apache proxy CONNECT module, $proxy_connect_objs, , $proxy_mods_enable)
-APACHE_MODULE(proxy_ftp, Apache proxy FTP module, $proxy_ftp_objs, , $proxy_mods_enable)
-APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , $proxy_mods_enable)
-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(proxy_connect, Apache proxy CONNECT module.  Requires and is enabled by --enable-proxy., $proxy_connect_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_ftp, Apache proxy FTP module.  Requires and is enabled by --enable-proxy., $proxy_ftp_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_http, Apache proxy HTTP module.  Requires and is enabled by --enable-proxy., $proxy_http_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_fcgi, Apache proxy FastCGI module.  Requires and is enabled by --enable-proxy., $proxy_fcgi_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_scgi, Apache proxy SCGI module.  Requires and is enabled by --enable-proxy., $proxy_scgi_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module.  Requires --enable-proxy., $proxy_fdpass_objs, , $proxy_mods_fdpass_enable, [
+  if test $ac_cv_have_decl_CMSG_DATA = "no"; then
+    AC_MSG_ERROR([Your system does not support CMSG_DATA.])
+  fi
+])
+APACHE_MODULE(proxy_ajp, Apache proxy AJP module.  Requires and is enabled by --enable-proxy., $proxy_ajp_objs, , $proxy_mods_enable)
+APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module.  Requires and is enabled by --enable-proxy., $proxy_balancer_objs, , $proxy_mods_enable)
 
-AC_DEFUN([CHECK_SERF], [
-  AC_MSG_CHECKING(for serf)
-  serf_found="no"
-  AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PREFIX],
-                                  [Serf client library]),
-  [
-    if test "$withval" = "yes" ; then
-      AC_MSG_ERROR([--with-serf requires an argument.])
+APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
+    APACHE_CHECK_SERF
+    if test "$ac_cv_serf" = "yes" ; then
+      APR_SETVAR(MOD_SERF_LDADD, [\$(SERF_LIBS)])
     else
-      AC_MSG_NOTICE([serf library configuration])
-      serf_prefix=$withval
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-0"
-      AC_CHECK_HEADERS(serf.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
-        AC_CHECK_LIB(serf-0, serf_context_create,[serf_found="yes"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
+      enable_serf=no
     fi
-  ])
-  
-  if test "$serf_found" = "yes"; then
-    APR_ADDTO(LDFLAGS, ["-L$serf_prefix/lib"])
-    APR_ADDTO(LIBS, ["-lserf-0"])
-    APR_ADDTO(INCLUDES, ["-I$serf_prefix/include/serf-0"])
-  else
-    AC_MSG_ERROR(unable to find serf)
-  fi
 ])
 
-serf_objects="mod_serf.lo"
-APACHE_MODULE(serf, [Reverse proxy module using Serf], $serf_objects, , no, [
-    CHECK_SERF
-])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators])
 APACHE_MODPATH_FINISH
+