From: Joe Orton <jorton@apache.org>
Date: Tue, 14 Jan 2020 10:29:19 +0000 (+0000)
Subject: * modules/arch/unix/config5.m4: Don't override enable_systemd, fixing
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1706
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24ce5b58e2860d04e752a25064a653880285cba1;p=thirdparty%2Fapache%2Fhttpd.git

* modules/arch/unix/config5.m4: Don't override enable_systemd, fixing
  --enable-systemd=static per covener's suggestion in
  <CALK=YjPrN644NtLROwYPyBeCpev-GHSAD2J-Z2hupLymZ0op-g@mail.gmail.com>
  Also fix the APACHE_MODULE() usage; disable the module by default
  for the "all" modules selection.

PR: 57632


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

diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index 62b229748be..9351fca593b 100644
--- a/modules/arch/unix/config5.m4
+++ b/modules/arch/unix/config5.m4
@@ -20,13 +20,12 @@ APACHE_MODULE(privileges, Per-virtualhost Unix UserIDs and enhanced security for
   fi
 ])
 
-APACHE_MODULE(systemd, Systemd support, , , all, [
+APACHE_MODULE(systemd, Systemd support, , , no, [
   if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
     AC_MSG_WARN([Your system does not support systemd.])
     enable_systemd="no"
   else
     APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
-    enable_systemd="yes"
   fi
 ])