- check for libbtrfs

diff --git a/client/snapper.cc b/client/snapper.cc
index 407308274d712eff86b352b26f29e18a4d5ecbdd..31fe84b3dd3d445c112bfe4ae6df4a0715664ae8 100644 (file)
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -20,13 +20,14 @@
  */
 
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <iostream>
 #include <boost/algorithm/string.hpp>
 
-#include "config.h"
 #include <snapper/Snapper.h>
 #include <snapper/SnapperTmpl.h>
 #include <snapper/Enum.h>

diff --git a/configure.in b/configure.in
index c4e7d9c615a2d5b8520e5ea5962f269426848ca2..5a82335b70ebfa7fd6eed043ad32fa55d912dc00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -68,6 +68,8 @@ AC_ARG_ENABLE([zypp], AC_HELP_STRING([--disable-zypp],[Disable zypp plugin suppo
                [with_zypp=$enableval],[with_zypp=yes])
 AM_CONDITIONAL(HAVE_ZYPP, [test "$with_zypp" != "no"])
 
+AC_CHECK_LIB(btrfs, btrfs_read_and_process_send_stream)
+
 PKG_CHECK_MODULES(DBUS, dbus-1)
 
 AC_SUBST(VERSION)

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 0da2ad14d5d28ca8d068b43e07eac3e05c40e428..81d3b90fb5be88edc968893f09badec6a0285804 100644 (file)
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -20,6 +20,8 @@
  */
 
 
+#include "config.h"
+
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -28,6 +30,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <asm/types.h>
+#ifdef HAVE_LIBBTRFS
+#include <btrfs/ioctl.h>
+#endif
 #include <boost/algorithm/string.hpp>
 
 #include "snapper/Log.h"
@@ -35,9 +40,10 @@
 #include "snapper/Snapper.h"
 #include "snapper/SnapperTmpl.h"
 #include "snapper/SnapperDefines.h"
-#include "config.h"
 
 
+#ifndef HAVE_LIBBTRFS
+
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_PATH_NAME_MAX 4087
 #define BTRFS_SUBVOL_NAME_MAX 4039
@@ -63,6 +69,8 @@ struct btrfs_ioctl_vol_args_v2
     char name[BTRFS_SUBVOL_NAME_MAX + 1];
 };
 
+#endif
+
 
 namespace snapper
 {

diff --git a/snapper/Btrfs.h b/snapper/Btrfs.h
index 583e8fa74cc7dde309f4277d2d9b5ce6b4721eda..1975b08f116e424b2ac9018adec198cec975037f 100644 (file)
--- a/snapper/Btrfs.h
+++ b/snapper/Btrfs.h
@@ -25,7 +25,6 @@
 
 
 #include "snapper/Filesystem.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Ext4.cc b/snapper/Ext4.cc
index a238b8bceaf468a08efd247464f37666e3cee97b..6ed4262a3c38316ecf3e70af7389759201ae1c3b 100644 (file)
--- a/snapper/Ext4.cc
+++ b/snapper/Ext4.cc
@@ -37,7 +37,6 @@
 #include "snapper/SnapperTmpl.h"
 #include "snapper/SystemCmd.h"
 #include "snapper/SnapperDefines.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Ext4.h b/snapper/Ext4.h
index aa4226b636f5407ae7771b40c0c85160726aff70..579da4a768659aca189e77e6ffffc11ca2f47ee5 100644 (file)
--- a/snapper/Ext4.h
+++ b/snapper/Ext4.h
@@ -25,7 +25,6 @@
 
 
 #include "snapper/Filesystem.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Filesystem.cc b/snapper/Filesystem.cc
index 30da921a13010118db67a38c54577b91786c9fa9..76dfa499b5ed28ba31796a38291dad3cdc9ae279 100644 (file)
--- a/snapper/Filesystem.cc
+++ b/snapper/Filesystem.cc
@@ -20,6 +20,8 @@
  */
 
 
+#include "config.h"
+
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -46,7 +48,6 @@
 #include "snapper/SnapperTmpl.h"
 #include "snapper/SnapperDefines.h"
 #include "snapper/Compare.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Filesystem.h b/snapper/Filesystem.h
index 6ce95f732ed6dd2f99ddb9403ff7145d5a55ca19..4f67193a3e36aab841c2135ee079bd0bc920bd1d 100644 (file)
--- a/snapper/Filesystem.h
+++ b/snapper/Filesystem.h
@@ -29,7 +29,6 @@
 
 #include "snapper/FileUtils.h"
 #include "snapper/Compare.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Logger.cc b/snapper/Logger.cc
index e286e11f090365d4d7a46c92a3c8de414912ead6..17d2c32e66998a3f68327f7993ba119360b69524 100644 (file)
--- a/snapper/Logger.cc
+++ b/snapper/Logger.cc
@@ -27,8 +27,6 @@
 #include <string>
 #include <boost/thread.hpp>
 
-#include "config.h"
-
 #include "snapper/Log.h"
 #include "snapper/AppUtil.h"
 

diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc
index 8d5cfec0efaab6a7ca19f30a106d77703b711152..70e765bbd0375419253d679d941af5fd046fb6c3 100644 (file)
--- a/snapper/Lvm.cc
+++ b/snapper/Lvm.cc
@@ -38,7 +38,6 @@
 #include "snapper/SystemCmd.h"
 #include "snapper/SnapperDefines.h"
 #include "snapper/Regex.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Lvm.h b/snapper/Lvm.h
index 8918335eb306b23a030e6b2bf2adae640f8a020e..a853921bd677de72b8f2ab8cc7cc07e7383a93de 100644 (file)
--- a/snapper/Lvm.h
+++ b/snapper/Lvm.h
@@ -25,7 +25,6 @@
 
 
 #include "snapper/Filesystem.h"
-#include "config.h"
 
 
 namespace snapper

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 0a009f457e961a6ccb13923fa713cdf88abcbb04..1bb47630d1d4015e4435ad348d2407ef63aeb8ad 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -20,6 +20,8 @@
  */
 
 
+#include "config.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <glob.h>
@@ -27,8 +29,6 @@
 #include <mntent.h>
 #include <boost/algorithm/string.hpp>
 
-#include "config.h"
-
 #include "snapper/Snapper.h"
 #include "snapper/Comparison.h"
 #include "snapper/AppUtil.h"