From f0af821fd187309f0bfffbe6e096526a78aa9b33 Mon Sep 17 00:00:00 2001
From: antona <antona>
Date: Mon, 8 Aug 2005 21:17:15 +0000
Subject: [PATCH] Add detection for gnutls and make minimum 1.2.3. Also make
 minimum for libgcrypt 1.2.0.  Don't know if we work with earlier versions.

---
 ChangeLog    |  7 +++++++
 configure.ac | 19 +++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c4a8f53..6b9abdb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+xx/xx/2005 - 1.11.3-WIP
+
+	- Add configure.ac detection for gnutls library and make minimum
+	  version 1.2.3 which is the one that has the rsa key export fixed.
+	- Put in a minimum version for libgcrypt of 1.2.0 as I do not know if
+	  our code works with earlier versions.
+
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 
 	- ntfsls: Fix display of non-system files whose name begins with the
diff --git a/configure.ac b/configure.ac
index 2a4be551..9319b687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.11.2],[linux-ntfs-dev@lists.sourceforge.net])
+AC_INIT([ntfsprogs],[1.11.3-WIP],[linux-ntfs-dev@lists.sourceforge.net])
 AC_CANONICAL_HOST([])
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])
@@ -159,7 +159,8 @@ AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module)
 # Autodetect whether we can build crypto stuff or not.
 compile_crypto=false
 if test "$enable_crypto" != "no"; then
-	AM_PATH_LIBGCRYPT(, [ compile_crypto=true ],
+	have_libgcrypt=false
+	AM_PATH_LIBGCRYPT(1.2.0, [ have_libgcrypt=true ],
 	[
 		if test "$enable_crypto" = "yes"; then
 			AC_MSG_ERROR([Linux-NTFS crypto code requires the gcrypt library.])
@@ -167,6 +168,20 @@ if test "$enable_crypto" != "no"; then
 			AC_MSG_WARN([Linux-NTFS crypto code requires the gcrypt library.])
 		fi
 	])
+	have_libgnutls=false
+	AM_PATH_LIBGNUTLS(1.2.3, [ have_libgnutls=true ],
+	[
+		if test "$enable_crypto" = "yes"; then
+			AC_MSG_ERROR([Linux-NTFS crypto code requires the gnutls library.])
+		else
+			AC_MSG_WARN([Linux-NTFS crypto code requires the gnutls library.])
+		fi
+	])
+	if test "$have_libgcrypt" = "yes"; then
+		if test "$have_libgnutls" = "yes"; then
+			compile_crypto=true
+		fi
+	fi
 fi
 AM_CONDITIONAL(ENABLE_CRYPTO, $compile_crypto)