NTFS capture update

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index c67ca43e9b601c352953d0249e6ec28ba9d9fa93..5dcc2ff1eeba998f2390ebde57ce8497dff26dd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [0.7.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.0.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -158,9 +158,30 @@ 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 use patched upstream libntfs-3g])
+AC_ARG_WITH([new-ntfs-3g],
+       [AS_HELP_STRING([--with-new-ntfs-3g], [build using patched upstream
+                             NTFS-3g instead of version 2012-1-15])],
+       [WITH_NEW_NTFS_3G=$withval],
+       [WITH_NEW_NTFS_3G=no]
+       )
+
+AC_MSG_RESULT([$WITH_NEW_NTFS_3G])
+if test "x$WITH_NEW_NTFS_3G" = "xyes"; then
+       if test "x$WITH_NTFS_3G" != "xyes"; then
+               AC_MSG_ERROR([Cannot use new NTFS-3g if configuring
+                             --without-ntfs-3g])
+       fi
+       AC_DEFINE([WITH_NEW_NTFS_3G], [1], [Define to 1 to use patched upstream
+                  NTFS-3g instead of version 2012-1-15])
+fi
+AM_CONDITIONAL([WITH_NEW_NTFS_3G], [test "x$WITH_NEW_NTFS_3G" = "xyes"])
+
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
                AS_HELP_STRING([--without-fuse], [build without libfuse.  
@@ -196,6 +217,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