From 4409fcddf49f8919453b944dc5b28ca1e7024fba Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sun, 31 May 2009 04:13:11 +0000 Subject: [PATCH] Restructure fdpass logic to not spew stderr crap for without purpose, and purposefully fail if --enable-proxy-fdpass is demanded without support. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@780364 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/config.m4 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4 index bf2880dfdc..7a229b9066 100644 --- a/modules/proxy/config.m4 +++ b/modules/proxy/config.m4 @@ -10,6 +10,15 @@ else proxy_mods_enable=no fi +AC_CHECK_DECLS(CMSG_DATA, [ + proxy_mods_fdpass_enable="$proxy_mods_enable" +], [ + proxy_mods_fdpass_enable="no" +], [ + #include + #include +]) + proxy_objs="mod_proxy.lo proxy_util.lo" APACHE_MODULE(proxy, Apache proxy module, $proxy_objs, , $proxy_mods_enable) @@ -27,12 +36,9 @@ APACHE_MODULE(proxy_ftp, Apache proxy FTP module, $proxy_ftp_objs, , $proxy_mods 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_scgi, Apache proxy SCGI module, $proxy_scgi_objs, , $proxy_mods_enable) -APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module, $proxy_fdpass_objs, , $proxy_mods_enable, [ - AC_CHECK_DECLS(CMSG_DATA, [ap_HAVE_DECL_CMSG_DATA="yes"], [ap_HAVE_DECL_CMSG_DATA="no"], [[#include ]]) - if test $ap_HAVE_DECL_CMSG_DATA = "no"; then - AC_MSG_WARN([Your system does not support CMSG_DATA.]) - enable_proxy_fdpass="no" - _apmod_error_fatal="no" +APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module, $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, $proxy_ajp_objs, , $proxy_mods_enable) -- 2.50.1