From: Stefan Fritsch <sf@apache.org>
Date: Mon, 8 Aug 2011 08:50:50 +0000 (+0000)
Subject: Allow to explicitly disable modules even with module selection 'reallyall'
X-Git-Tag: 2.3.15~398
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4c4a453395cf0dd6b42c43f9d766a05f682e9f5;p=apache

Allow to explicitly disable modules even with module selection 'reallyall'


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

diff --git a/CHANGES b/CHANGES
index 7c527fa24b..2a01b833c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.3.15
 
+  *) configure: Allow to explicitly disable modules even with module selection
+     'reallyall'. [Stefan Fritsch]
+
   *) mod_rewrite: Check validity of each internal (int:) RewriteMap even if the
      RewriteEngine is disabled in server context, avoiding a crash while
      referencing the invalid int: map at runtime. PR 50994.
diff --git a/acinclude.m4 b/acinclude.m4
index bd3d4da4a7..2e0907e6a9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -282,13 +282,12 @@ dnl
 AC_DEFUN(APACHE_MODULE,[
   AC_MSG_CHECKING(whether to enable mod_$1)
   define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
-  AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
+  AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))
   undefine([optname])dnl
   _apmod_extra_msg=""
   dnl When --enable-modules=most or --enable-modules=(really)all is set and the
   dnl module was not explicitly requested, allow a module to disable itself if
   dnl its pre-reqs fail.
-  dnl XXX: Todo: Allow to disable specific modules even with "reallyall".
   case "$enable_$1" in
     yes|static|shared)
       _apmod_error_fatal="yes"
@@ -324,7 +323,8 @@ AC_DEFUN(APACHE_MODULE,[
     else
       enable_$1=no
     fi
-  elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall"; then
+  elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall" -a \
+            "$force_$1" != "no" ; then
       enable_$1=$module_default
       _apmod_extra_msg=" ($module_selection)"
   fi