Remove dependency on linux/ext2_fs.h

Due to a missing header in (some versions of) linux/ext2_fs.h,
configure's AC_CHECK_HEADERS test fails for this header, making it
appear "not found", and causing Linux-attr support to be disabled in bup
for no good reason.

Given that all the flags bup needs are available in linux/fs.h, we can
safely remove the requirement for linux/ext2_fs.h altogether, to work
around the problem.

Signed-off-by: Yung-Chin Oei <yungchin@yungchin.nl>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/config/configure b/config/configure
index b96c23c717ad177223732975300de9b5cb600fe6..fce0ddea948048a1f7fe8063476c4e46e1fddc0e 100755 (executable)
--- a/config/configure
+++ b/config/configure
@@ -58,8 +58,6 @@ AC_CHECK_HEADERS unistd.h
 # For FS_IOC_GETFLAGS and FS_IOC_SETFLAGS.
 AC_CHECK_HEADERS linux/fs.h
 AC_CHECK_HEADERS sys/ioctl.h
-# For attr related flags like FS_COMPR_FL.
-AC_CHECK_HEADERS linux/ext2_fs.h
 
 AC_CHECK_FUNCS utimensat 
 AC_CHECK_FUNCS utimes

diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c
index 64b2194483e07fbb9c00fc3107e125a5d8e6d291..ab10fc8485ac98033e27d08dc46f0be00676776f 100644 (file)
--- a/lib/bup/_helpers.c
+++ b/lib/bup/_helpers.c
@@ -27,12 +27,8 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_LINUX_EXT2_FS_H
-#include <linux/ext2_fs.h>
-#endif
 
-#if defined(FS_IOC_GETFLAGS) && defined(FS_IOC_SETFLAGS) \
-    && defined(HAVE_LINUX_EXT2_FS_H)
+#if defined(FS_IOC_GETFLAGS) && defined(FS_IOC_SETFLAGS)
 #define BUP_HAVE_FILE_ATTRS 1
 #endif