X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=configure.ac;h=1d53735331136c9c612ea36b3cd7145e53839a1f;hb=3a2b0ab60709d6a7c38f42804242ad49279e5354;hp=dc569f7bb104b1d55f75511a29e06a2aeaca861a;hpb=e4cdc80a6d033bb27ac0d1687ca32d0434673128;p=wimlib

diff --git a/configure.ac b/configure.ac
index dc569f7b..1d537353 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.10.0-BETA], [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 -D_WIN32_WINNT=0x0600"
 	PLATFORM_CFLAGS="-municode -mno-ms-bitfields"
 	PLATFORM_LDFLAGS="-no-undefined"
 	WITH_NTFS_3G_DEFAULT="no"
@@ -59,12 +61,12 @@ 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])
+		openat fstatat readlinkat fdopendir posix_fallocate \
+		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.
 AC_CHECK_HEADERS([alloca.h		\
-		  attr/xattr.h		\
 		  byteswap.h		\
 		  endian.h		\
 		  errno.h		\
@@ -76,8 +78,10 @@ AC_CHECK_HEADERS([alloca.h		\
 		  sys/byteorder.h	\
 		  sys/endian.h		\
 		  sys/file.h		\
+		  sys/syscall.h		\
 		  sys/sysctl.h		\
 		  sys/times.h		\
+		  sys/xattr.h		\
 		  time.h		\
 		  utime.h])
 
@@ -95,7 +99,9 @@ AC_CHECK_MEMBER([struct stat.st_mtim],
 ###############################################################################
 
 # ------------------------------ pthreads -------------------------------------
-AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
+if test "$WINDOWS_NATIVE_BUILD" != "yes"; then
+	AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
+fi
 
 # ------------------------------ libxml2 --------------------------------------
 PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
@@ -159,98 +165,13 @@ if test "$WITH_FUSE" = "yes"; then
 	versions of glibc include this library.  Either install this library, or
 	configure --without-fuse to disable support for mounting WIM images.])])
 
-	AC_CHECK_LIB([attr], [getxattr], [],
-		     [AC_MSG_ERROR([Cannot find libattr!
-	wimlib needs this for the extended attribute functions, which are used
-	in the code for mounting WIM images.  Either install this library, or
-	configure --without-fuse to disable support for mounting WIM images.])])
-
 	PKGCONFIG_PRIVATE_LIBS="$PKGCONFIG_PRIVATE_LIBS -lrt"
 	AC_SUBST([LIBRT_LIBS], [-lrt])
 fi
 AM_CONDITIONAL([WITH_FUSE], [test "$WITH_FUSE" = "yes"])
 
-# ------------------------ SHA-1 implementation ---------------------------------
-
-AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA-1])
-AC_ARG_ENABLE([ssse3-sha1],
-	      [AS_HELP_STRING([--enable-ssse3-sha1],
-			      [Include SSSE3-accelerated SHA-1 implementation by
-			       Intel.  This implies --without-libcrypto.])],
-	      [ENABLE_SSSE3_SHA1=$enableval],
-	      [ENABLE_SSSE3_SHA1=no])
-AC_MSG_RESULT([$ENABLE_SSSE3_SHA1])
-
-if test "$ENABLE_SSSE3_SHA1" = "yes" ; then
-	AC_DEFINE([ENABLE_SSSE3_SHA1], [1],
-		  [Define to 1 if using SSSE3 implementation of SHA-1])
-	AC_PROG_NASM
-	NASM_SYMBOL_PREFIX=""
-	NASM_PLATFORM_FLAGS=""
-	if test "$WINDOWS_NATIVE_BUILD" = "yes"; then
-		NASM_PLATFORM_FLAGS="-DWIN_ABI"
-	fi
-	case "$host_os" in
-	darwin* | rhapsody* | nextstep* | openstep* | macos*)
-		NASM_SYMBOL_PREFIX="_"
-		;;
-	esac
-	AC_SUBST([NASM_PLATFORM_FLAGS], [$NASM_PLATFORM_FLAGS])
-	AC_SUBST([NASM_SYMBOL_PREFIX], [$NASM_SYMBOL_PREFIX])
-else
-	AC_MSG_CHECKING([whether to use SHA-1 implementation from system libcrypto])
-	AC_ARG_WITH([libcrypto],
-		    [AS_HELP_STRING([--without-libcrypto],
-				    [build in the SHA-1 algorithm, rather than
-				     use external libcrypto from OpenSSL
-				     (default is autodetect)])],
-		    [WITH_LIBCRYPTO=$withval],
-		    [WITH_LIBCRYPTO=auto])
-	AC_MSG_RESULT([$WITH_LIBCRYPTO])
-	if test "$WITH_LIBCRYPTO" != "no"; then
-		PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [
-			PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libcrypto"
-			AC_DEFINE([WITH_LIBCRYPTO], [1],
-				  [Define to 1 if using libcrypto SHA-1])
-		], [AC_MSG_WARN([Cannot find libcrypto: using stand-alone SHA-1 code instead])])
-	fi
-fi
-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],