X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=4c1d99cf787c7354c153c37cc1f41ef68307d086;hb=81ea19151423fa87b8698dd3fa8a5274066a76c2;hp=a4a7310e1f5bcb4187b61f785a1667c32a928dbe;hpb=913e4933bf7367409a802329b1e970ac9f5077ce;p=wimlib

diff --git a/configure.ac b/configure.ac
index a4a7310e..4c1d99cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [0.6.3], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [0.7.0], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_CONFIG_MACRO_DIR([m4])
@@ -20,11 +20,12 @@ AC_CONFIG_FILES([Makefile
 		doc/imagex-dir.1
 		doc/imagex-export.1
 		doc/imagex-info.1
+		doc/imagex-join.1
 		doc/imagex-mount.1
 		doc/imagex-mountrw.1
+		doc/imagex-split.1
 		doc/imagex-unmount.1
 		doc/mkwinpeimg.1
-		debian/changelog
 		rpm/wimlib.spec
 		archlinux/PKGBUILD
 		])
@@ -131,6 +132,20 @@ if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
 		   compressed data])
 fi
 
+AC_MSG_CHECKING([whether to include support for copying security data])
+AC_ARG_ENABLE([security_data],
+	      AS_HELP_STRING([--disable-security-data], [disable
+				the ability to retain the security data of
+				existing WIMs]),
+	[ENABLE_SECURITY_DATA=$enableval],
+	[ENABLE_SECURITY_DATA=yes]
+	)
+AC_MSG_RESULT([$ENABLE_SECURITY_DATA])
+if test "x$ENABLE_SECURITY_DATA" = "xyes"; then
+	AC_DEFINE([ENABLE_SECURITY_DATA], [1], [Define to 1 to enable support
+		   for copying security data])
+fi
+
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
 		AS_HELP_STRING([--without-fuse], [build without libfuse.  
@@ -143,8 +158,6 @@ AC_MSG_RESULT([$WITH_FUSE])
 if test "x$WITH_FUSE" = "xyes"; then
 	AC_DEFINE([WITH_FUSE], [1], [Define to 1 if using FUSE.])
 
-	LIBFUSE_LDADD=`pkg-config --libs fuse`
-	LIBFUSE_CFLAGS=`pkg-config --cflags fuse`
 
 	AC_CHECK_LIB([fuse], [fuse_main_real], [have_fuse=true],
 			[AC_MSG_ERROR([Cannot find libfuse.  
@@ -159,6 +172,8 @@ 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=
@@ -206,8 +221,11 @@ 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`
-	LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto`
+	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=