Set version to 1.7.2-BETA

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index b182ae70087572511e8b83d1ff93bde86337c7f6..8e6bce6bdf3e277fbccfc8bd9d306143c728a05c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.6.3-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.2-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -40,6 +40,7 @@ AC_CONFIG_FILES([Makefile]
                [doc/man1/"$IMAGEX_PROGNAME"-split.1:doc/man1/imagex-split.1.in]
                [doc/man1/"$IMAGEX_PROGNAME"-unmount.1:doc/man1/imagex-unmount.1.in]
                [doc/man1/"$IMAGEX_PROGNAME"-update.1:doc/man1/imagex-update.1.in]
+               [doc/man1/"$IMAGEX_PROGNAME"-verify.1:doc/man1/imagex-verify.1.in]
                [doc/man1/mkwinpeimg.1])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
@@ -55,7 +56,6 @@ AC_CHECK_FUNCS([futimens utimensat utime flock mempcpy        \
 # HAVE_*_H macro so that the NTFS-3g headers don't get confused and try to skip
 # including certain headers.
 AC_CHECK_HEADERS([alloca.h             \
-                 attr/xattr.h          \
                  byteswap.h            \
                  endian.h              \
                  errno.h               \
@@ -179,10 +179,9 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
-ENABLE_XATTR_DEFAULT="autodetect"
 
-case "$host" in
-       *-*-mingw*)
+case "$host_os" in
+       mingw*)
                # Native Windows
                WITH_NTFS_3G_DEFAULT="no"
                WITH_FUSE_DEFAULT="no"
@@ -192,15 +191,6 @@ case "$host" in
                WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
                WINDOWS_LDFLAGS="-no-undefined"
                WINDOWS_LDADD="-lshlwapi"
-               ENABLE_XATTR_DEFAULT="no"
-               ;;
-       *-*-cygwin*)
-               # Cygwin (WARNING: not well supported)
-               AC_MSG_WARN([wimlib has not been tested with Cygwin!  Please do
-                            a Windows-native build with MinGW-w64 instead])
-               WITH_NTFS_3G_DEFAULT="no"
-               WITH_FUSE_DEFAULT="no"
-               VISIBILITY_CFLAGS=""
                ;;
        *)
                # UNIX / other
@@ -293,28 +283,6 @@ if test "x$WITH_FUSE" = "xyes"; then
 fi
 AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
 
-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],
-       [if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
-               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.])])
-       fi])
-
-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
@@ -328,9 +296,20 @@ AC_MSG_RESULT([$ENABLE_SSSE3_SHA1])
 if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then
        AC_DEFINE([ENABLE_SSSE3_SHA1], [1],
                        [Define to 1 if using vectorized implementation of SHA1])
-       SSSE3_SHA1_OBJ=sha1-ssse3.lo
-       AX_PROG_NASM
-       AC_SUBST([NASM], [$nasm])
+       SSSE3_SHA1_OBJ=src/sha1-ssse3.lo
+       AC_PROG_NASM
+       NASM_SYMBOL_PREFIX=""
+       NASM_WINDOWS_FLAGS=
+       if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then
+               NASM_WINDOWS_FLAGS="-DWIN_ABI"
+       fi
+       case "$host_os" in
+               darwin* | rhapsody* | nextstep* | openstep* | macos*)
+                       NASM_SYMBOL_PREFIX="_"
+                       ;;
+       esac
+       AC_SUBST([NASM_WINDOWS_FLAGS], $NASM_WINDOWS_FLAGS)
+       AC_SUBST([NASM_SYMBOL_PREFIX], $NASM_SYMBOL_PREFIX)
 else
        SSSE3_SHA1_OBJ=
 fi