X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=26398a9864c23b1501194e9fd984cf3bb2c379cc;hp=2b15855b60e84e19ce1d7491e4087e11ba865af8;hb=0e9c01aa6a9fac4060d5a6751f159682681d5486;hpb=232c381f9f3ab814258aa8e2380f537498a50905 diff --git a/configure.ac b/configure.ac index 2b15855b..26398a98 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.3.0], [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]) @@ -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"-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] @@ -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"-update.1:doc/imagex-update.1.in] [doc/mkwinpeimg.1]) AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg]) @@ -44,9 +46,26 @@ AM_PROG_CC_C_O AC_CANONICAL_HOST AC_CHECK_FUNCS([utimensat lutimes utime flock]) -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 attr/xattr.h utime.h sys/file.h glob.h]) + +# Note: some of the following header checks are only to define the appropriate +# 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 \ + glob.h \ + machine/endian.h \ + stdarg.h \ + stdlib.h \ + sys/byteorder.h \ + sys/endian.h \ + sys/file.h \ + sys/param.h \ + sys/times.h \ + time.h \ + utime.h]) AC_CHECK_MEMBER([struct stat.st_mtim], [AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1], @@ -146,11 +165,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,9 +198,11 @@ 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="" +ENABLE_XATTR_DEFAULT="autodetect" case "$host" in *-*-mingw*) @@ -190,12 +211,16 @@ 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" + 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="" @@ -209,12 +234,13 @@ 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]) 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], @@ -222,8 +248,8 @@ AC_ARG_WITH([ntfs-3g], ) 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], [], @@ -304,15 +330,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], - [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 - 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