diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-06-27 19:47:52 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-06-27 19:47:52 +0000 |
| commit | 86a096011a7f4571cc1ac06569889bf7f87cf3fe (patch) | |
| tree | 5e34569455dae187692244b27a98639f4abd3c3c | |
| parent | d4aa6476b205febaf2f335baf4877790dc2dad4e (diff) | |
| download | httpd-86a096011a7f4571cc1ac06569889bf7f87cf3fe.tar.gz | |
Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750407 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e392494ba8..8a18f0fdfe 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -350,20 +350,29 @@ AC_DEFUN([APACHE_MODULE],[ _apmod_required="no" ;; esac - if test "$enable_$1" = "static"; then - enable_$1=static + if test "$enable_$1" = "static" -o "$enable_$1" = "shared"; then + ; elif test "$enable_$1" = "yes"; then enable_$1=$module_default + elif test "$enable_$1" = "few"; then + if test "$module_selection" = "few" -o "$module_selection" = "most" -o \ + "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_$1=$module_default + else + enable_$1=no + fi + _apmod_extra_msg=" ($module_selection)" elif test "$enable_$1" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then enable_$1=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + else enable_$1=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_$1" = "maybe-all"; then + elif test "$enable_$1" = "all" -o "$enable_$1" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then enable_$1=$module_default @@ -371,12 +380,15 @@ AC_DEFUN([APACHE_MODULE],[ else enable_$1=no fi - elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_$1" != "no" ; then + elif test "$enable_$1" = "reallyall" -o "$enable_$1" = "no" ; then + if test "$module_selection" = "reallyall" -a "$force_$1" != "no" ; then enable_$1=$module_default _apmod_extra_msg=" ($module_selection)" + else + enable_$1=no + fi else - enable_$1=no + enable_$1=no fi if test "$enable_$1" != "no"; then dnl If we plan to enable it, allow the module to run some autoconf magic |