svn commit: r1150464 - /httpd/httpd/trunk/acinclude.m4

[sf...@apache.org]

Author: sf
Date: Sun Jul 24 18:56:17 2011
New Revision: 1150464

URL: http://svn.apache.org/viewvc?rev=1150464&view=rev
Log:
Don't fail if a module is selected for 'most' or 'all' but the dependencies
are not fulfilled

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1150464&r1=1150463&r2=1150464&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Sun Jul 24 18:56:17 2011
@@ -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