Catch up on r558 and r559 for cmake.

SVN-Revision: 562

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80664fa1215ace58389444f16062e040562f2604..d5242bcde10c683ed1f50685988fe3cd1a1c4913 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,6 +335,8 @@ 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_STRUCT_MEMBER("struct stat" st_mtime_usec
+    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_USEC)
 # 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)
@@ -674,6 +676,8 @@ IF(ENABLE_TEST)
     libarchive/test/test_read_format_gtar_lzma.c
     libarchive/test/test_read_format_gtar_sparse.c
     libarchive/test/test_read_format_iso_gz.c
+    libarchive/test/test_read_format_isojoliet_bz2.c
+    libarchive/test/test_read_format_isojolietrr_bz2.c
     libarchive/test/test_read_format_isorr_bz2.c
     libarchive/test/test_read_format_mtree.c
     libarchive/test/test_read_format_pax_bz2.c

diff --git a/cmake/config.h.in b/cmake/config.h.in
index a841bbf29b4a8c8f1f239dbce464cce7ae9c8cd0..71cf94f866f8c9718e8be8f52cb97a78a654c609 100644 (file)
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -417,6 +417,9 @@
 /* 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_mtime_usec' is member of `struct stat'. */
+#cmakedefine HAVE_STRUCT_STAT_ST_MTIME_USEC 1
+
 /* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
 #cmakedefine HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1