Remove xattr configuration option

diff --git a/NEWS b/NEWS
index 4fef76cd30c707b376ac37e96a051ec89a124e59..6e6704c178ad1e7b074b345c0c9bf85bad973eb0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,10 @@ Version 1.7.0-BETA:
 
        On Windows, sparse file attributes are no longer set on extracted files.
 
+       On UNIX, configuring with --disable-xattr or --enable-xattr is no longer
+       supported.  Mounting WIM images now always requires extended attribute
+       support.  Use --without-fuse to disable support for mounting WIM images.
+
        The shared library version has been bumped up.  The main
        incompatibilities are:
 

diff --git a/README b/README
index 3a0ef00b5ab202b16871b91ff77d2567450e2504..a242e7f6f0ec8285a1e02d420ba1ee28dd2f650f 100644 (file)
--- a/README
+++ b/README
@@ -280,12 +280,6 @@ This section documents the most important options that may be passed to the
        from libcrypto (part of OpenSSL).  The default is to use libcrypto if it
        is found on the system.
 
---enable-xattr, --disable-xattr
-       Enable or disable support for the extended-attributes interface to NTFS
-       alternate data streams in mounted WIMs.  To support these, wimlib
-       requires that the setxattr() function and the attr/xattr.h header are
-       available.  The default is to autodetect whether support is possible.
-
 --disable-multithreaded-compression
        By default, data will be compressed using multiple threads when writing
        a WIM, unless only 1 processor is detected.  Specify this option to

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 28458460a511c04fa0092108f86b234042f81c91..8157966ab99fd1bce49a1f7c07dc6904fed98873 100644 (file)
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -18,8 +18,7 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 
 build() {
        cd "$pkgname-$pkgver"
-       ./configure --with-libcrypto --with-fuse --with-ntfs-3g \
-                       --enable-xattr --prefix=/usr
+       ./configure --with-libcrypto --with-fuse --with-ntfs-3g --prefix=/usr
        make
 }
 

diff --git a/configure.ac b/configure.ac
index ac5bee1ef6ae1bc18ea860feaad585f948e73328..7698dc662f2dfdc580e4544e8c0e3a36ea773bc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ AC_CHECK_FUNCS([futimens utimensat utime flock mempcpy        \
 # HAVE_*_H macro so that the NTFS-3g headers don't get confused and try to skip
 # including certain headers.
 AC_CHECK_HEADERS([alloca.h             \
-                 attr/xattr.h          \
                  byteswap.h            \
                  endian.h              \
                  errno.h               \
@@ -179,7 +178,6 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
-ENABLE_XATTR_DEFAULT="autodetect"
 
 case "$host" in
        *-*-mingw*)
@@ -192,7 +190,6 @@ case "$host" in
                WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
                WINDOWS_LDFLAGS="-no-undefined"
                WINDOWS_LDADD="-lshlwapi"
-               ENABLE_XATTR_DEFAULT="no"
                ;;
        *-*-cygwin*)
                # Cygwin (WARNING: not well supported)
@@ -293,28 +290,6 @@ if test "x$WITH_FUSE" = "xyes"; then
 fi
 AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
 
-ENABLE_XATTR=no
-AC_ARG_ENABLE([xattr],
-       [AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
-                       alternate data streams (default: autodetect)])],
-       [ENABLE_XATTR=$enableval],
-       [if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
-               AC_CHECK_FUNC([setxattr],
-                       [AC_CHECK_HEADER([attr/xattr.h],
-                               [ENABLE_XATTR=yes],
-                               [AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
-                                able to use the xattr interface to access WIM alternate data
-                                streams.])])],
-                       [AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
-                        able to use the xattr interface to access WIM alternate data
-                        streams.])])
-       fi])
-
-if test "x$ENABLE_XATTR" = "xyes"; then
-       AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
-                       interface to WIM alternate data streams])
-fi
-
 AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA1 ])
 AC_ARG_ENABLE([ssse3-sha1],
            AS_HELP_STRING([--enable-ssse3-sha1], [use assembly language implementation

diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index a0df471cad2051bd006f755e6257e03477bc48e5..8b85e91828d62e465c6f4dd8b62069c7c5840b26 100644 (file)
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -62,8 +62,7 @@ mounting them.
            --disable-rpath             \
           --with-libcrypto             \
           --with-ntfs-3g               \
-          --with-fuse                  \
-          --enable-xattr
+          --with-fuse
 make %{?_smp_mflags}
 
 %install