X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=1326258c792831a8fd54d511e26fc7707824b48e;hp=b76a5b0db56d52ccbd7ce646509b208bb5854b5b;hb=7acdc3aecd7ce546727ae8239e0d942c2a00db43;hpb=302d18acd7ed0423cfd37a9f1a8f5b70a8fe9965 diff --git a/configure.ac b/configure.ac index b76a5b0d..1326258c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.0.4], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.3.0], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -21,29 +21,26 @@ AC_CONFIG_FILES([Makefile doc/imagex-join.1 doc/imagex-mount.1 doc/imagex-mountrw.1 + doc/imagex-optimize.1 doc/imagex-split.1 doc/imagex-unmount.1 doc/mkwinpeimg.1 - rpm/wimlib.spec - archlinux/PKGBUILD ]) AC_PROG_CC AM_PROG_CC_C_O +AC_CANONICAL_HOST -AC_CHECK_FUNCS([utimensat]) +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]) + errno.h attr/xattr.h utime.h sys/file.h glob.h]) - -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_CHECK_MEMBER([struct stat.st_mtim], + [AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1], + [Define to 1 if nanosecond precision timestamps are + supported])], + [], + [[#include ]]) AC_ARG_WITH(pkgconfigdir, @@ -122,6 +119,17 @@ 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], @@ -137,6 +145,60 @@ 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]) + PTHREAD_LDADD="-lpthread" +else + PTHREAD_LDADD="" +fi +AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD]) + +WITH_NTFS_3G_DEFAULT="yes" +WITH_FUSE_DEFAULT="yes" +WINDOWS_NATIVE_BUILD="no" +VISIBILITY_CFLAGS="-fvisibility=hidden" +WINDOWS_CPPFLAGS="" +WINDOWS_LDFLAGS="" +WINDOWS_LDADD="" + +case "$host" in + *-*-mingw*) + # Native Windows + WITH_NTFS_3G_DEFAULT="no" + WITH_FUSE_DEFAULT="no" + WINDOWS_NATIVE_BUILD="yes" + VISIBILITY_CFLAGS="" + WINDOWS_CPPFLAGS="-D_POSIX" + WINDOWS_LDFLAGS="-no-undefined" + WINDOWS_LDADD="-lshlwapi" + ;; + *-*-cygwin*) + # Cygwin (WARNING: not well supported) + WITH_NTFS_3G_DEFAULT="no" + WITH_FUSE_DEFAULT="no" + VISIBILITY_CFLAGS="" + ;; + *) + # UNIX / other + ;; +esac + +AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS]) +AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS]) +AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD]) +AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS]) +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. @@ -144,25 +206,47 @@ AC_ARG_WITH([ntfs-3g], information when capturing or applying WIMs to a NTFS filesystem.]), [WITH_NTFS_3G=$withval], - [WITH_NTFS_3G=yes] + [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], [Define to 1 to enable support for NTFS-specific information]) - AC_CHECK_LIB([ntfs-3g], [ntfs_mount], [], - [AC_MSG_ERROR([Cannot find libntfs-3g. - 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.])]) + 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.])]) LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`" LIBNTFS_3G_CFLAGS="`pkg-config --cflags 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 ]) else LIBNTFS_3G_LDADD= LIBNTFS_3G_CFLAGS= + + if test "x$WINDOWS_NATIVE_BUILD" != "xyes"; then + 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 + fi fi AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"]) @@ -175,7 +259,7 @@ AC_ARG_WITH([fuse], 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 @@ -201,6 +285,7 @@ else LIBFUSE_LDADD= LIBFUSE_CFLAGS= fi +AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"]) AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD]) AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])