X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=26398a9864c23b1501194e9fd984cf3bb2c379cc;hp=ba2baa55ad8c67735013ea4b59efef4f196e9e8e;hb=a6442deab2424760208a1b03d04e3c26b82c36a4;hpb=a0ab870124b71d950072609cf97c3c0ef5eb4655

diff --git a/configure.ac b/configure.ac
index ba2baa55..26398a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.3.3], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.4.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -46,9 +46,26 @@ AM_PROG_CC_C_O
 AC_CANONICAL_HOST
 
 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 sys/file.h glob.h])
+
+# Note: some of the following header checks are only to define the appropriate
+# HAVE_*_H macro so that the NTFS-3g headers don't get confused and try to skip
+# including certain headers.
+AC_CHECK_HEADERS([alloca.h		\
+		  attr/xattr.h		\
+		  byteswap.h		\
+		  endian.h		\
+		  errno.h		\
+		  glob.h		\
+		  machine/endian.h	\
+		  stdarg.h		\
+		  stdlib.h		\
+		  sys/byteorder.h	\
+		  sys/endian.h		\
+		  sys/file.h		\
+		  sys/param.h		\
+		  sys/times.h		\
+		  time.h		\
+		  utime.h])
 
 AC_CHECK_MEMBER([struct stat.st_mtim],
 		[AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1],
@@ -185,6 +202,7 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
+ENABLE_XATTR_DEFAULT="autodetect"
 
 case "$host" in
 	*-*-mingw*)
@@ -197,6 +215,7 @@ case "$host" in
 		WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
 		WINDOWS_LDFLAGS="-no-undefined"
 		WINDOWS_LDADD="-lshlwapi"
+		ENABLE_XATTR_DEFAULT="no"
 		;;
  	*-*-cygwin*)
 		# Cygwin (WARNING: not well supported)
@@ -221,7 +240,7 @@ AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 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.
-			      This will disable the ability to use NTFS-specific
+			      On UNIX, this will disable the ability to use NTFS-specific
 			      information when capturing or applying WIMs to a
 			      NTFS filesystem.]),
 	[WITH_NTFS_3G=$withval],
@@ -229,8 +248,8 @@ AC_ARG_WITH([ntfs-3g],
 	)
 AC_MSG_RESULT([$WITH_NTFS_3G])
 if test "x$WITH_NTFS_3G" = "xyes"; then
-	AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for
-		   NTFS-specific information])
+	AC_DEFINE([WITH_NTFS_3G], [1], [On UNIX, 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], [],
@@ -311,15 +330,17 @@ AC_ARG_ENABLE([xattr],
 	[AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
 			alternate data streams (default: autodetect)])],
 	[ENABLE_XATTR=$enableval],
-	[AC_CHECK_FUNC([setxattr],
-		[AC_CHECK_HEADER([attr/xattr.h],
-			[ENABLE_XATTR=yes],
-			[AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
+	[if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
+		AC_CHECK_FUNC([setxattr],
+			[AC_CHECK_HEADER([attr/xattr.h],
+				[ENABLE_XATTR=yes],
+				[AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
+				 able to use the xattr interface to access WIM alternate data
+				 streams.])])],
+			[AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
 			 able to use the xattr interface to access WIM alternate data
-			 streams.])])],
-		[AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
-		 able to use the xattr interface to access WIM alternate data
-		 streams.])])])
+			 streams.])])
+	fi])
 
 if test "x$ENABLE_XATTR" = "xyes"; then
 	AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr