X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=c67ca43e9b601c352953d0249e6ec28ba9d9fa93;hp=a1502ea195cb032cd3ec10e3153b161f0724fba1;hb=57f46659cb922a738b13658c8da87c7306160bff;hpb=526aebdef333858fb9f525a859cfa0d041f8fafd

diff --git a/configure.ac b/configure.ac
index a1502ea1..c67ca43e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,14 @@
-AC_INIT([wimlib], [0.6.3], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [0.7.2], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
-AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
 AC_C_BIGENDIAN
-AM_PROG_AR
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile 
-		doc/Makefile 
 		doc/Doxyfile
-		src/Makefile 
-		programs/Makefile
 		wimlib.pc
 		doc/imagex.1
 		doc/imagex-append.1
@@ -20,14 +18,17 @@ 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
 		rpm/wimlib.spec
 		archlinux/PKGBUILD
 		])
 AC_PROG_CC
+AM_PROG_CC_C_O
 
 
 AM_ICONV
@@ -130,6 +131,36 @@ if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
 		   compressed data])
 fi
 
+AC_MSG_CHECKING([whether to include support for ntfs-3g])
+AC_ARG_WITH([ntfs-3g],
+	      AS_HELP_STRING([--without-ntfs-3g], [build without NTFS-3g.
+			      This will disable the ability to use NTFS-specific
+			      information when capturing or applying WIMs to a
+			      NTFS filesystem.]),
+	[WITH_NTFS_3G=$withval],
+	[WITH_NTFS_3G=yes]
+	)
+AC_MSG_RESULT([$WITH_NTFS_3G])
+if test "x$WITH_NTFS_3G" = "xyes"; then
+	AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 to enable support for
+		   NTFS-specific information])
+
+	AC_CHECK_LIB([ntfs-3g], [ntfs_set_file_security], [],
+			[AC_MSG_ERROR([Cannot find libntfs-3g.
+	Without libntfs-3g, wimlib cannot include support for capturing and 
+	applying WIMs on NTFS filesystems while preserving NTFS-specific data
+	such as security descriptors and alternate data 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`"
+else
+	LIBNTFS_3G_LDADD=
+	LIBNTFS_3G_CFLAGS=
+fi
+AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
+AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
+
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
 		AS_HELP_STRING([--without-fuse], [build without libfuse.  
@@ -142,22 +173,22 @@ 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.  
-	Without libfuse, WIMLIB cannot include support for mounting WIMs.  You
+	Without libfuse, wimlib cannot include support for mounting WIMs.  You
 	should either install libfuse, or configure with --without-fuse to
 	disable support for mounting WIMs.])
 	])
 	AC_CHECK_LIB([rt], [mq_open], [have_posix_mq=true],
 		     [AC_MSG_ERROR([Cannot find librt for POSIX message queue
-	functions.  Without these functions, WIMLIB cannot include support for
+	functions.  Without these functions, wimlib cannot include support for
 	mounting WIMs.  You should either update your C library to a recent
 	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=
@@ -205,8 +236,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=