Remove libattr requirement

RHEL/CentOS 6 supports sys/xattr.h eliminating the need for
libattr-devel as a dependency.

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: DHE <git@dehacked.net>
Closes #7344
Closes #7351

diff --git a/config/user-libattr.m4 b/config/user-libattr.m4
deleted file mode 100644 (file)
index 3298fd4..0000000
--- a/config/user-libattr.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl #
-dnl # Check for libattr
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_USER_LIBATTR], [
-       LIBATTR=
-
-       AC_CHECK_HEADER([attr/xattr.h], [], [AC_MSG_FAILURE([
-       *** attr/xattr.h missing, libattr-devel package required])])
-
-       AC_SUBST([LIBATTR], ["-lattr"])
-       AC_DEFINE([HAVE_LIBATTR], 1, [Define if you have libattr])
-])

diff --git a/config/user.m4 b/config/user.m4
index 0bada893b4606573e8a23ced4f0f8adecc21c59a..f5e5e9acd4af31a2610e1991928556b4c8295501 100644 (file)
--- a/config/user.m4
+++ b/config/user.m4
@@ -11,7 +11,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
        ZFS_AC_CONFIG_USER_LIBUUID
        ZFS_AC_CONFIG_USER_LIBTIRPC
        ZFS_AC_CONFIG_USER_LIBBLKID
-       ZFS_AC_CONFIG_USER_LIBATTR
        ZFS_AC_CONFIG_USER_LIBUDEV
        ZFS_AC_CONFIG_USER_LIBSSL
        ZFS_AC_CONFIG_USER_RUNSTATEDIR

diff --git a/tests/zfs-tests/cmd/mktree/mktree.c b/tests/zfs-tests/cmd/mktree/mktree.c
index 3dc3dd8ec6f624de6f8b2d81226ff7ea87447163..bf0ec5e0cc73a8f3cf5149b72fd774f6ad6d218a 100644 (file)
--- a/tests/zfs-tests/cmd/mktree/mktree.c
+++ b/tests/zfs-tests/cmd/mktree/mktree.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest/xattrtest.c
index a93cce7f18cfef90153732eefcb619c07bacab7d..dd3f2a6c975de9608215eed7638aecd41f424937 100644 (file)
--- a/tests/zfs-tests/cmd/xattrtest/xattrtest.c
+++ b/tests/zfs-tests/cmd/xattrtest/xattrtest.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>