From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 16 Jan 2013 14:27:02 +0000 (+0100)
Subject: - check for libbtrfs
X-Git-Tag: v0.1.3~57
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=115d243bf23ba5c755ab736e38c2ba19c7feef33;p=thirdparty%2Fsnapper.git

- check for libbtrfs
---

diff --git a/client/snapper.cc b/client/snapper.cc
index 40730827..31fe84b3 100644
--- 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 c4e7d9c6..5a82335b 100644
--- 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 0da2ad14..81d3b90f 100644
--- 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 583e8fa7..1975b08f 100644
--- 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 a238b8bc..6ed4262a 100644
--- 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 aa4226b6..579da4a7 100644
--- 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 30da921a..76dfa499 100644
--- 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 6ce95f73..4f67193a 100644
--- 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 e286e11f..17d2c32e 100644
--- 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 8d5cfec0..70e765bb 100644
--- 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 8918335e..a853921b 100644
--- 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 0a009f45..1bb47630 100644
--- 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"