Follow on to r1393976 and r1396424:

mod_systemd: Specify "all" instead of "yes" (on Unix) so that APACHE_MODULE doesn't
             act as if the user requested it.

General: Fix APACHE_MODULE so that failed prereqs will disable a module unless the
         user requested it explicitly.

Result: By default systemd will be enabled where it actually works and disabled otherwise,
        but if the user requests it and the prereqs fail then configure will halt.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1396440 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 86d2e08c51712d0779e44926bfd0af5874aa3952..91f54f16ff3a39578ac3dd44f19307968df67d88 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -335,22 +335,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
+      _apmod_required="no"
+      ;;
   esac
   if test "$enable_$1" = "static"; then
     enable_$1=static

diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index 46f3facf79fdbfaefdf264fbdf76521e662298c0..18d6ecb09a5b50a31772628a749337ca73ff3a77 100644 (file)
--- a/modules/arch/unix/config5.m4
+++ b/modules/arch/unix/config5.m4
@@ -19,7 +19,7 @@ APACHE_MODULE(privileges, Per-virtualhost Unix UserIDs and enhanced security for
   fi
 ])
 
-APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enable, [
+APACHE_MODULE(systemd, Systemd support, , , all, [
   AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
   AC_CHECK_HEADERS(systemd/sd-daemon.h, [ap_HAVE_SD_DAEMON_H="yes"], [ap_HAVE_SD_DAEMON_H="no"])
   if test $ap_HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then