X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=83369ea5cf925e550de15d9db5419f6f51c7a336;hp=865ded2463bcfe732ac9c15610b5ff1b7ed3af1d;hb=9bea8e7fe26def4befd72bd72e0d89995a834e3c;hpb=6aad3bee18ef52fc81d6df36080aa53bf8aa1d82 diff --git a/configure.ac b/configure.ac index 865ded24..83369ea5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.3.3], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.4.1], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -7,6 +7,9 @@ AC_C_BIGENDIAN m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT +PKGCONFIG_PRIVATE_REQUIRES="" +PKGCONFIG_PRIVATE_LIBS="" + AC_ARG_WITH(imagex-progname, [AS_HELP_STRING([--with-imagex-progname=NAME], [Set the name of installed ImageX program (default: wimlib-imagex)])], @@ -28,6 +31,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 +39,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 +49,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], @@ -64,10 +86,8 @@ AC_SUBST(pkgconfigdir) AC_CHECK_LIB([xml2], [xmlParseFile], [have_libxml=true], [AC_MSG_ERROR(["cannot find libxml2"])]) -LIBXML2_LDADD=`pkg-config libxml-2.0 --libs` -LIBXML2_CFLAGS=`pkg-config libxml-2.0 --cflags` -AC_SUBST([LIBXML2_LDADD], [$LIBXML2_LDADD]) -AC_SUBST([LIBXML2_CFLAGS], [$LIBXML2_CFLAGS]) +PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) +PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0" AC_MSG_CHECKING([whether to include debugging messages]) AC_ARG_ENABLE([debug], @@ -146,11 +166,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 @@ -183,6 +203,7 @@ WINDOWS_CFLAGS="" WINDOWS_CPPFLAGS="" WINDOWS_LDFLAGS="" WINDOWS_LDADD="" +ENABLE_XATTR_DEFAULT="autodetect" case "$host" in *-*-mingw*) @@ -195,6 +216,7 @@ case "$host" in WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE" WINDOWS_LDFLAGS="-no-undefined" WINDOWS_LDADD="-lshlwapi" + ENABLE_XATTR_DEFAULT="no" ;; *-*-cygwin*) # Cygwin (WARNING: not well supported) @@ -219,7 +241,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. - 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], @@ -227,8 +249,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], [], @@ -239,8 +261,9 @@ if test "x$WITH_NTFS_3G" = "xyes"; then streams. You should either install libntfs-3g, or configure with --without-ntfs-3g to disable support for these NTFS-specific features.])]) - LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`" - LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`" + + PKG_CHECK_MODULES([LIBNTFS_3G], [libntfs-3g]) + PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g" dnl This checks for a NTFS-3g interface that was changed in the dnl 2013.1.13 release @@ -248,18 +271,11 @@ if test "x$WITH_NTFS_3G" = "xyes"; then [AC_DEFINE([HAVE_NTFS_MNT_RDONLY], [1], [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])], - , - [#include ]) -else - LIBNTFS_3G_LDADD= - LIBNTFS_3G_CFLAGS= - + [], + ,[#include ]) fi AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"]) -AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD]) -AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS]) - AM_ICONV if test "x$am_cv_func_iconv" != "xyes"; then AC_MSG_ERROR([Cannot find the iconv() function. @@ -294,30 +310,29 @@ if test "x$WITH_FUSE" = "xyes"; then version of glibc, or configure with --without-fuse to disable support for mounting WIMs.]) ]) - LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" - LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" -else - LIBFUSE_LDADD= - LIBFUSE_CFLAGS= + PKG_CHECK_MODULES([LIBFUSE], [fuse]) + PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse" + PKGCONFIG_PRIVATE_LIBS="$PKGCONFIG_PRIVATE_LIBS -lrt" + AC_SUBST([LIBRT_LIBS], [-lrt]) fi AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"]) -AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD]) -AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS]) 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], - [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 @@ -364,17 +379,12 @@ AC_MSG_RESULT([$WITH_LIBCRYPTO]) if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then AC_DEFINE([WITH_LIBCRYPTO], [1], [Define to 1 if using libcrypto SHA1]) - LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null` - if test $? -ne 0; then - LIBCRYPTO_LDADD=-lcrypto; - fi - LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null` -else - LIBCRYPTO_LDADD= - LIBCRYPTO_CFLAGS= + PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto]) + PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libcrypto" fi -AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD]) -AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS]) AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES]) +AC_SUBST([PKGCONFIG_PRIVATE_REQUIRES], [$PKGCONFIG_PRIVATE_REQUIRES]) +AC_SUBST([PKGCONFIG_PRIVATE_LIBS], [$PKGCONFIG_PRIVATE_LIBS]) + AC_OUTPUT