X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=0640ea27aaf4c71e8db86d278dcd2ee0dd65f00a;hp=84c397a390c734ef91ffac793067c10358c808c5;hb=3b0fccf127a6f872841e68825a85470f7d88185c;hpb=0a859cd076a942d7145e203c596892ca66f7e4a2 diff --git a/configure.ac b/configure.ac index 84c397a3..0640ea27 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -AC_INIT([wimlib], [1.5.0], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.6.2], [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 @@ -61,11 +61,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 +100,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 +156,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 +188,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]) @@ -231,6 +206,25 @@ case "$host" in ;; 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]) @@ -342,7 +336,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 +345,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 +359,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],