summaryrefslogtreecommitdiffstats
path: root/modules/arch
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2020-01-14 11:29:19 +0100
committerJoe Orton <jorton@apache.org>2020-01-14 11:29:19 +0100
commit24ce5b58e2860d04e752a25064a653880285cba1 (patch)
treefb6e3d531bedd4a82371fa4f96c1347df013354c /modules/arch
parent* modules/arch/unix/mod_systemd.c: Remove IdleShutdown feature which (diff)
downloadapache2-24ce5b58e2860d04e752a25064a653880285cba1.tar.xz
apache2-24ce5b58e2860d04e752a25064a653880285cba1.zip
* 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
Diffstat (limited to 'modules/arch')
-rw-r--r--modules/arch/unix/config5.m43
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index 62b229748b..9351fca593 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
])