From: Yung-Chin Oei Date: Wed, 24 Oct 2012 02:26:35 +0000 (+0100) Subject: Remove dependency on linux/ext2_fs.h X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ea8cd0ca0c102a8aa476edcf1e11f2a509aed863;p=packages%2Fb%2Fbup.git 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 Reviewed-by: Rob Browning --- diff --git a/config/configure b/config/configure index b96c23c..fce0dde 100755 --- 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 64b2194..ab10fc8 100644 --- a/lib/bup/_helpers.c +++ b/lib/bup/_helpers.c @@ -27,12 +27,8 @@ #ifdef HAVE_SYS_IOCTL_H #include #endif -#ifdef HAVE_LINUX_EXT2_FS_H -#include -#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