X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=288a64b184adf3e5ef2427e0dc64e94c3f153387;hp=26398a9864c23b1501194e9fd984cf3bb2c379cc;hb=1a08ade3f32c5557445562148e897f27ac942e3f;hpb=e9fa56fa6e181ae15282a2fcf0dbfa0b7c59cd81

diff --git a/configure.ac b/configure.ac
index 26398a98..288a64b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,15 @@
-AC_INIT([wimlib], [1.4.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.6.1-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
 
+PKGCONFIG_PRIVATE_REQUIRES=""
+PKGCONFIG_PRIVATE_LIBS=""
+
 AC_ARG_WITH(imagex-progname,
             [AS_HELP_STRING([--with-imagex-progname=NAME],
 			    [Set the name of installed ImageX program (default: wimlib-imagex)])],
@@ -45,7 +48,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_CANONICAL_HOST
 
-AC_CHECK_FUNCS([utimensat lutimes utime flock])
+AC_CHECK_FUNCS([utimensat lutimes utime flock mempcpy])
 
 # 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
@@ -58,6 +61,7 @@ AC_CHECK_HEADERS([alloca.h		\
 		  glob.h		\
 		  machine/endian.h	\
 		  stdarg.h		\
+		  stddef.h		\
 		  stdlib.h		\
 		  sys/byteorder.h	\
 		  sys/endian.h		\
@@ -83,10 +87,8 @@ AC_SUBST(pkgconfigdir)
 
 AC_CHECK_LIB([xml2], [xmlParseFile], [have_libxml=true],
 	     [AC_MSG_ERROR(["cannot find libxml2"])])
-LIBXML2_LDADD=`pkg-config libxml-2.0 --libs`
-LIBXML2_CFLAGS=`pkg-config libxml-2.0 --cflags`
-AC_SUBST([LIBXML2_LDADD], [$LIBXML2_LDADD])
-AC_SUBST([LIBXML2_CFLAGS], [$LIBXML2_CFLAGS])
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
+PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0"
 
 AC_MSG_CHECKING([whether to include debugging messages])
 AC_ARG_ENABLE([debug],
@@ -97,47 +99,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])
@@ -180,14 +155,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
 
@@ -212,12 +187,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])
@@ -230,6 +205,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])
@@ -260,8 +254,9 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 	streams.  You should either install libntfs-3g, or configure with
 	--without-ntfs-3g to disable support for these NTFS-specific
 	features.])])
-	LIBNTFS_3G_LDADD="`pkg-config --libs libntfs-3g`"
-	LIBNTFS_3G_CFLAGS="`pkg-config --cflags libntfs-3g`"
+
+	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 2013.1.13 release
@@ -269,18 +264,11 @@ if test "x$WITH_NTFS_3G" = "xyes"; then
 		      [AC_DEFINE([HAVE_NTFS_MNT_RDONLY],
 				 [1],
 				 [Define to 1 if ntfs_mount() takes the flag NTFS_MNT_RDONLY])],
-		      ,
+		      [],
 		      [#include <ntfs-3g/volume.h>])
-else
-	LIBNTFS_3G_LDADD=
-	LIBNTFS_3G_CFLAGS=
-
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
 
-AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
-AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
-
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
 	AC_MSG_ERROR([Cannot find the iconv() function.
@@ -315,15 +303,12 @@ if test "x$WITH_FUSE" = "xyes"; then
 	version of glibc, or configure with --without-fuse to disable support
 	for mounting WIMs.])
 	])
-	LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt"
-	LIBFUSE_CFLAGS="`pkg-config --cflags fuse`"
-else
-	LIBFUSE_LDADD=
-	LIBFUSE_CFLAGS=
+	PKG_CHECK_MODULES([LIBFUSE], [fuse])
+	PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse"
+	PKGCONFIG_PRIVATE_LIBS="$PKGCONFIG_PRIVATE_LIBS -lrt"
+	AC_SUBST([LIBRT_LIBS], [-lrt])
 fi
 AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
-AC_SUBST([LIBFUSE_LDADD], [$LIBFUSE_LDADD])
-AC_SUBST([LIBFUSE_CFLAGS], [$LIBFUSE_CFLAGS])
 
 ENABLE_XATTR=no
 AC_ARG_ENABLE([xattr],
@@ -350,7 +335,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]
@@ -359,7 +344,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])
@@ -373,7 +358,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],
@@ -387,17 +372,12 @@ AC_MSG_RESULT([$WITH_LIBCRYPTO])
 
 if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then
 	AC_DEFINE([WITH_LIBCRYPTO], [1], [Define to 1 if using libcrypto SHA1])
-	LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null`
-	if test $? -ne 0; then
-		LIBCRYPTO_LDADD=-lcrypto;
-	fi
-	LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null`
-else
-	LIBCRYPTO_LDADD=
-	LIBCRYPTO_CFLAGS=
+	PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
+	PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libcrypto"
 fi
-AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD])
-AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS])
 AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES])
 
+AC_SUBST([PKGCONFIG_PRIVATE_REQUIRES], [$PKGCONFIG_PRIVATE_REQUIRES])
+AC_SUBST([PKGCONFIG_PRIVATE_LIBS], [$PKGCONFIG_PRIVATE_LIBS])
+
 AC_OUTPUT