Eliminate building error on Ubuntu.

SVN-Revision: 808

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cab38eecc7fa69442251e48cba71ff12b758d90..8df32ddfcd2ce32dbed82b017fdc39611a0f3985 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,6 +471,7 @@ ENDIF(NOT HAVE_UINTMAX_T)
 #
 IF(ENABLE_XATTR)
   CHECK_INCLUDE_FILE(attr/xattr.h     HAVE_ATTR_XATTR_H)
+  CHECK_INCLUDE_FILE(sys/xattr.h      HAVE_SYS_XATTR_H)
   CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_ATTR_LIB)
   IF(HAVE_ATTR_LIB)
     SET(CMAKE_REQUIRED_LIBRARIES "attr")

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 425d90b11cba21c774284720344eedbdd19d117b..8832b8ffc88e985ae08d90e5dbc5a61bc184fbdc 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -470,6 +470,9 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #cmakedefine HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if you have the <sys/xattr.h> header file. */
+#cmakedefine HAVE_SYS_XATTR_H 1
+
 /* Define to 1 if you have the `timegm' function. */
 #cmakedefine HAVE_TIMEGM 1
 

diff --git a/configure.ac b/configure.ac
index 9157497ab10d95c7eeb41a2317e86d0e945c4316..c2fa7f83d74079208b848f1ccd0237b4ddc06644 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -382,6 +382,7 @@ AC_ARG_ENABLE([xattr],
 
 if test "x$enable_xattr" != "xno"; then
        AC_CHECK_HEADERS([attr/xattr.h])
+       AC_CHECK_HEADERS([sys/xattr.h])
        AC_CHECK_LIB(attr,setxattr)
        AC_CHECK_FUNCS([getxattr lgetxattr listxattr llistxattr fsetxattr lsetxattr])
 fi

diff --git a/cpio/test/test.h b/cpio/test/test.h
index 5aa4ed6c92703f6112d60c2053ec749034c2365e..8b82ea6fb544a541bfea04afa495620075195ed2 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -70,6 +70,7 @@
 #include <sys/stat.h>
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <unistd.h>
+#include <time.h>
 #else
 #include <time.h>
 #endif

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index ef06faa3ac746ed33b50781fe37e945e1938d1bf..9e3766177f0aa6182279903e154d7faaa6daa1ed 100644 (file)
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -42,6 +42,9 @@ __FBSDID("$FreeBSD$");
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
 #ifdef HAVE_ACL_LIBACL_H
 #include <acl/libacl.h>
 #endif

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index e2c381b5f772ec4fbf261274f2d23e992bdc74b0..9c9cbef53624dbc3a7668e49f35efe23f660dd87 100644 (file)
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -51,6 +51,9 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.42 2008/12/06 05
 #ifdef HAVE_SYS_UTIME_H
 #include <sys/utime.h>
 #endif
+#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif