Dear all,
the m4 script related to gcrypt needs an update,
as release 1.6 of libgcrypt has removed the macro
on which the test is based. We received a bug report
to help-shishi [1] which boils down to this remedy
A suitable patch is included.
Best regards, on behalf of Shishi
Mats Erik Andersson
[1] http://lists.gnu.org/archive/html/help-shishi/2015-09/msg00000.html
>From 70eecce9272602f347bc0df7ce125ba8ea7c23c7 Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <g...@gisladisker.se>
Date: Thu, 17 Sep 2015 13:46:51 +0200
Subject: [PATCH] gc: Fix detection of recent libgcrypt releases.
* m4/gc.m4: Test libcrypt version macro and reject those
earlier than 1.4.4. The macro GCRY_MODULE_ID_USER was
deleted in release 1.6.0. Use a proper `#error' directive.
---
ChangeLog | 7 +++++++
m4/gc.m4 | 11 +++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de20d36..866c1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-17 Mats Erik Andersson <g...@gisladisker.se>
+
+ gc: Fix detection of recent libgcrypt releases.
+ * m4/gc.m4: Test libcrypt version macro and reject those
+ earlier than 1.4.4. The macro GCRY_MODULE_ID_USER was
+ deleted in release 1.6.0. Use a proper `#error' directive.
+
2015-09-08 Assaf Gordon <assafgor...@gmail.com>
ceill: detect buggy OpenBSD implementation
diff --git a/m4/gc.m4 b/m4/gc.m4
index 8f7d1d0..2fe3f35 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 9
+# gc.m4 serial 10
dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,11 +13,10 @@ AC_DEFUN([gl_GC],
if test "$libgcrypt" != no; then
AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
#include <gcrypt.h>
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
- will fail on startup if we don't have 1.4.4 or later, so
- test for it early. */
-#if !defined GCRY_MODULE_ID_USER
-error too old libgcrypt
+/* gc-libgcrypt.c will fail on startup if we don't have 1.4.4
+ or later, so test for this version early on. */
+#if GCRYPT_VERSION_NUMBER < 0x010404
+# error Too old libgcrypt version.
#endif
])
fi
--
1.7.3.2
