X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=00cbfb367ac354c374de09d90e2e456e0686648e;hp=26ff560ce13825e8966ce8994e9a1b6cddc8753b;hb=50e2715272c44a059f9726f5558782d796a0df8f;hpb=ad70b091b63707f568cf5066a50aa05436baf253 diff --git a/configure.ac b/configure.ac index 26ff560c..00cbfb36 100644 --- a/configure.ac +++ b/configure.ac @@ -1,43 +1,84 @@ -AC_INIT([wimlib], [0.6.3], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.6.1], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) -AM_INIT_AUTOMAKE([-Wall -Werror]) AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign]) AC_C_BIGENDIAN -AM_PROG_AR +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)])], + [IMAGEX_PROGNAME=$withval], + [IMAGEX_PROGNAME="wimlib-imagex"]) + +AC_SUBST([IMAGEX_PROGNAME], [$IMAGEX_PROGNAME]) +AC_DEFINE_UNQUOTED([IMAGEX_PROGNAME], ["$IMAGEX_PROGNAME"], + [Binary name for the implementation of ImageX distributed with wimlib]) + AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile - doc/Makefile - doc/Doxyfile - src/Makefile - programs/Makefile - wimlib.pc - doc/imagex.1 - doc/imagex-append.1 - doc/imagex-apply.1 - doc/imagex-capture.1 - doc/imagex-delete.1 - doc/imagex-dir.1 - doc/imagex-export.1 - doc/imagex-info.1 - doc/imagex-mount.1 - doc/imagex-mountrw.1 - doc/imagex-unmount.1 - doc/mkwinpeimg.1 - rpm/wimlib.spec - archlinux/PKGBUILD - ]) +AC_CONFIG_FILES([Makefile] + [doc/Doxyfile] + [wimlib.pc] + [doc/"$IMAGEX_PROGNAME".1:doc/imagex.1.in] + [doc/"$IMAGEX_PROGNAME"-append.1:doc/imagex-append.1.in] + [doc/"$IMAGEX_PROGNAME"-apply.1:doc/imagex-apply.1.in] + [doc/"$IMAGEX_PROGNAME"-capture.1:doc/imagex-capture.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"-mountrw.1:doc/imagex-mountrw.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]) + AC_PROG_CC +AM_PROG_CC_C_O +AC_CANONICAL_HOST +AC_CHECK_FUNCS([utimensat lutimes utime flock mempcpy]) + +# 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 \ + stddef.h \ + stdlib.h \ + sys/byteorder.h \ + sys/endian.h \ + sys/file.h \ + sys/param.h \ + sys/sysctl.h \ + sys/times.h \ + time.h \ + utime.h]) + +AC_CHECK_MEMBER([struct stat.st_mtim], + [AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1], + [Define to 1 if nanosecond precision timestamps are + supported])], + [], + [[#include ]]) -AM_ICONV -if test "x$am_cv_func_iconv" != "xyes"; then - AC_MSG_ERROR([Cannot find the iconv() function. - iconv() is used to convert between UTF-8 and UTF-16 encodings of WIM - filenames and XML data. Wimlib cannot be compiled without it. iconv() - is available in the latest version of glibc and sometimes in other - libraries.]) -fi AC_ARG_WITH(pkgconfigdir, [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], @@ -47,61 +88,32 @@ 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], +AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [include lots of debugging messages]), [ENABLE_DEBUG=$enableval], [ENABLE_DEBUG=no] ) AC_MSG_RESULT([$ENABLE_DEBUG]) if test "x$ENABLE_DEBUG" = "xyes"; then - AC_DEFINE([ENABLE_DEBUG], [1], - [Define to 1 if including lots of debug messages.]) -fi - -AC_MSG_CHECKING([whether to include more debugging messages]) -AC_ARG_ENABLE([more_debug], - AS_HELP_STRING([--enable-more-debug], - [include even more debugging messages]), - [ENABLE_MORE_DEBUG=$enableval], - [ENABLE_MORE_DEBUG=no] - ) -AC_MSG_RESULT([$ENABLE_MORE_DEBUG]) -if test "x$ENABLE_MORE_DEBUG" = "xyes"; then - AC_DEFINE([ENABLE_MORE_DEBUG], [1], - [Define to 1 if including even more debug messages.]) + AC_DEFINE([ENABLE_DEBUG], [1], + [Define to 1 if including lots of debug messages.]) fi AC_MSG_CHECKING([whether to include error messages]) -AC_ARG_ENABLE([error_messages], - AS_HELP_STRING([--disable-error-messages], - [do not compile in error messsages]), +AC_ARG_ENABLE([error_messages], + AS_HELP_STRING([--disable-error-messages], + [do not compile in error messsages]), [ENABLE_ERROR_MESSAGES=$enableval], [ENABLE_ERROR_MESSAGES=yes] ) AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES]) if test "x$ENABLE_ERROR_MESSAGES" = "xyes"; then - AC_DEFINE([ENABLE_ERROR_MESSAGES], [1], - [Define to 1 if including error messages]) -fi - -AC_MSG_CHECKING([whether to support custom memory allocation functions]) -AC_ARG_ENABLE([custom_memory_allocator], - AS_HELP_STRING([--disable-custom-memory-allocator], - [do not support the use of custom memory allocation - functions]), - [ENABLE_CUSTOM_MEMORY_ALLOCATOR=$enableval], - [ENABLE_CUSTOM_MEMORY_ALLOCATOR=yes] - ) -AC_MSG_RESULT([$ENABLE_CUSTOM_MEMORY_ALLOCATOR]) -if test "x$ENABLE_CUSTOM_MEMORY_ALLOCATOR" = "xyes"; then - AC_DEFINE([ENABLE_CUSTOM_MEMORY_ALLOCATOR], [1], - [Define to 1 if supporting custom memory allocation functions]) + AC_DEFINE([ENABLE_ERROR_MESSAGES], [1], + [Define to 1 if including error messages]) fi AC_MSG_CHECKING([whether to include assertions]) @@ -115,14 +127,25 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.]) fi +AC_MSG_CHECKING([whether to include more assertions]) +AC_ARG_ENABLE([more-assertions], + AS_HELP_STRING([--enable-more-assertions], [include even more assertions]), + [ENABLE_MORE_ASSERTIONS=$enableval], + [ENABLE_MORE_ASSERTIONS=no] + ) +AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS]) +if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then + AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.]) +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 @@ -130,13 +153,138 @@ if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then compressed data]) fi +AC_MSG_CHECKING([whether to include support for multi-threaded compression]) +AC_ARG_ENABLE([multithreaded-compression], + AS_HELP_STRING([--disable-multithreaded-compression], + [do not compile in the code for multi-threaded compression]), + [ENABLE_MULTITHREADED_COMPRESSION=$enableval], + [ENABLE_MULTITHREADED_COMPRESSION=yes] + ) +AC_MSG_RESULT([$ENABLE_MULTITHREADED_COMPRESSION]) +if test "x$ENABLE_MULTITHREADED_COMPRESSION" = "xyes"; then + AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1], + [Define to 1 if including support for multithreaded + compression]) +fi + +PTHREAD_LDADD="-lpthread" +AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD]) + +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*) + # Native Windows + WITH_NTFS_3G_DEFAULT="no" + WITH_FUSE_DEFAULT="no" + WINDOWS_NATIVE_BUILD="yes" + VISIBILITY_CFLAGS="" + WINDOWS_CFLAGS="-municode" + 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 + ;; +esac + +AC_ARG_WITH([ntdll], + AS_HELP_STRING([--without-ntdll], [Windows only: do not try to + use functions from ntdll. By default, in some parts + of its code, wimlib uses Windows NT system calls to + work around flaws in the Win32 API. This support + can be omitted if needed, but some annoying bugs + will surface (e.g. permission denied errors even + when running as the Administrator).]), + [WITH_NTDLL=$withval], + [WITH_NTDLL=yes]) + +if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then + if test "x$WITH_NTDLL" = "xyes"; then + WINDOWS_LDADD="$WINDOWS_LDADD" + AC_DEFINE([WITH_NTDLL], [1], [Define to 1 to try to use ntdll + functions]) + fi +fi + +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. + 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], + [WITH_NTFS_3G=$WITH_NTFS_3G_DEFAULT] + ) +AC_MSG_RESULT([$WITH_NTFS_3G]) +if test "x$WITH_NTFS_3G" = "xyes"; then + 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], [], + [AC_MSG_ERROR([Cannot find libntfs-3g version 2011-4-12 + or later. Without libntfs-3g, wimlib cannot include support for + capturing and applying WIMs on NTFS filesystems while preserving + NTFS-specific data such as security descriptors and alternate data + streams. You should either install libntfs-3g, or configure with + --without-ntfs-3g to disable support for these NTFS-specific + features.])]) + + 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 + AC_CHECK_DECL([NTFS_MNT_RDONLY], + [AC_DEFINE([HAVE_NTFS_MNT_RDONLY], + [1], + [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])], + [], + [#include ]) +fi +AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"]) + +AM_ICONV +if test "x$am_cv_func_iconv" != "xyes"; then + AC_MSG_ERROR([Cannot find the iconv() function. + iconv() is used to convert between encodings of WIM filenames and XML data. + wimlib cannot be compiled without it. iconv() is available in the latest + version of glibc and sometimes in other libraries.]) +fi + AC_MSG_CHECKING([whether to include support for mounting WIMs]) AC_ARG_WITH([fuse], - AS_HELP_STRING([--without-fuse], [build without libfuse. - This will disable the ability to mount + AS_HELP_STRING([--without-fuse], [build without libfuse. + This will disable the ability to mount WIM files.]), [WITH_FUSE=$withval], - [WITH_FUSE=yes] + [WITH_FUSE=$WITH_FUSE_DEFAULT] ) AC_MSG_RESULT([$WITH_FUSE]) if test "x$WITH_FUSE" = "xyes"; then @@ -144,40 +292,60 @@ if test "x$WITH_FUSE" = "xyes"; then AC_CHECK_LIB([fuse], [fuse_main_real], [have_fuse=true], - [AC_MSG_ERROR([Cannot find libfuse. - Without libfuse, WIMLIB cannot include support for mounting WIMs. You + [AC_MSG_ERROR([Cannot find libfuse. + Without libfuse, wimlib cannot include support for mounting WIMs. You should either install libfuse, or configure with --without-fuse to disable support for mounting WIMs.]) ]) AC_CHECK_LIB([rt], [mq_open], [have_posix_mq=true], [AC_MSG_ERROR([Cannot find librt for POSIX message queue - functions. Without these functions, WIMLIB cannot include support for + functions. Without these functions, wimlib cannot include support for mounting WIMs. You should either update your C library to a recent 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"]) + +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_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD]) -AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS]) AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA1 ]) AC_ARG_ENABLE([ssse3-sha1], AS_HELP_STRING([--enable-ssse3-sha1], [use assembly language implementation - of SHA1 from Intel, accelerated with vector + of SHA1 from Intel, accelerated with vector instructions (SSSE3-enabled CPU required)]), [ENABLE_SSSE3_SHA1=$enableval], [ENABLE_SSSE3_SHA1=no] ) - + 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]) + 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]) @@ -191,10 +359,10 @@ if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then else AC_ARG_WITH([libcrypto], AS_HELP_STRING([--without-libcrypto], [build in the SHA1 algorithm, - rather than use external libcrypto from + rather than use external libcrypto from OpenSSL (default is autodetect)]), [WITH_LIBCRYPTO=$withval], - [AC_CHECK_LIB([crypto], [SHA1], + [AC_CHECK_LIB([crypto], [SHA1], [WITH_LIBCRYPTO=yes], [AC_MSG_WARN([Cannot find libcrypto: using stand-alone SHA1 code instead of OpenSSL]) WITH_LIBCRYPTO=no @@ -205,17 +373,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