Commit 185a689f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1750335, r1750407, r1750420 from trunk: 

Ensure not-selected means 'no', once an APACHE_MODULE enable_foo is processed

Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'




This is not C code... no semi, a colon is a noop
Submitted by: wrowe
Reviewed/backported by: jim


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

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -117,15 +117,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall',

     ensure all unrecognized --enable-foo=values mean *no*.

     Backport: r1750335, r1750407, r1750420

     Trunk patch: http://svn.apache.org/r1750335

                  http://svn.apache.org/r1750407

                  http://svn.apache.org/r1750420

     2.4.x patch: Trunk applies

     +1: wrowe, rpluem, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

acinclude.m4

+20 −6
Original line number Diff line number Diff line
@@ -322,20 +322,29 @@ AC_DEFUN([APACHE_MODULE],[ 
      _apmod_required="no"

      ;;

  esac

  if test "$enable_$1" = "static"; then

    enable_$1=static

  if test "$enable_$1" = "static" -o "$enable_$1" = "shared"; then

    :

  elif test "$enable_$1" = "yes"; then

    enable_$1=$module_default

  elif test "$enable_$1" = "few"; then

    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \

            "$module_selection" = "all" -o "$module_selection" = "reallyall"

    then

      enable_$1=$module_default

    else

      enable_$1=no

    fi

    _apmod_extra_msg=" ($module_selection)"

  elif test "$enable_$1" = "most"; then

    if test "$module_selection" = "most" -o "$module_selection" = "all" -o \

            "$module_selection" = "reallyall"

    then

      enable_$1=$module_default

    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then

    else

      enable_$1=no

    fi

    _apmod_extra_msg=" ($module_selection)"

  elif test "$enable_$1" = "maybe-all"; then

  elif test "$enable_$1" = "all" -o "$enable_$1" = "maybe-all"; then

    if test "$module_selection" = "all" -o "$module_selection" = "reallyall"

    then

      enable_$1=$module_default
@@ -343,10 +352,15 @@ AC_DEFUN([APACHE_MODULE],[ 
    else

      enable_$1=no

    fi

  elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall" -a \

            "$force_$1" != "no" ; then

  elif test "$enable_$1" = "reallyall" -o "$enable_$1" = "no" ; then

    if test "$module_selection" = "reallyall" -a "$force_$1" != "no" ; then

      enable_$1=$module_default

      _apmod_extra_msg=" ($module_selection)"

    else

      enable_$1=no

    fi

  else

    enable_$1=no

  fi

  if test "$enable_$1" != "no"; then

    dnl If we plan to enable it, allow the module to run some autoconf magic