X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=26ff560ce13825e8966ce8994e9a1b6cddc8753b;hp=373fc4b06b0304969666cecf0474abb798093c0e;hb=1ab1842fce2124472f1e5ff3616b71d1cbfd0dbc;hpb=8eb4770392498a1876e6c43e0f4a4459926c1943

diff --git a/configure.ac b/configure.ac
index 373fc4b0..26ff560c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,26 @@ AC_CONFIG_FILES([Makefile
 		doc/Makefile 
 		doc/Doxyfile
 		src/Makefile 
-		programs/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-mount.1
+		doc/imagex-mountrw.1
+		doc/imagex-unmount.1
+		doc/mkwinpeimg.1
+		rpm/wimlib.spec
+		archlinux/PKGBUILD
+		])
 AC_PROG_CC
 
+
 AM_ICONV
 if test "x$am_cv_func_iconv" != "xyes"; then
 	AC_MSG_ERROR([Cannot find the iconv() function.
@@ -22,10 +39,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])
 
@@ -119,8 +142,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 +156,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 +205,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=