Fix sequential extraction, and include progress info
[wimlib] / configure.ac
index 786c4d103dd248c2c5e480fca8d2cae92bb58210..dc6019346cfae1ba692a21b2651e2ffcb05a944d 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [0.7.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.1.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -7,7 +7,7 @@ AC_C_BIGENDIAN
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile 
+AC_CONFIG_FILES([Makefile
                doc/Doxyfile
                wimlib.pc
                doc/imagex.1
@@ -21,15 +21,19 @@ 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
-               rpm/wimlib.spec
-               archlinux/PKGBUILD
                ])
 AC_PROG_CC
 AM_PROG_CC_C_O
 
+AC_CHECK_FUNCS([utimensat lutimes utime])
+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])
+
 
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
@@ -40,6 +44,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],
@@ -54,46 +59,46 @@ AC_SUBST([LIBXML2_LDADD], [$LIBXML2_LDADD])
 AC_SUBST([LIBXML2_CFLAGS], [$LIBXML2_CFLAGS])
 
 AC_MSG_CHECKING([whether to include debugging messages])
-AC_ARG_ENABLE([debug], 
+AC_ARG_ENABLE([debug],
        AS_HELP_STRING([--enable-debug], [include lots of debugging messages]),
        [ENABLE_DEBUG=$enableval],
        [ENABLE_DEBUG=no]
        )
 AC_MSG_RESULT([$ENABLE_DEBUG])
 if test "x$ENABLE_DEBUG" = "xyes"; then
-       AC_DEFINE([ENABLE_DEBUG], [1], 
+       AC_DEFINE([ENABLE_DEBUG], [1],
                        [Define to 1 if including lots of debug messages.])
 fi
 
 AC_MSG_CHECKING([whether to include more debugging messages])
-AC_ARG_ENABLE([more_debug], 
-       AS_HELP_STRING([--enable-more-debug], 
+AC_ARG_ENABLE([more_debug],
+       AS_HELP_STRING([--enable-more-debug],
                        [include even more debugging messages]),
        [ENABLE_MORE_DEBUG=$enableval],
        [ENABLE_MORE_DEBUG=no]
        )
 AC_MSG_RESULT([$ENABLE_MORE_DEBUG])
 if test "x$ENABLE_MORE_DEBUG" = "xyes"; then
-       AC_DEFINE([ENABLE_MORE_DEBUG], [1], 
+       AC_DEFINE([ENABLE_MORE_DEBUG], [1],
                        [Define to 1 if including even more debug messages.])
 fi
 
 AC_MSG_CHECKING([whether to include error messages])
-AC_ARG_ENABLE([error_messages], 
-       AS_HELP_STRING([--disable-error-messages], 
+AC_ARG_ENABLE([error_messages],
+       AS_HELP_STRING([--disable-error-messages],
                        [do not compile in error messsages]),
        [ENABLE_ERROR_MESSAGES=$enableval],
        [ENABLE_ERROR_MESSAGES=yes]
        )
 AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES])
 if test "x$ENABLE_ERROR_MESSAGES" = "xyes"; then
-       AC_DEFINE([ENABLE_ERROR_MESSAGES], [1], 
+       AC_DEFINE([ENABLE_ERROR_MESSAGES], [1],
                        [Define to 1 if including error messages])
 fi
 
 AC_MSG_CHECKING([whether to support custom memory allocation functions])
-AC_ARG_ENABLE([custom_memory_allocator], 
-       AS_HELP_STRING([--disable-custom-memory-allocator], 
+AC_ARG_ENABLE([custom_memory_allocator],
+       AS_HELP_STRING([--disable-custom-memory-allocator],
                       [do not support the use of custom memory allocation
                        functions]),
        [ENABLE_CUSTOM_MEMORY_ALLOCATOR=$enableval],
@@ -101,7 +106,7 @@ AC_ARG_ENABLE([custom_memory_allocator],
        )
 AC_MSG_RESULT([$ENABLE_CUSTOM_MEMORY_ALLOCATOR])
 if test "x$ENABLE_CUSTOM_MEMORY_ALLOCATOR" = "xyes"; then
-       AC_DEFINE([ENABLE_CUSTOM_MEMORY_ALLOCATOR], [1], 
+       AC_DEFINE([ENABLE_CUSTOM_MEMORY_ALLOCATOR], [1],
                [Define to 1 if supporting custom memory allocation functions])
 fi
 
@@ -131,6 +136,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.
@@ -145,13 +168,14 @@ 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.])])
+       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
+       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
@@ -165,8 +189,8 @@ AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
 
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
-               AS_HELP_STRING([--without-fuse], [build without libfuse.  
-                                       This will disable the ability to mount 
+               AS_HELP_STRING([--without-fuse], [build without libfuse.
+                                       This will disable the ability to mount
                                        WIM files.]),
        [WITH_FUSE=$withval],
        [WITH_FUSE=yes]
@@ -177,7 +201,7 @@ if test "x$WITH_FUSE" = "xyes"; then
 
 
        AC_CHECK_LIB([fuse], [fuse_main_real], [have_fuse=true],
-                       [AC_MSG_ERROR([Cannot find libfuse.  
+                       [AC_MSG_ERROR([Cannot find libfuse.
        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.])
@@ -195,6 +219,7 @@ else
        LIBFUSE_LDADD=
        LIBFUSE_CFLAGS=
 fi
+AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
 AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD])
 AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])
 
@@ -226,10 +251,10 @@ AC_ARG_ENABLE([ssse3-sha1],
        [ENABLE_SSSE3_SHA1=$enableval],
        [ENABLE_SSSE3_SHA1=no]
        )
-       
+
 AC_MSG_RESULT([$ENABLE_SSSE3_SHA1])
 if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then
-       AC_DEFINE([ENABLE_SSSE3_SHA1], [1], 
+       AC_DEFINE([ENABLE_SSSE3_SHA1], [1],
                        [Define to 1 if using vectorized implementation of SHA1])
        SSSE3_SHA1_OBJ=sha1-ssse3.lo
        AX_PROG_NASM
@@ -247,7 +272,7 @@ else
                                        rather than use external libcrypto from
                                        OpenSSL (default is autodetect)]),
        [WITH_LIBCRYPTO=$withval],
-       [AC_CHECK_LIB([crypto], [SHA1], 
+       [AC_CHECK_LIB([crypto], [SHA1],
                     [WITH_LIBCRYPTO=yes],
                     [AC_MSG_WARN([Cannot find libcrypto: using stand-alone SHA1 code instead of OpenSSL])
                     WITH_LIBCRYPTO=no