[SCM] GNU shishi branch, master, updated. shishi-1-0-2-60-g9c25ada

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=9c25ada05f34f1434d5eed472023225907040f4d

The branch, master has been updated
       via  9c25ada05f34f1434d5eed472023225907040f4d (commit)
      from  485d3bd8fdfa2e887d757197d3490ac1911cc915 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c25ada05f34f1434d5eed472023225907040f4d
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Sep 25 17:05:10 2015 +0200

    Update gcrypt detection with m4-macro from gnulib.
    
    Building with libgcrypt of version 1.6.0 or later
    fails without this updated probing.

-----------------------------------------------------------------------

Summary of changes:
 gl/m4/gc.m4 |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
index 1f1e778..42ed827 100644
--- a/gl/m4/gc.m4
+++ b/gl/m4/gc.m4
@@ -1,5 +1,5 @@
-# gc.m4 serial 9
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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
 ])


hooks/post-receive
-- 
GNU shishi