X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=ceb0b59cbbfe45f941e172018240215e5a79a29f;hp=e6dc26fe4e329b5955a4560597b60adec6634efb;hb=3d71e838902b0b6f5321484ca965c1cd888fb91e;hpb=c44ed3d9615e8fb8e660903f61a16fe21599f4e9 diff --git a/configure.ac b/configure.ac index e6dc26fe..ceb0b59c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,11 @@ ############################################################################### -AC_INIT([wimlib], [1.7.4-BETA], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.8.2-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 foreign]) +AC_C_BIGENDIAN m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT @@ -32,7 +33,7 @@ case "$host_os" in mingw*) # Native Windows WINDOWS_NATIVE_BUILD="yes" - PLATFORM_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS" + PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS" PLATFORM_CFLAGS="-municode -mno-ms-bitfields" PLATFORM_LDFLAGS="-no-undefined" WITH_NTFS_3G_DEFAULT="no" @@ -62,6 +63,7 @@ AC_CHECK_FUNCS([futimens utimensat flock mempcpy \ # Header checks, most of which are only here to satisfy conditional includes # made by the libntfs-3g headers. AC_CHECK_HEADERS([alloca.h \ + attr/xattr.h \ byteswap.h \ endian.h \ errno.h \ @@ -92,8 +94,11 @@ AC_CHECK_MEMBER([struct stat.st_mtim], # Required libraries # ############################################################################### +# ------------------------------ pthreads ------------------------------------- +AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])]) + # ------------------------------ libxml2 -------------------------------------- -AC_CHECK_LIB([xml2], [xmlParseFile], [], +AC_CHECK_LIB([xml2], [xmlReadMemory], [], [AC_MSG_ERROR(["cannot find libxml2"])]) PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0" @@ -237,16 +242,6 @@ AM_CONDITIONAL([ENABLE_SSSE3_SHA1], [test "$ENABLE_SSSE3_SHA1" = "yes"]) # ----------------------------- Other options --------------------------------- -AC_MSG_CHECKING([whether to include debugging messages]) -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug], [include debugging messages]), - [ENABLE_DEBUG=$enableval], - [ENABLE_DEBUG=no]) -AC_MSG_RESULT([$ENABLE_DEBUG]) -if test "$ENABLE_DEBUG" = "yes"; then - AC_DEFINE([ENABLE_DEBUG], [1], [Define to 1 if including 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]), @@ -267,18 +262,6 @@ if test "$ENABLE_ASSERTIONS" = "yes"; then AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions]) fi -AC_MSG_CHECKING([whether to include automatic compression verification]) -AC_ARG_ENABLE([verify_compression], - AS_HELP_STRING([--enable-verify-compression], - [verify all compression results (makes compression - slower; intended for debugging only)]), - [ENABLE_VERIFY_COMPRESSION=$enableval], - [ENABLE_VERIFY_COMPRESSION=no]) -AC_MSG_RESULT([$ENABLE_VERIFY_COMPRESSION]) -if test "$ENABLE_VERIFY_COMPRESSION" = "yes"; then - AC_DEFINE([ENABLE_VERIFY_COMPRESSION], [1], [Define to 1 to verify compression results]) -fi - AC_MSG_CHECKING([whether to include support for multi-threaded compression]) AC_ARG_ENABLE([multithreaded-compression], AS_HELP_STRING([--disable-multithreaded-compression],