httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1749658 - /httpd/httpd/trunk/acinclude.m4
Date Wed, 22 Jun 2016 12:22:45 GMT
Author: wrowe
Date: Wed Jun 22 12:22:44 2016
New Revision: 1749658

URL: http://svn.apache.org/viewvc?rev=1749658&view=rev
Log:
Support multiple module dependencies for the final prereq argument to the
APACHE_MODULE macro, as a comma separated list, e.g.

APACHE_MODULE(proxy_http2, [...], [proxy,http2])

will evaluate the availability of mod_proxy, followed by mod_http2

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1749658&r1=1749657&r2=1749658&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Wed Jun 22 12:22:44 2016
@@ -381,13 +381,14 @@ AC_DEFUN([APACHE_MODULE],[
     dnl that may disable it because of missing dependencies.
     ifelse([$6$7],,:,
            [AC_MSG_RESULT([checking dependencies])
-            ifelse([$7],,:,[if test "$enable_$7" = "no" ; then
+            ifelse([$7],,:,[m4_foreach([prereq],[$7],
+                           [if test "$enable_[]prereq" = "no" ; then
                               enable_$1=no
-                              AC_MSG_WARN("mod_$7 is disabled but required for mod_$1")
-                            elif test "$enable_$1" = "static" && test "$enable_$7"
!= "static" ; then
+                              AC_MSG_WARN("mod_[]prereq is disabled but required for mod_$1")
+                            elif test "$enable_$1" = "static" && test "$enable_[]prereq"
!= "static" ; then
                               enable_$1=no
-                              AC_MSG_WARN("cannot build mod_$1 statically if mod_$7 is built
shared")
-                            else])
+                              AC_MSG_WARN("cannot build mod_$1 statically if mod_[]prereq
is built shared")
+                            el])se])
             ifelse([$6],,:,[  $6])
             ifelse([$7],,:,[fi])
             AC_MSG_CHECKING(whether to enable mod_$1)



Mime
View raw message