From 97abc9b6fd4d0414b173a26657666b54dc6c5b4f Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 5 Aug 2011 08:45:28 +0000 Subject: [PATCH] Simplify dependency checking code for mod_proxy_fdpass. This also fixes mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall. Document bug/limitiation in APACHE_MODULE macro. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154126 13f79535-47bb-0310-9956-ffa450edef68 --- acinclude.m4 | 3 +++ modules/proxy/config.m4 | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9519ee1408..214763964f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -270,6 +270,9 @@ dnl no -- disabled under default, most, all. user must explicitly enable. dnl most -- disabled by default. enabled explicitly or with most or all. dnl static -- enabled as static by default, must be explicitly changed. dnl "" -- disabled under default, most. enabled explicitly or with all. +dnl XXX: The arg must really be empty here. Passing an empty shell +dnl XXX: variable doesn't work for some reason. This should be +dnl XXX: fixed. dnl dnl basically: yes/no is a hard setting. "most" means follow the "most" dnl setting. otherwise, fall under the "all" setting. diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4 index 0bb5bb391e..178fa64f67 100644 --- a/modules/proxy/config.m4 +++ b/modules/proxy/config.m4 @@ -10,15 +10,6 @@ else proxy_mods_enable=most fi -AC_CHECK_DECL(CMSG_DATA, [ - proxy_mods_fdpass_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) @@ -51,7 +42,11 @@ APACHE_MODULE(proxy_ftp, Apache proxy FTP module. Requires and is enabled by -- 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, [ +APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module. Requires --enable-proxy., $proxy_fdpass_objs, , , [ + AC_CHECK_DECL(CMSG_DATA, [ ], [ ], [ + #include + #include + ]) if test $ac_cv_have_decl_CMSG_DATA = "no"; then AC_MSG_WARN([Your system does not support CMSG_DATA.]) enable_proxy_fdpass=no -- 2.49.0