Update version to 1.2.4; update NEWS

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 03ad48a76ac295ec00f19a55c3ebee117311574d..5dfcd0eabb970875710b7b2e69cf54ec120782aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.1], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.4], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -127,6 +127,17 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then
        AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.])
 fi
 
+AC_MSG_CHECKING([whether to include more assertions])
+AC_ARG_ENABLE([more-assertions],
+       AS_HELP_STRING([--enable-more-assertions], [include even more assertions]),
+       [ENABLE_MORE_ASSERTIONS=$enableval],
+       [ENABLE_MORE_ASSERTIONS=no]
+       )
+AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS])
+if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then
+       AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.])
+fi
+
 
 AC_MSG_CHECKING([whether to include compression verification])
 AC_ARG_ENABLE([verify_compression],
@@ -174,6 +185,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
        AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for
                   NTFS-specific information])
 
+       dnl This effectively checks for NTFS-3g 2011.4.12 or later
        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
@@ -184,6 +196,15 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
        features.])])
        LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`"
        LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`"
+
+       dnl This checks for a NTFS-3g interface that was changed in the
+       dnl 2013.1.13 release
+       AC_CHECK_DECL([NTFS_MNT_RDONLY],
+                     [AC_DEFINE([HAVE_NTFS_MNT_RDONLY],
+                                [1],
+                                [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])],
+                     ,
+                     [#include <ntfs-3g/volume.h>])
 else
        LIBNTFS_3G_LDADD=
        LIBNTFS_3G_CFLAGS=