From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 5 Jan 2017 12:50:24 +0000 (+0000)
Subject: proxy: don't force global module selection (most) and scope (shared/static),
X-Git-Tag: 2.5.0-alpha~814
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07ad86dc7030053fada9ee09897bd56bd84bf4f0;p=thirdparty%2Fapache%2Fhttpd.git

proxy: don't force global module selection (most) and scope (shared/static),
since it breaks --enable-modules=none + exhaustive --enable-foo(s).

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

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index 26cfb24a61b..8b2f1b8cdd4 100644
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -5,20 +5,6 @@ APACHE_MODPATH_INIT(proxy)
 proxy_objs="mod_proxy.lo proxy_util.lo"
 APACHE_MODULE(proxy, Apache proxy module, $proxy_objs, , most)
 
-dnl set aside module selections and default, and set the module default to the
-dnl same scope (shared|static) as selected for mod proxy, along with setting
-dnl the default selection to "most" for remaining proxy modules, mirroring the
-dnl behavior of 2.4.1 and later, but failing ./configure only if an explicitly
-dnl enabled module is missing its prereqs
-save_module_selection=$module_selection
-save_module_default=$module_default
-if test "x$enable_proxy" != "xno"; then
-    module_selection=most
-    if test "$enable_proxy" = "shared" -o "$enable_proxy" = "static"; then
-        module_default=$enable_proxy
-    fi
-fi
-
 proxy_connect_objs="mod_proxy_connect.lo"
 proxy_ftp_objs="mod_proxy_ftp.lo"
 proxy_http_objs="mod_proxy_http.lo"
@@ -78,8 +64,5 @@ APACHE_MODULE(proxy_hcheck, [reverse-proxy health-check module. Requires --enabl
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 
-module_selection=$save_module_selection
-module_default=$save_module_default
-
 APACHE_MODPATH_FINISH