diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-24 20:56:17 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-24 20:56:17 +0200 |
| commit | 2cbb6b579123c22d8cf44d083ab4b03c3ebb6856 (patch) | |
| tree | 6894e330a563fc40265360496ac7c12f00f31edc /acinclude.m4 | |
| parent | Bring part some parts of r1142938 which were removed (diff) | |
| download | apache2-2cbb6b579123c22d8cf44d083ab4b03c3ebb6856.tar.xz apache2-2cbb6b579123c22d8cf44d083ab4b03c3ebb6856.zip | |
Don't fail if a module is selected for 'most' or 'all' but the dependencies
are not fulfilled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150464 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4fbca74328..e7b79c37f8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -286,14 +286,20 @@ AC_DEFUN(APACHE_MODULE,[ 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". - if test "$module_selection" = "most" -a "$enable_$1" = "most" || - test "$module_selection" = "reallyall" -a "$enable_$1" != "yes" -a \ - "$enable_$1" != "static" - then - _apmod_error_fatal="no" - else - _apmod_error_fatal="yes" - fi + case "$enable_$1" in + yes|static|shared) + _apmod_error_fatal="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_error_fatal="no" + ;; + *) + _apmod_error_fatal="yes" + ;; + esac + esac if test "$enable_$1" = "static"; then enable_$1=static elif test "$enable_$1" = "yes"; then |