From 537be4ca47eebddd82615d6f1504aa487669536c Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 27 Sep 2011 17:17:06 +0200
Subject: [PATCH] Remove check for gcry_kdf_derive

This is not anymore required because we require Libgcrypt 1.5.0 which
features this function.
---
 ChangeLog    |  4 ++++
 configure.ac | 33 +++++++++------------------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 475aa0c90..bd0201681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-23  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Remove check for gcry_kdf_derive.
+
 2011-08-10  Werner Koch  <wk@g10code.com>
 
 	* configure.ac: Fix new autoconf warnings.
diff --git a/configure.ac b/configure.ac
index 69c23701c..f71b9e867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,21 +742,6 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
         have_libgcrypt=yes,have_libgcrypt=no)
 
-# FIxme: Remove this test after libgcrypt 1.5.0 has been released.
-AC_CACHE_CHECK([whether Libgcrypt has gcry_kdf_derive],
-                gnupg_cv_gcry_kdf_derive,
-               [ _gnupg_gcry_save_cflags=$CFLAGS
-                 _gnupg_gcry_save_libs=$LIBS
-                 CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
-                 LIBS="$LIBS $LIBGCRYPT_LIBS"
-                 AC_TRY_LINK(
-                   [#include <gcrypt.h>],
-                   [ return gcry_kdf_derive (NULL,0,0,0,NULL,0,0,0,NULL); ],
-                   gnupg_cv_gcry_kdf_derive=yes,
-                   gnupg_cv_gcry_kdf_derive=no)
-                 LIBS=$_gnupg_gcry_save_libs
-                 CFLAGS=$_gnupg_gcry_save_cflags])
-
 
 #
 # libassuan is used for IPC
@@ -1621,15 +1606,15 @@ if test "$have_libgcrypt" = "no"; then
 ***   ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
 *** (at least version $NEED_LIBGCRYPT_VERSION using API $NEED_LIBGCRYPT_API is required.)
 ***]])
-elif test "$gnupg_cv_gcry_kdf_derive" = no; then
-   die=yes
-   AC_MSG_NOTICE([[
-***
-*** Libgcrypt 1.5.0 has not yet been released and thus the API
-*** is a bit in a flux.  Your version misses the function
-***        gcry_kdf_derive
-*** You need to install a newer Libgcrypt version.
-***]])
+dnl elif test "$gnupg_cv_gcry_kdf_derive" = no; then
+dnl    die=yes
+dnl    AC_MSG_NOTICE([[
+dnl ***
+dnl *** Libgcrypt 1.5.0 has not yet been released and thus the API
+dnl *** is a bit in a flux.  Your version misses the function
+dnl ***        gcry_kdf_derive
+dnl *** You need to install a newer Libgcrypt version.
+dnl #***]])
 fi
 if test "$have_libassuan" = "no"; then
    die=yes