diff options
| author | Jeff Trawick <trawick@apache.org> | 2012-10-10 03:04:36 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2012-10-10 03:04:36 +0200 |
| commit | 864d3d0d878deea713ae3ff3a134b5affe6ab9b0 (patch) | |
| tree | e3f04ae5b60f0db2a8581180f1b19ab378904222 /modules/arch | |
| parent | Follow up r1393976: Fix typo in enablement of mod_systemd that caused it to b... (diff) | |
| download | apache2-864d3d0d878deea713ae3ff3a134b5affe6ab9b0.tar.xz apache2-864d3d0d878deea713ae3ff3a134b5affe6ab9b0.zip | |
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
Diffstat (limited to 'modules/arch')
| -rw-r--r-- | modules/arch/unix/config5.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4 index 46f3facf79..18d6ecb09a 100644 --- 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 |