Build system / directory cleanups

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0e2db09ef805f234b2388b1613402cc62292d86f..df99a32927b4e4adea455a5d7f160f3592acca9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,14 @@
-AC_INIT([wimlib], [0.7.0], [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
 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
@@ -30,6 +28,7 @@ AC_CONFIG_FILES([Makefile
                archlinux/PKGBUILD
                ])
 AC_PROG_CC
+AM_PROG_CC_C_O
 
 
 AM_ICONV
@@ -132,6 +131,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.