Commit 129cde77 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Revert r1749920, meant to apply this to trunk/ 

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

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,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=shared

                              AC_MSG_WARN("building mod_$1 shared because mod_[]prereq is built shared")

                              enable_$1=no

                              AC_MSG_WARN("cannot build mod_$1 statically if mod_[]prereq is built shared")

                            el])se])

            ifelse([$6],,:,[  $6])

            ifelse([$7],,:,[fi])

modules/core/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ fi 


APACHE_MODULE(so, DSO capability.  This module will be automatically enabled unless you build all modules statically., , , $enable_so)



APACHE_MODULE(watchdog, Watchdog module, , , , [

APACHE_MODULE(watchdog, Watchdog module, , , most, [

    APR_CHECK_APR_DEFINE(APR_HAS_THREADS)

    if test $ac_cv_define_APR_HAS_THREADS = "no"; then

        AC_MSG_WARN([mod_watchdog requires apr to be built with --enable-threads])