Hello again,
Torsdag den 17:e september 2015, klockan 19:13, skrev Pádraig Brady detta:
> On 17/09/15 17:36, Mats Erik Andersson wrote:
>
> Thanks for the patch. However it seems that GCRYPT_VERSION_NUMBER
> has only been available since 1.6.0, so testing for versions before that is
> moot.
> Perhaps using AM_PATH_LIBGCRYPT like is done in the following is better?
> http://lists.freedesktop.org/archives/systemd-devel/2013-May/010885.html
Right! A rewritten patch is herewith suggested. It has been used to
successfully build Shishi on Debian systems with libgcrypt of versions
1.4.5 and 1.6.3. A configuration reject was achieved by asking for 1.6.4!
Best regards,
Mats E Andersson, on behalf of Shishi
>From 040a28d598363d651582d6602cbc85694025c2ed Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <g...@gisladisker.se>
Date: Fri, 25 Sep 2015 14:18:24 +0200
Subject: [PATCH] gc: Fix detection of installed libgcrypt version.
* m4/gc.m4: Use AM_PATH_LIBCRYPT to test for libcrypt versions
at least as recent as 1.4.4. The previously used macro is not
available now, since modules were removed in version 1.6.0.
---
ChangeLog | 7 +++++++
m4/gc.m4 | 22 ++++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3768f3d..7c55198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-25 Mats Erik Andersson <g...@gisladisker.se>
+
+ gc: Fix detection of installed libgcrypt version.
+ * m4/gc.m4: Use AM_PATH_LIBCRYPT to test for libcrypt versions
+ at least as recent as 1.4.4. The previously used macro is not
+ available now, since modules were removed in version 1.6.0.
+
2015-09-25 Paul Eggert <egg...@cs.ucla.edu>
c-ctype: rewrite to use inline functions
diff --git a/m4/gc.m4 b/m4/gc.m4
index 8f7d1d0..42ed827 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,
@@ -11,14 +11,16 @@ AC_DEFUN([gl_GC],
AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
libgcrypt=$withval, libgcrypt=no)
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
-#endif
-])
+ # gc-libgcrypt.c will fail on startup if we don't have
+ # version 1.4.4 or later, so test for it early. */
+ gl_good_gcrypt=no
+ m4_ifdef([AM_PATH_LIBGCRYPT],
+ [AM_PATH_LIBGCRYPT([1.4.4], [gl_good_gcrypt=yes],
+ [AC_MSG_ERROR([libgcrypt is too old])])])
+ if test "x$gl_good_gcrypt" != xno; then
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
+ else
+ AC_MSG_ERROR([libgcrypt not found])
+ fi
fi
])
--
1.7.3.2
