You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2017/01/05 12:50:24 UTC
svn commit: r1777464 - /httpd/httpd/trunk/modules/proxy/config.m4
Author: ylavic
Date: Thu Jan 5 12:50:24 2017
New Revision: 1777464
URL: http://svn.apache.org/viewvc?rev=1777464&view=rev
Log:
proxy: don't force global module selection (most) and scope (shared/static),
since it breaks --enable-modules=none + exhaustive --enable-foo(s).
Modified:
httpd/httpd/trunk/modules/proxy/config.m4
Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=1777464&r1=1777463&r2=1777464&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Thu Jan 5 12:50:24 2017
@@ -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-pro
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
-module_selection=$save_module_selection
-module_default=$save_module_default
-
APACHE_MODPATH_FINISH