X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=d761ec8196f1f7e565868871c80e1279ebbc0fe5;hp=df99a32927b4e4adea455a5d7f160f3592acca9b;hb=d4b9c90b4979c07c049b06be709187a60c17112b;hpb=8b36be62a40512bbe5f21f206fbd7cfbc6293fd1

diff --git a/configure.ac b/configure.ac
index df99a329..d761ec81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT([wimlib], [0.7.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.0.2], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
 AC_C_BIGENDIAN
-AM_PROG_AR
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile 
@@ -30,6 +30,11 @@ AC_CONFIG_FILES([Makefile
 AC_PROG_CC
 AM_PROG_CC_C_O
 
+AC_CHECK_FUNCS([utimensat])
+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])
+
 
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
@@ -40,6 +45,7 @@ if test "x$am_cv_func_iconv" != "xyes"; then
 	libraries.])
 fi
 
+
 AC_ARG_WITH(pkgconfigdir,
             [  --with-pkgconfigdir=DIR      pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
             [pkgconfigdir=$withval],
@@ -131,19 +137,37 @@ if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
 		   compressed data])
 fi
 
-AC_MSG_CHECKING([whether to include support for copying security data])
-AC_ARG_ENABLE([security_data],
-	      AS_HELP_STRING([--disable-security-data], [disable
-				the ability to retain the security data of
-				existing WIMs]),
-	[ENABLE_SECURITY_DATA=$enableval],
-	[ENABLE_SECURITY_DATA=yes]
+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
+			      information when capturing or applying WIMs to a
+			      NTFS filesystem.]),
+	[WITH_NTFS_3G=$withval],
+	[WITH_NTFS_3G=yes]
 	)
-AC_MSG_RESULT([$ENABLE_SECURITY_DATA])
-if test "x$ENABLE_SECURITY_DATA" = "xyes"; then
-	AC_DEFINE([ENABLE_SECURITY_DATA], [1], [Define to 1 to enable support
-		   for copying security data])
+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_CHECK_LIB([ntfs-3g], [ntfs_mount], [],
+			[AC_MSG_ERROR([Cannot find libntfs-3g.
+	Without libntfs-3g, wimlib cannot include support for capturing and 
+	applying WIMs on NTFS filesystems while preserving NTFS-specific data
+	such as security descriptors and alternate data streams.  You should
+	either install libntfs-3g, or configure with --without-ntfs-3g to
+	disable support for these NTFS-specific features.])])
+	LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`"
+	LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`"
+else
+	LIBNTFS_3G_LDADD=
+	LIBNTFS_3G_CFLAGS=
 fi
+AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
+
+AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
+AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
 
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
@@ -160,13 +184,13 @@ if test "x$WITH_FUSE" = "xyes"; then
 
 	AC_CHECK_LIB([fuse], [fuse_main_real], [have_fuse=true],
 			[AC_MSG_ERROR([Cannot find libfuse.  
-	Without libfuse, WIMLIB cannot include support for mounting WIMs.  You
+	Without libfuse, wimlib cannot include support for mounting WIMs.  You
 	should either install libfuse, or configure with --without-fuse to
 	disable support for mounting WIMs.])
 	])
 	AC_CHECK_LIB([rt], [mq_open], [have_posix_mq=true],
 		     [AC_MSG_ERROR([Cannot find librt for POSIX message queue
-	functions.  Without these functions, WIMLIB cannot include support for
+	functions.  Without these functions, wimlib cannot include support for
 	mounting WIMs.  You should either update your C library to a recent
 	version of glibc, or configure with --without-fuse to disable support
 	for mounting WIMs.])
@@ -180,6 +204,26 @@ fi
 AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD])
 AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])
 
+ENABLE_XATTR=no
+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
+			 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.])])])
+
+if test "x$ENABLE_XATTR" = "xyes"; then
+	AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
+			interface to WIM alternate data streams])
+fi
+
 AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA1 ])
 AC_ARG_ENABLE([ssse3-sha1],
 	    AS_HELP_STRING([--enable-ssse3-sha1], [use assembly language implementation