Define version macros in wimlib.h

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6396002cd90d6e11a9654b26ca391579a0d47584..03b44e6c009e119e518b70f6ef607e8af317f341 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.0.4], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -21,19 +21,18 @@ 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])
+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])
+                 errno.h attr/xattr.h utime.h])
 
 
 AM_ICONV
@@ -137,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.
@@ -151,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_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.])])
+       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
@@ -201,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])