From: TBK <858296+TBK@users.noreply.github.com> Date: Fri, 27 Nov 2020 11:02:03 +0000 (+0100) Subject: Add flag to disable install of systemd files (#523) X-Git-Tag: v0.8.15~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9907cec98b242a83737efef0177a6e14137fa28a;p=thirdparty%2Fsnapper.git Add flag to disable install of systemd files (#523) * Add flag to disable install of systemd files * Update Makefile.am Co-authored-by: Arvin Schnell --- diff --git a/configure.ac b/configure.ac index ae70e0ce..f2345da7 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,6 @@ SYSCONFIG=/etc/sysconfig AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]), [with_conf=$withval], [with_conf=no]) - AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" @@ -90,7 +89,6 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), [with_btrfs=$enableval],[with_btrfs=yes]) - AM_CONDITIONAL(ENABLE_BTRFS, [test "x$with_btrfs" = "xyes"]) if test "x$with_btrfs" = "xyes"; then @@ -99,7 +97,6 @@ fi AC_ARG_ENABLE([ext4], AC_HELP_STRING([--disable-ext4],[Disable ext4 snapshots support]), [with_ext4=$enableval],[with_ext4=yes]) - AM_CONDITIONAL(ENABLE_EXT4, [test "x$with_ext4" = "xyes"]) if test "x$with_ext4" = "xyes"; then @@ -108,7 +105,6 @@ fi AC_ARG_ENABLE([lvm], AC_HELP_STRING([--disable-lvm],[Disable LVM thinprovisioned snapshots support]), [with_lvm=$enableval],[with_lvm=yes]) - AM_CONDITIONAL(ENABLE_LVM, [test "x$with_lvm" = "xyes"]) if test "x$with_lvm" = "xyes"; then @@ -123,6 +119,10 @@ AC_ARG_ENABLE([zypp], AC_HELP_STRING([--disable-zypp],[Disable zypp plugin suppo [with_zypp=$enableval],[with_zypp=yes]) AM_CONDITIONAL(HAVE_ZYPP, [test "x$with_zypp" = "xyes"]) +AC_ARG_ENABLE([systemd], AC_HELP_STRING([--disable-systemd],[Disable systemd support]), + [enable_systemd=$enableval],[enable_systemd=yes]) +AM_CONDITIONAL(ENABLE_SYSTEMD, [test "x$enable_systemd" = "xyes"]) + AC_CHECK_LIB(btrfs, btrfs_read_and_process_send_stream) AC_CHECK_HEADERS([btrfs/version.h]) diff --git a/data/Makefile.am b/data/Makefile.am index 81f8b487..b9a761cf 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,6 +21,7 @@ install-data-local: install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service +if ENABLE_SYSTEMD install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service install -D -m 644 timeline.timer $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.timer install -D -m 644 cleanup.service $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.service @@ -28,6 +29,7 @@ install-data-local: install -D -m 644 boot.service $(DESTDIR)/usr/lib/systemd/system/snapper-boot.service install -D -m 644 boot.timer $(DESTDIR)/usr/lib/systemd/system/snapper-boot.timer install -D -m 644 snapperd.service $(DESTDIR)/usr/lib/systemd/system/snapperd.service +endif if HAVE_ZYPP install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf