Commit 3dd7c823 authored by Jim Jagielski's avatar Jim Jagielski
Browse files 

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
parent 1034eeb9

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -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

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -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])