From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 5 Feb 2009 12:09:53 +0000 (-0500)
Subject: Catch up latest configure.ac.
X-Git-Tag: v2.7.0~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c720f3e80b8d048fd4a64d3d45b99471b21b48;p=thirdparty%2Flibarchive.git

Catch up latest configure.ac.

SVN-Revision: 556
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c966b04a1..80664fa12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,11 +173,12 @@ CHECK_HEADER_DIRENT()
 # TODO : AC_HEADER_SYS_WAIT
 CHECK_INCLUDE_FILE(sys/wait.h       HAVE_SYS_WAIT_H)
 
-CHECK_HEADERS(ctype.h errno.h ext2fs/ext2_fs.h fcntl.h grp.h)
+CHECK_HEADERS(acl/libacl.h attr/xattr.h ctype.h errno.h)
+CHECK_HEADERS(ext2fs/ext2_fs.h fcntl.h grp.h)
 CHECK_HEADERS(inttypes.h langinfo.h limits.h linux/fs.h)
 CHECK_HEADERS(locale.h paths.h poll.h pwd.h regex.h stdarg.h)
 CHECK_HEADERS(stdint.h stdlib.h string.h)
-CHECK_HEADERS(sys/acl.h sys/extattr.h sys/ioctl.h)
+CHECK_HEADERS(sys/acl.h sys/extattr.h sys/ioctl.h sys/mkdev.h)
 CHECK_HEADERS(sys/param.h sys/poll.h sys/select.h sys/time.h sys/utime.h)
 CHECK_HEADERS(time.h unistd.h utime.h wchar.h wctype.h windows.h)
 
@@ -330,6 +331,10 @@ CHECK_STRUCT_MEMBER("struct stat" st_mtimespec.tv_nsec
     "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC)
 CHECK_STRUCT_MEMBER("struct stat" st_mtim.tv_nsec
     "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
+CHECK_STRUCT_MEMBER("struct stat" st_mtime_n
+    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_N)
+CHECK_STRUCT_MEMBER("struct stat" st_umtime
+    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_UMTIME)
 # Check for block size support in struct stat
 CHECK_STRUCT_MEMBER("struct stat" st_blksize
     "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BLKSIZE)
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 82b770d3b..a841bbf29 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -18,6 +18,9 @@
 /* Define to 1 if you have the `acl_init' function. */
 #cmakedefine HAVE_ACL_INIT 1
 
+/* Define to 1 if you have the <acl/libacl.h> header file. */
+#cmakedefine HAVE_ACL_LIBACL_H 1
+
 /* Define to 1 if the system has the type `acl_permset_t'. */
 #cmakedefine HAVE_ACL_PERMSET_T 1
 
@@ -411,9 +414,15 @@
 /* Define to 1 if `st_mtimespec.tv_nsec' is member of `struct stat'. */
 #cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
 
+/* Define to 1 if `st_mtime_n' is member of `struct stat'. */
+#cmakedefine HAVE_STRUCT_STAT_ST_MTIME_N 1
+
 /* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
 #cmakedefine HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 
+/* Define to 1 if `st_umtime' is member of `struct stat'. */
+#cmakedefine HAVE_STRUCT_STAT_ST_UMTIME 1
+
 /* Define to 1 if you have the <sys/acl.h> header file. */
 #cmakedefine HAVE_SYS_ACL_H 1
 
@@ -427,6 +436,9 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #cmakedefine HAVE_SYS_IOCTL_H 1
 
+/* Define to 1 if you have the <sys/mkdev.h> header file. */
+#cmakedefine HAVE_SYS_MKDEV_H 1
+
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
 #cmakedefine HAVE_SYS_NDIR_H 1
@@ -509,6 +521,9 @@
 /* Define to 1 if you have the <wctype.h> header file. */
 #cmakedefine HAVE_WCTYPE_H 1
 
+/* Define to 1 if you have the <windows.h> header file. */
+#cmakedefine HAVE_WINDOWS_H 1
+
 /* Define to 1 if you have the `wmemcmp' function. */
 #cmakedefine HAVE_WMEMCMP 1
 
@@ -588,7 +603,7 @@
 #cmakedefine _LARGE_FILES ${_LARGE_FILES}
 
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef ware allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #cmakedefine _UINT64_T