From: Jim Jagielski <jim@apache.org>
Date: Wed, 22 Jun 2016 19:57:52 +0000 (+0000)
Subject: Merge r1749658 from trunk:
X-Git-Tag: 2.4.23~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07386256b9db4270b82ff8900a0137d9e3bd74b6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1749658 from trunk:

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

Submitted by: wrowe
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749773 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 7964b0f8193..e585dbbc5ef 100644
--- a/STATUS
+++ b/STATUS
@@ -116,13 +116,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) acinclude.m4: Support multiple module dependencies for the final prereq
-     argument to the APACHE_MODULE macro, as a comma separated list
-     trunk patch: http://svn.apache.org/r1749658
-     2.4.x: trunk patch works
-            http://apaste.info/iyv
-     +1: wrowe, jim, rpluem
-
   *) configure: Simplify, and correct dependency handling of mod_proxy_hcheck
      trunk patch: http://svn.apache.org/r1749659
                   http://svn.apache.org/r1749678
diff --git a/acinclude.m4 b/acinclude.m4
index e1537585a7d..e26de5f1ee0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -360,13 +360,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)