Commit 0fdc729a authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

configure: Do not treat dependency exceptions with --enable-modules 

of only 'few' or 'none' as fatal, but continue the ./configure

Submitted by: trawick
Backports: r1396440 [only the acinclude.m4, config5.m4 change was N/A]
Reviewed by: wrowe, rpluem, ylavic



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

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
Changes with Apache 2.4.23



  *) configure: Fix ./configure edge-case failures around dependencies

     of mod_proxy_hcheck. [William Rowe, Ruediger Pluem]

     of mod_proxy_hcheck. [William Rowe, Ruediger Pluem, Jeff Trawick]



Changes with Apache 2.4.22

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: Do not treat dependency exceptions with --enable-modules

     of only 'few' or 'none' as fatal, but continue the ./configure

     Submitted by: trawick [Add to CHANGES credit]

     trunk patch: http://svn.apache.org/r1396440 [only the acinclude.m4 edit]

     2.4.x: trunk patch to acinclude.m4 works (modules/arch/unix patch is N/A)

     +1: wrowe, rpluem, ylavic



  *) mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck

     trunk patch: http://svn.apache.org/viewvc?rev=1749924&view=rev

     2.4.x: trunk patch works

acinclude.m4

+3 −10
Original line number Diff line number Diff line
@@ -312,22 +312,15 @@ AC_DEFUN([APACHE_MODULE],[ 
  AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))

  undefine([optname])dnl

  _apmod_extra_msg=""

  dnl When --enable-modules=most or --enable-modules=(really)all is set and the

  dnl module was not explicitly requested, allow a module to disable itself if

  dnl If the module was not explicitly requested, allow it to disable itself if

  dnl its pre-reqs fail.

  case "$enable_$1" in

    yes|static|shared)

      _apmod_required="yes"

      ;;

    *)

      case "$module_selection" in

      reallyall|all|most)

      _apmod_required="no"

      ;;

      *)

        _apmod_required="yes"

        ;;

      esac

  esac

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

    enable_$1=static