diff options
| author | Colin Watson <cjwatson@debian.org> | 2019-01-29 10:39:38 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2019-01-29 10:39:38 +0000 |
| commit | b74c839eaa5000a18d1c396e995eca85b0e9464b (patch) | |
| tree | 1f4ee0e63b06085c67403e0b4f047bd0c2a4e9e4 /m4 | |
| parent | a4206c27060357cc78219a54349624e0d0675aff (diff) | |
Default to --without-systemd* on non-Linux systems
systemd is unapologetically Linux-specific, so let's not require
non-Linux packages to explicitly turn this off.
* m4/man-arg-systemdsystemunitdir (MAN_ARG_SYSTEMDSYSTEMUNITDIR):
Default to with_systemdsystemunitdir=no on non-Linux systems.
* m4/man-arg-systemdtmpfilesdir (MAN_ARG_SYSTEMDTMPFILESDIR): Default to
with_systemdtmpfilesdir=no on non-Linux systems.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/man-arg-systemdsystemunitdir.m4 | 16 | ||||
| -rw-r--r-- | m4/man-arg-systemdtmpfilesdir.m4 | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/m4/man-arg-systemdsystemunitdir.m4 b/m4/man-arg-systemdsystemunitdir.m4 index 3901964f..33214143 100644 --- a/m4/man-arg-systemdsystemunitdir.m4 +++ b/m4/man-arg-systemdsystemunitdir.m4 @@ -1,18 +1,24 @@ -# man-arg-systemdsystemunitdir.m4 serial 2 +# man-arg-systemdsystemunitdir.m4 serial 3 dnl MAN_ARG_SYSTEMDSYSTEMUNITDIR dnl Add a --with-systemdsystemunitdir option. AC_DEFUN([MAN_ARG_SYSTEMDSYSTEMUNITDIR], [ +AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files (disable with "no")])], [], [dnl # The default is not prefix-sensitive, since systemd's prefix is not # necessarily the same as man-db's. - m4_pushdef([AC_ARG_VAR])dnl No need for precious variable handling. - PKG_CHECK_VAR([with_systemdsystemunitdir], [systemd], [systemdsystemunitdir], - [], [with_systemdsystemunitdir=/lib/systemd/system]) - m4_popdef([AC_ARG_VAR])]) + case $host_os in + linux*) + m4_pushdef([AC_ARG_VAR])dnl No need for precious variable handling. + PKG_CHECK_VAR([with_systemdsystemunitdir], [systemd], [systemdsystemunitdir], + [], [with_systemdsystemunitdir=/lib/systemd/system]) + m4_popdef([AC_ARG_VAR]) + ;; + *) with_systemdsystemunitdir=no ;; + esac]) AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) AM_CONDITIONAL([INSTALL_SYSTEMD_TIMER], [test "$with_systemdsystemunitdir" != "no"]) ]) diff --git a/m4/man-arg-systemdtmpfilesdir.m4 b/m4/man-arg-systemdtmpfilesdir.m4 index 6254d4b9..ae7195f6 100644 --- a/m4/man-arg-systemdtmpfilesdir.m4 +++ b/m4/man-arg-systemdtmpfilesdir.m4 @@ -1,18 +1,24 @@ -# man-arg-systemdtmpfilesdir.m4 serial 3 +# man-arg-systemdtmpfilesdir.m4 serial 4 dnl MAN_ARG_SYSTEMDTMPFILESDIR dnl Add a --with-systemdtmpfilesdir option. AC_DEFUN([MAN_ARG_SYSTEMDTMPFILESDIR], [ +AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_WITH([systemdtmpfilesdir], [AS_HELP_STRING([--with-systemdtmpfilesdir=DIR], [Directory for systemd tmpfiles configuration (disable with "no")])], [], [dnl # The default is not prefix-sensitive, since systemd's prefix is not # necessarily the same as man-db's. - m4_pushdef([AC_ARG_VAR])dnl No need for precious variable handling. - PKG_CHECK_VAR([with_systemdtmpfilesdir], [systemd], [tmpfilesdir], - [], [with_systemdtmpfilesdir=/usr/lib/tmpfiles.d]) - m4_popdef([AC_ARG_VAR])]) + case $host_os in + linux*) + m4_pushdef([AC_ARG_VAR])dnl No need for precious variable handling. + PKG_CHECK_VAR([with_systemdtmpfilesdir], [systemd], [tmpfilesdir], + [], [with_systemdtmpfilesdir=/usr/lib/tmpfiles.d]) + m4_popdef([AC_ARG_VAR]) + ;; + *) with_systemdtmpfilesdir=no ;; + esac]) AC_SUBST([systemdtmpfilesdir], [$with_systemdtmpfilesdir]) AM_CONDITIONAL([INSTALL_SYSTEMD_TMPFILES], [test "$with_systemdtmpfilesdir" != "no"]) ]) |