NTFS capture update

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index d79f130f3c778e1a315bfcd5f9db40cc302e56e7..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])
@@ -136,15 +136,51 @@ 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=$enableval],
+                             NTFS filesystem.]),
+       [WITH_NTFS_3G=$withval],
        [WITH_NTFS_3G=yes]
        )
 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_set_file_security], [],
+                       [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 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],
@@ -161,13 +197,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.])
@@ -181,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