diff options
| author | Jim Jagielski <jim@apache.org> | 2016-06-29 17:29:43 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2016-06-29 17:29:43 +0000 |
| commit | e430837f5dda29ed19d1f01250822bad51f6aea0 (patch) | |
| tree | 777415059d211a1ae46d3c9fd3735b9898c336f6 | |
| parent | 53d722de0d6352b88232b03be7822291b9f4b426 (diff) | |
| download | httpd-e430837f5dda29ed19d1f01250822bad51f6aea0.tar.gz | |
Merge r1749925 from trunk:
Promote any static module to yes|shared if a required dependency is not static
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750683 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 4 |
2 files changed, 2 insertions, 9 deletions
@@ -116,13 +116,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) configure: Promote any static module to yes|shared if a required - dependency is not static - [Note, this isn't critical for 2.4.23, but is nice-to-have - to assist users who mis-combine flags in an unusual way.] - trunk patch: http://svn.apache.org/r1749925 - 2.4.x: trunk patch works - +1: wrowe, rpluem, jim *) lbmethod(s): Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer diff --git a/acinclude.m4 b/acinclude.m4 index 866264fcc3..6d8dcb019b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -372,8 +372,8 @@ AC_DEFUN([APACHE_MODULE],[ enable_$1=no 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_[]prereq is built shared") + enable_$1=$enable_[]prereq + AC_MSG_WARN("building mod_$1 shared because mod_[]prereq is built shared") el])se]) ifelse([$6],,:,[ $6]) ifelse([$7],,:,[fi]) |