Remove some unnecessary configure options

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1d3498d21318679e16ff1b98f65195af8140e643..81e756d6b03c0eec50879aa83373142e6515afcf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.11.0-BETA4], [ebiggers3@gmail.com])
+AC_INIT([wimlib], m4_esyscmd_s([tools/get-version-number]),
+       [https://wimlib.net/forums/])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -34,7 +35,8 @@ case "$host_os" in
 mingw*)
        # Native Windows
        WINDOWS_NATIVE_BUILD="yes"
-       PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
+       # -D__MINGW_USE_VC2005_COMPAT: make time_t 64-bit on 32-bit Windows.
+       PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS -D__MINGW_USE_VC2005_COMPAT"
        PLATFORM_CFLAGS="-municode -mno-ms-bitfields"
        PLATFORM_LDFLAGS="-no-undefined"
        WITH_NTFS_3G_DEFAULT="no"
@@ -60,7 +62,7 @@ AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "$WINDOWS_NATIVE_BUILD" = "yes"])
 # Useful functions which we can do without.
 AC_CHECK_FUNCS([futimens utimensat flock mempcpy       \
                openat fstatat readlinkat fdopendir posix_fallocate \
-               llistxattr lgetxattr fsetxattr lsetxattr])
+               llistxattr lgetxattr fsetxattr lsetxattr getopt_long_only])
 
 # Header checks, most of which are only here to satisfy conditional includes
 # made by the libntfs-3g headers.
@@ -222,38 +224,6 @@ AM_CONDITIONAL([ENABLE_SSSE3_SHA1], [test "$ENABLE_SSSE3_SHA1" = "yes"])
 
 # ----------------------------- Other options ---------------------------------
 
-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]),
-       [ENABLE_ERROR_MESSAGES=$enableval],
-       [ENABLE_ERROR_MESSAGES=yes])
-AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES])
-if test "$ENABLE_ERROR_MESSAGES" = "yes"; then
-       AC_DEFINE([ENABLE_ERROR_MESSAGES], [1], [Define to 1 if including error messages])
-fi
-
-AC_MSG_CHECKING([whether to include assertions])
-AC_ARG_ENABLE([assertions],
-       AS_HELP_STRING([--disable-assertions], [do not include assertions]),
-       [ENABLE_ASSERTIONS=$enableval],
-       [ENABLE_ASSERTIONS=yes])
-AC_MSG_RESULT([$ENABLE_ASSERTIONS])
-if test "$ENABLE_ASSERTIONS" = "yes"; then
-       AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions])
-fi
-
-AC_MSG_CHECKING([whether to include support for multi-threaded compression])
-AC_ARG_ENABLE([multithreaded-compression],
-       AS_HELP_STRING([--disable-multithreaded-compression],
-                      [disable support for multithreaded compression]),
-       [ENABLE_MULTITHREADED_COMPRESSION=$enableval],
-       [ENABLE_MULTITHREADED_COMPRESSION=yes])
-AC_MSG_RESULT([$ENABLE_MULTITHREADED_COMPRESSION])
-if test "$ENABLE_MULTITHREADED_COMPRESSION" = "yes"; then
-       AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
-                 [Define to 1 to support multithreaded compression])
-fi
-
 AC_ARG_WITH(pkgconfigdir,
             [  --with-pkgconfigdir=DIR      pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
             [pkgconfigdir=$withval],