Merge pull request #3741 from stefansaraev/ntfs3g-crypto

ntfs-3g_ntfsprogs: fix gcrypt check in autoreconf
This commit is contained in:
Stefan Saraev 2015-01-03 13:34:45 +02:00
commit 2f2fee5a75

View File

@ -0,0 +1,21 @@
diff --git a/configure.ac b/configure.ac
index 830c5fb..e0d3bac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,7 @@ fi
compile_crypto=false
if test "$enable_crypto" != "no"; then
have_libgcrypt=false
+ m4_ifdef([AM_PATH_LIBGCRYPT],
AM_PATH_LIBGCRYPT(1.2.2, [ have_libgcrypt=true ],
[
if test "$enable_crypto" = "yes"; then
@@ -325,7 +326,7 @@ if test "$enable_crypto" != "no"; then
else
AC_MSG_WARN([ntfsprogs crypto code requires the gcrypt library.])
fi
- ])
+ ]),[have_libgcrypt=false])
have_libgnutls=false
PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.4, [ have_libgnutls=true ],
if test "$enable_crypto" = "yes"; then