X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=87612a7784f4145eea088ad7e624efeb46b65153;hp=0bed8cd51e8d65b33409628d3ed201e4bfc22db8;hb=cdf7299e77148206b8a4cb665ddd7a00a0e8ed91;hpb=7b5a88bcb70a3bdb24f3df414e8c71fdb95ee602

diff --git a/configure.ac b/configure.ac
index 0bed8cd5..87612a77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.1.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.5], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -21,6 +21,7 @@ AC_CONFIG_FILES([Makefile
 		doc/imagex-join.1
 		doc/imagex-mount.1
 		doc/imagex-mountrw.1
+		doc/imagex-optimize.1
 		doc/imagex-split.1
 		doc/imagex-unmount.1
 		doc/mkwinpeimg.1
@@ -28,11 +29,17 @@ AC_CONFIG_FILES([Makefile
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-AC_CHECK_FUNCS([utimensat lutimes utime])
+AC_CHECK_FUNCS([utimensat lutimes utime flock])
 AC_CHECK_HEADERS([endian.h byteswap.h sys/byteorder.h sys/endian.h \
 		  sys/param.h machine/endian.h alloca.h stdlib.h stdarg.h \
-		  errno.h attr/xattr.h utime.h])
+		  errno.h attr/xattr.h utime.h sys/file.h])
 
+AC_CHECK_MEMBER([struct stat.st_mtim],
+		[AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1],
+			  [Define to 1 if nanosecond precision timestamps are
+			   supported])],
+		[],
+		[[#include <sys/stat.h>]])
 
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
@@ -120,6 +127,17 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then
 	AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.])
 fi
 
+AC_MSG_CHECKING([whether to include more assertions])
+AC_ARG_ENABLE([more-assertions],
+	AS_HELP_STRING([--enable-more-assertions], [include even more assertions]),
+	[ENABLE_MORE_ASSERTIONS=$enableval],
+	[ENABLE_MORE_ASSERTIONS=no]
+	)
+AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS])
+if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then
+	AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.])
+fi
+
 
 AC_MSG_CHECKING([whether to include compression verification])
 AC_ARG_ENABLE([verify_compression],
@@ -135,6 +153,24 @@ if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
 		   compressed data])
 fi
 
+AC_MSG_CHECKING([whether to include support for multi-threaded compression])
+AC_ARG_ENABLE([multithreaded-compression],
+	AS_HELP_STRING([--disable-multithreaded-compression],
+		       	[do not compile in the code for multi-threaded compression]),
+	[ENABLE_MULTITHREADED_COMPRESSION=$enableval],
+	[ENABLE_MULTITHREADED_COMPRESSION=yes]
+	)
+AC_MSG_RESULT([$ENABLE_MULTITHREADED_COMPRESSION])
+if test "x$ENABLE_MULTITHREADED_COMPRESSION" = "xyes"; then
+	AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
+		  	[Define to 1 if including support for multithreaded
+			 compression])
+	PTHREAD_LDADD="-lpthread"
+else
+	PTHREAD_LDADD=""
+fi
+AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
+
 AC_MSG_CHECKING([whether to include support for ntfs-3g])
 AC_ARG_WITH([ntfs-3g],
 	      AS_HELP_STRING([--without-ntfs-3g], [build without NTFS-3g.
@@ -149,6 +185,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 	AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for
 		   NTFS-specific information])
 
+	dnl This effectively checks for NTFS-3g 2011.4.12 or later
 	AC_CHECK_LIB([ntfs-3g], [ntfs_xattr_system_setxattr], [],
 			[AC_MSG_ERROR([Cannot find libntfs-3g version 2011-4-12
 	or later. Without libntfs-3g, wimlib cannot include support for
@@ -159,6 +196,15 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 	features.])])
 	LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`"
 	LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`"
+
+	dnl This checks for a NTFS-3g interface that was changed in the
+	dnl 2013.1.13 release
+	AC_CHECK_DECL([NTFS_MNT_RDONLY],
+		      [AC_DEFINE([HAVE_NTFS_MNT_RDONLY],
+				 [1],
+				 [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])],
+		      ,
+		      [#include <ntfs-3g/volume.h>])
 else
 	LIBNTFS_3G_LDADD=
 	LIBNTFS_3G_CFLAGS=