]> wimlib.net Git - wimlib/blobdiff - configure.ac
do_overlay(): Do overlays recursively
[wimlib] / configure.ac
index 71136390363d6764a439b2bf35a13a2a7115e0d0..48aa4ad6691b0309307f02e2db5fe32ee05f90b7 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.3.1], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.3.3], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -146,11 +146,11 @@ fi
 
 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],
-       [ENABLE_VERIFY_COMPRESSION=yes]
+       [ENABLE_VERIFY_COMPRESSION=no]
        )
 AC_MSG_RESULT([$ENABLE_VERIFY_COMPRESSION])
 if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
@@ -179,6 +179,7 @@ WITH_NTFS_3G_DEFAULT="yes"
 WITH_FUSE_DEFAULT="yes"
 WINDOWS_NATIVE_BUILD="no"
 VISIBILITY_CFLAGS="-fvisibility=hidden"
+WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
@@ -190,12 +191,15 @@ case "$host" in
                WITH_FUSE_DEFAULT="no"
                WINDOWS_NATIVE_BUILD="yes"
                VISIBILITY_CFLAGS=""
-               WINDOWS_CPPFLAGS="-D_POSIX"
+               WINDOWS_CFLAGS="-municode"
+               WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
                WINDOWS_LDFLAGS="-no-undefined"
                WINDOWS_LDADD="-lshlwapi"
                ;;
        *-*-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=""
@@ -209,6 +213,7 @@ AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
 AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
 AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
 AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
+AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
 AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 
 AC_MSG_CHECKING([whether to include support for ntfs-3g])