X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=configure;h=a84a60a5cb448fe4b783ab436d974edb7e635852;hb=e6a3f1c78efcdc1b4a153b008302145a95f30edc;hp=d6f9a503abc1849f93712001e513530d0a0bf5ea;hpb=913e4933bf7367409a802329b1e970ac9f5077ce;p=wimlib diff --git a/configure b/configure index d6f9a503..a84a60a5 100755 --- a/configure +++ b/configure @@ -11625,7 +11625,7 @@ CC="$lt_save_CC" ac_config_headers="$ac_config_headers config.h" -ac_config_files="$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-mount.1 doc/imagex-mountrw.1 doc/imagex-unmount.1 doc/mkwinpeimg.1 debian/changelog rpm/wimlib.spec archlinux/PKGBUILD" +ac_config_files="$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-mount.1 doc/imagex-mountrw.1 doc/imagex-unmount.1 doc/mkwinpeimg.1 rpm/wimlib.spec archlinux/PKGBUILD" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13454,8 +13454,6 @@ if test "x$WITH_FUSE" = "xyes"; then $as_echo "#define WITH_FUSE 1" >>confdefs.h - LIBFUSE_LDADD=`pkg-config --libs fuse` - LIBFUSE_CFLAGS=`pkg-config --cflags fuse` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main_real in -lfuse" >&5 $as_echo_n "checking for fuse_main_real in -lfuse... " >&6; } @@ -13550,6 +13548,8 @@ else fi + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -13699,8 +13699,11 @@ if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then $as_echo "#define WITH_LIBCRYPTO 1" >>confdefs.h - 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= @@ -14740,7 +14743,6 @@ do "doc/imagex-mountrw.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-mountrw.1" ;; "doc/imagex-unmount.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-unmount.1" ;; "doc/mkwinpeimg.1") CONFIG_FILES="$CONFIG_FILES doc/mkwinpeimg.1" ;; - "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;; "rpm/wimlib.spec") CONFIG_FILES="$CONFIG_FILES rpm/wimlib.spec" ;; "archlinux/PKGBUILD") CONFIG_FILES="$CONFIG_FILES archlinux/PKGBUILD" ;;