X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=ac5bee1ef6ae1bc18ea860feaad585f948e73328;hp=8d96cc370095a534e2bb24802990bae9204f3593;hb=d82950b8ae73d50bffebb88c2b5c10b49f4082f4;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad diff --git a/configure.ac b/configure.ac index 8d96cc37..ac5bee1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -AC_INIT([wimlib], [1.5.0], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.7.0-BETA], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign]) AC_C_BIGENDIAN m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT @@ -24,23 +24,23 @@ AC_CONFIG_HEADERS([config.h]) 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]) + [doc/man1/"$IMAGEX_PROGNAME".1:doc/man1/imagex.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-append.1:doc/man1/imagex-append.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-apply.1:doc/man1/imagex-apply.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-capture.1:doc/man1/imagex-capture.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-delete.1:doc/man1/imagex-delete.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-dir.1:doc/man1/imagex-dir.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-export.1:doc/man1/imagex-export.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-extract.1:doc/man1/imagex-extract.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-info.1:doc/man1/imagex-info.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-join.1:doc/man1/imagex-join.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-mount.1:doc/man1/imagex-mount.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-mountrw.1:doc/man1/imagex-mountrw.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-optimize.1:doc/man1/imagex-optimize.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-split.1:doc/man1/imagex-split.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-unmount.1:doc/man1/imagex-unmount.1.in] + [doc/man1/"$IMAGEX_PROGNAME"-update.1:doc/man1/imagex-update.1.in] + [doc/man1/mkwinpeimg.1]) AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg]) @@ -48,7 +48,8 @@ AC_PROG_CC AM_PROG_CC_C_O AC_CANONICAL_HOST -AC_CHECK_FUNCS([utimensat lutimes utime flock]) +AC_CHECK_FUNCS([futimens utimensat utime flock mempcpy \ + openat fstatat readlinkat fdopendir]) # 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 @@ -61,11 +62,13 @@ AC_CHECK_HEADERS([alloca.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]) @@ -98,47 +101,20 @@ AC_ARG_ENABLE([debug], 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.]) + [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]), + [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]) + [Define to 1 if including error messages]) fi AC_MSG_CHECKING([whether to include assertions]) @@ -181,14 +157,14 @@ 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]), + [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 + [Define to 1 if including support for multithreaded compression]) fi @@ -213,12 +189,12 @@ case "$host" in WINDOWS_NATIVE_BUILD="yes" VISIBILITY_CFLAGS="" WINDOWS_CFLAGS="-municode" - WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE" + 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*) # 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]) @@ -265,7 +241,7 @@ if test "x$WITH_NTFS_3G" = "xyes"; then 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 This checks for an 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], @@ -342,7 +318,7 @@ fi 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] @@ -351,7 +327,7 @@ AC_ARG_ENABLE([ssse3-sha1], 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]) + [Define to 1 if using vectorized implementation of SHA1]) SSSE3_SHA1_OBJ=sha1-ssse3.lo AX_PROG_NASM AC_SUBST([NASM], [$nasm]) @@ -365,7 +341,7 @@ 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],