Build system / directory cleanups

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 58ba5cdb1c3fc4f12954ba5a57eba389d30c4640..df99a32927b4e4adea455a5d7f160f3592acca9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,35 @@
-AC_INIT([wimlib], [0.6.2], [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
+               doc/imagex-apply.1
+               doc/imagex-capture.1
+               doc/imagex-delete.1
+               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
 if test "x$am_cv_func_iconv" != "xyes"; then
@@ -22,10 +40,16 @@ if test "x$am_cv_func_iconv" != "xyes"; then
        libraries.])
 fi
 
-LIBXML2_LDADD=`pkg-config libxml-2.0 --libs`
-LIBXML2_CFLAGS=`pkg-config libxml-2.0 --cflags`
+AC_ARG_WITH(pkgconfigdir,
+            [  --with-pkgconfigdir=DIR      pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
+            [pkgconfigdir=$withval],
+            [pkgconfigdir='${libdir}/pkgconfig'])
+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])
 
@@ -107,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.  
@@ -119,8 +157,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.  
@@ -135,6 +171,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=
@@ -182,8 +220,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=