ntfs-3g_ntfsprogs: fix last commit

This commit is contained in:
Stefan Saraev 2015-01-03 15:36:44 +02:00 committed by Stephan Raue
parent 5296184c9a
commit 1eccdf9b3f

View File

@ -1,21 +1,20 @@
diff --git a/configure.ac b/configure.ac
index 830c5fb..e0d3bac 100644
index 830c5fb..f9ce6a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,7 @@ fi
@@ -318,14 +318,6 @@ 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
- AM_PATH_LIBGCRYPT(1.2.2, [ have_libgcrypt=true ],
- [
- if test "$enable_crypto" = "yes"; then
- AC_MSG_ERROR([ntfsprogs crypto code requires the gcrypt library.])
- 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