From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 14 Oct 2015 11:54:06 +0000 (+0200)
Subject: - added conditional compilation of installation-helper (gh#openSUSE/snapper#202)
X-Git-Tag: v0.3.3~49^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=refs%2Fpull%2F205%2Fhead;p=thirdparty%2Fsnapper.git

- added conditional compilation of installation-helper (gh#openSUSE/snapper#202)
---

diff --git a/client/Makefile.am b/client/Makefile.am
index 8652a015..c026e8b4 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -18,20 +18,23 @@ snapper_SOURCES =			\
 
 snapper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
 
-if ENABLE_ROLLBACK
+libexecdir = /usr/lib/snapper
 
-sbin_PROGRAMS = mksubvolume
+libexec_PROGRAMS = systemd-helper
 
-mksubvolume_SOURCES =			\
-	mksubvolume.cc
-
-mksubvolume_LDADD = ../snapper/libsnapper.la utils/libutils.la
+systemd_helper_SOURCES =		\
+	systemd-helper.cc		\
+	types.cc	types.h		\
+	commands.cc	commands.h	\
+	cleanup.cc	cleanup.h	\
+	misc.cc		misc.h		\
+	errors.cc	errors.h
 
-endif
+systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
 
-libexecdir = /usr/lib/snapper
+if ENABLE_BTRFS
 
-libexec_PROGRAMS = installation-helper systemd-helper
+libexec_PROGRAMS += installation-helper
 
 installation_helper_SOURCES =		\
 	installation-helper.cc		\
@@ -39,13 +42,16 @@ installation_helper_SOURCES =		\
 
 installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la
 
-systemd_helper_SOURCES =		\
-	systemd-helper.cc		\
-	types.cc	types.h		\
-	commands.cc	commands.h	\
-	cleanup.cc	cleanup.h	\
-	misc.cc		misc.h		\
-	errors.cc	errors.h
+if ENABLE_ROLLBACK
 
-systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
+sbin_PROGRAMS = mksubvolume
+
+mksubvolume_SOURCES =			\
+	mksubvolume.cc
+
+mksubvolume_LDADD = ../snapper/libsnapper.la utils/libutils.la
+
+endif
+
+endif
 
diff --git a/package/snapper.changes b/package/snapper.changes
index bfa8509f..16bae799 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 14 13:52:10 CEST 2015 - aschnell@suse.com
+
+- added conditional compilation of installation-helper
+  (gh#openSUSE/snapper#202)
+
 -------------------------------------------------------------------
 Tue Sep 22 16:51:23 CEST 2015 - aschnell@suse.com