Remove buffer_io.h

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 13da4dd003cd2abf1338541f69d695be671a5fc5..1f46419ee20c324e0787be0acaa6de825142cd11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.3.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.4.0], [ebiggers3@gmail.com])

 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])


@@ -28,6 +28,7 @@ AC_CONFIG_FILES([Makefile]
                [doc/"$IMAGEX_PROGNAME"-delete.1:doc/imagex-delete.1.in]
                [doc/"$IMAGEX_PROGNAME"-dir.1:doc/imagex-dir.1.in]
                [doc/"$IMAGEX_PROGNAME"-export.1:doc/imagex-export.1.in]
                [doc/"$IMAGEX_PROGNAME"-delete.1:doc/imagex-delete.1.in]
                [doc/"$IMAGEX_PROGNAME"-dir.1:doc/imagex-dir.1.in]
                [doc/"$IMAGEX_PROGNAME"-export.1:doc/imagex-export.1.in]

+               [doc/"$IMAGEX_PROGNAME"-extract.1:doc/imagex-extract.1.in]

                [doc/"$IMAGEX_PROGNAME"-info.1:doc/imagex-info.1.in]
                [doc/"$IMAGEX_PROGNAME"-join.1:doc/imagex-join.1.in]
                [doc/"$IMAGEX_PROGNAME"-mount.1:doc/imagex-mount.1.in]
                [doc/"$IMAGEX_PROGNAME"-info.1:doc/imagex-info.1.in]
                [doc/"$IMAGEX_PROGNAME"-join.1:doc/imagex-join.1.in]
                [doc/"$IMAGEX_PROGNAME"-mount.1:doc/imagex-mount.1.in]


@@ -35,6 +36,7 @@ AC_CONFIG_FILES([Makefile]
                [doc/"$IMAGEX_PROGNAME"-optimize.1:doc/imagex-optimize.1.in]
                [doc/"$IMAGEX_PROGNAME"-split.1:doc/imagex-split.1.in]
                [doc/"$IMAGEX_PROGNAME"-unmount.1:doc/imagex-unmount.1.in]
                [doc/"$IMAGEX_PROGNAME"-optimize.1:doc/imagex-optimize.1.in]
                [doc/"$IMAGEX_PROGNAME"-split.1:doc/imagex-split.1.in]
                [doc/"$IMAGEX_PROGNAME"-unmount.1:doc/imagex-unmount.1.in]

+               [doc/"$IMAGEX_PROGNAME"-update.1:doc/imagex-update.1.in]

                [doc/mkwinpeimg.1])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
                [doc/mkwinpeimg.1])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])


@@ -146,11 +148,11 @@ fi
 
 AC_MSG_CHECKING([whether to include compression verification])
 AC_ARG_ENABLE([verify_compression],
 
 AC_MSG_CHECKING([whether to include compression verification])
 AC_ARG_ENABLE([verify_compression],

-             AS_HELP_STRING([--disable-verify-compression], [disable
-                               checking if blocks we compress can be correctly
+             AS_HELP_STRING([--enable-verify-compression], [always
+                               check if blocks we compress can be correctly

                                decompressed]),
        [ENABLE_VERIFY_COMPRESSION=$enableval],
                                decompressed]),
        [ENABLE_VERIFY_COMPRESSION=$enableval],

-       [ENABLE_VERIFY_COMPRESSION=yes]
+       [ENABLE_VERIFY_COMPRESSION=no]

        )
 AC_MSG_RESULT([$ENABLE_VERIFY_COMPRESSION])
 if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
        )
 AC_MSG_RESULT([$ENABLE_VERIFY_COMPRESSION])
 if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then


@@ -183,6 +185,7 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""

+ENABLE_XATTR_DEFAULT="autodetect"

 
 case "$host" in
        *-*-mingw*)
 
 case "$host" in
        *-*-mingw*)


@@ -195,6 +198,7 @@ case "$host" in
                WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
                WINDOWS_LDFLAGS="-no-undefined"
                WINDOWS_LDADD="-lshlwapi"
                WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
                WINDOWS_LDFLAGS="-no-undefined"
                WINDOWS_LDADD="-lshlwapi"

+               ENABLE_XATTR_DEFAULT="no"

                ;;
        *-*-cygwin*)
                # Cygwin (WARNING: not well supported)
                ;;
        *-*-cygwin*)
                # Cygwin (WARNING: not well supported)


@@ -219,7 +223,7 @@ AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 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.
 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.

-                             This will disable the ability to use NTFS-specific
+                             On UNIX, this will disable the ability to use NTFS-specific

                              information when capturing or applying WIMs to a
                              NTFS filesystem.]),
        [WITH_NTFS_3G=$withval],
                              information when capturing or applying WIMs to a
                              NTFS filesystem.]),
        [WITH_NTFS_3G=$withval],


@@ -227,8 +231,8 @@ AC_ARG_WITH([ntfs-3g],
        )
 AC_MSG_RESULT([$WITH_NTFS_3G])
 if test "x$WITH_NTFS_3G" = "xyes"; then
        )
 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_DEFINE([WITH_NTFS_3G], [1], [On UNIX, 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], [],
 
        dnl This effectively checks for NTFS-3g 2011.4.12 or later
        AC_CHECK_LIB([ntfs-3g], [ntfs_xattr_system_setxattr], [],


@@ -309,15 +313,17 @@ AC_ARG_ENABLE([xattr],
        [AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
                        alternate data streams (default: autodetect)])],
        [ENABLE_XATTR=$enableval],
        [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
+       [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
                         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.])])])
+                        streams.])])
+       fi])

 
 if test "x$ENABLE_XATTR" = "xyes"; then
        AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
 
 if test "x$ENABLE_XATTR" = "xyes"; then
        AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr