diff options
| author | Colin Watson <cjwatson@debian.org> | 2018-12-06 17:57:38 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2018-12-06 17:57:38 +0000 |
| commit | 41e8253097d6cbf972b793e4ab590a536d4376c5 (patch) | |
| tree | 91250d9960b84a7c4d3e2e4cffaa25155045c99c /m4 | |
| parent | bc52248f8756ac210c583539fdb515dc3d6628f6 (diff) | |
Allow disabling installation of systemd components
* m4/man-arg-systemdtmpfilesdir.m4: Define an INSTALL_SYSTEMD_TMPFILES
Automake conditional (true unless --with-systemdtmpfilesdir=no).
* m4/man-arg-systemdsystemunitdir.m4: Define an INSTALL_SYSTEMD_TIMER
Automake conditional (true unless --with-systemdsystemunitdir=no).
* init/systemd/Makefile.am: Honour INSTALL_SYSTEMD_TMPFILES and
INSTALL_SYSTEMD_TIMER.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/man-arg-systemdsystemunitdir.m4 | 5 | ||||
| -rw-r--r-- | m4/man-arg-systemdtmpfilesdir.m4 | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/m4/man-arg-systemdsystemunitdir.m4 b/m4/man-arg-systemdsystemunitdir.m4 index ae449303..3901964f 100644 --- a/m4/man-arg-systemdsystemunitdir.m4 +++ b/m4/man-arg-systemdsystemunitdir.m4 @@ -1,11 +1,11 @@ -# man-arg-systemdsystemunitdir.m4 serial 1 +# man-arg-systemdsystemunitdir.m4 serial 2 dnl MAN_ARG_SYSTEMDSYSTEMUNITDIR dnl Add a --with-systemdsystemunitdir option. AC_DEFUN([MAN_ARG_SYSTEMDSYSTEMUNITDIR], [ AC_ARG_WITH([systemdsystemunitdir], -[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])], +[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. @@ -14,4 +14,5 @@ AC_ARG_WITH([systemdsystemunitdir], [], [with_systemdsystemunitdir=/lib/systemd/system]) m4_popdef([AC_ARG_VAR])]) 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 ff74a261..6254d4b9 100644 --- a/m4/man-arg-systemdtmpfilesdir.m4 +++ b/m4/man-arg-systemdtmpfilesdir.m4 @@ -1,11 +1,11 @@ -# man-arg-systemdtmpfilesdir.m4 serial 2 +# man-arg-systemdtmpfilesdir.m4 serial 3 dnl MAN_ARG_SYSTEMDTMPFILESDIR dnl Add a --with-systemdtmpfilesdir option. AC_DEFUN([MAN_ARG_SYSTEMDTMPFILESDIR], [ AC_ARG_WITH([systemdtmpfilesdir], -[AS_HELP_STRING([--with-systemdtmpfilesdir=DIR], [Directory for systemd tmpfiles configuration])], +[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. @@ -14,4 +14,5 @@ AC_ARG_WITH([systemdtmpfilesdir], [], [with_systemdtmpfilesdir=/usr/lib/tmpfiles.d]) m4_popdef([AC_ARG_VAR])]) AC_SUBST([systemdtmpfilesdir], [$with_systemdtmpfilesdir]) +AM_CONDITIONAL([INSTALL_SYSTEMD_TMPFILES], [test "$with_systemdtmpfilesdir" != "no"]) ]) |