X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=3e076173dec796c0154b16a5bea78bbc322cb57f;hp=b593c43c46e8ae740cc6059f15fdd7bbcd7fb83a;hb=61ac5994e9fe3666d1c057dafca8c79406c59077;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518

diff --git a/configure.ac b/configure.ac
index b593c43c..3e076173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.4.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.5.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -7,6 +7,9 @@ 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,10 +48,27 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_CANONICAL_HOST
 
-AC_CHECK_FUNCS([utimensat lutimes utime flock])
-AC_CHECK_HEADERS([endian.h byteswap.h sys/byteorder.h sys/endian.h \
-		  sys/param.h machine/endian.h alloca.h stdlib.h stdarg.h \
-		  errno.h attr/xattr.h utime.h sys/file.h glob.h])
+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
+# including certain headers.
+AC_CHECK_HEADERS([alloca.h		\
+		  attr/xattr.h		\
+		  byteswap.h		\
+		  endian.h		\
+		  errno.h		\
+		  glob.h		\
+		  machine/endian.h	\
+		  stdarg.h		\
+		  stdlib.h		\
+		  sys/byteorder.h	\
+		  sys/endian.h		\
+		  sys/file.h		\
+		  sys/param.h		\
+		  sys/times.h		\
+		  time.h		\
+		  utime.h])
 
 AC_CHECK_MEMBER([struct stat.st_mtim],
 		[AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1],
@@ -66,10 +86,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],
@@ -185,6 +203,7 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
+ENABLE_XATTR_DEFAULT="autodetect"
 
 case "$host" in
 	*-*-mingw*)
@@ -197,6 +216,7 @@ case "$host" in
 		WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
 		WINDOWS_LDFLAGS="-no-undefined"
 		WINDOWS_LDADD="-lshlwapi"
+		ENABLE_XATTR_DEFAULT="no"
 		;;
  	*-*-cygwin*)
 		# Cygwin (WARNING: not well supported)
@@ -211,6 +231,24 @@ case "$host" in
 		;;
 esac
 
+AC_ARG_WITH([ntdll],
+	    AS_HELP_STRING([--without-ntdll], [Windows only:  do not link with
+			    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 -lntdll"
+		AC_DEFINE([WITH_NTDLL], [1], [Define to 1 if linking with ntdll])
+	fi
+fi
+
 AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
 AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
 AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
@@ -241,8 +279,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
@@ -250,18 +289,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.
@@ -296,30 +328,29 @@ 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],
 	[AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
 			alternate data streams (default: autodetect)])],
 	[ENABLE_XATTR=$enableval],
-	[AC_CHECK_FUNC([setxattr],
-		[AC_CHECK_HEADER([attr/xattr.h],
-			[ENABLE_XATTR=yes],
-			[AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
+	[if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
+		AC_CHECK_FUNC([setxattr],
+			[AC_CHECK_HEADER([attr/xattr.h],
+				[ENABLE_XATTR=yes],
+				[AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
+				 able to use the xattr interface to access WIM alternate data
+				 streams.])])],
+			[AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
 			 able to use the xattr interface to access WIM alternate data
-			 streams.])])],
-		[AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
-		 able to use the xattr interface to access WIM alternate data
-		 streams.])])])
+			 streams.])])
+	fi])
 
 if test "x$ENABLE_XATTR" = "xyes"; then
 	AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
@@ -366,17 +397,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