Fix building of Shishi with libgcrypt 1.6 and later.

Patch copied from Debian:

https://anonscm.debian.org/cgit/collab-maint/shishi.git/tree/debian/patches/fix_gcrypt_detection.diff?id=948301ae648a542a408da250755aeed58a6e3542

Description: Fix autoconf gnutls detection to also accept gcrypt 1.6.
Author: Andreas Metzler <ametzler@debian.org>
Bug-Debian: http://bugs.debian.org/753150
Origin: vendor
Forwarded: no
Last-Update: 2014-07-18

--- shishi-1.0.2.orig/gl/m4/gc.m4
+++ shishi-1.0.2/gl/m4/gc.m4
@@ -12,10 +12,12 @@ 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
+/* gc-libgcrypt.c will fail on startup if we don't have libgcrypt 1.4.4 or
+   later, test for it early. by checking for either
+   - GCRY_MODULE_ID_USER which was added in 1.4.4 and dropped in 1.6 or
+   - GCRYPT_VERSION_NUMBER which was added in 1.6.
+   */
+#if !defined GCRY_MODULE_ID_USER && !defined GCRYPT_VERSION_NUMBER
 error too old libgcrypt
 #endif
 ])
570947a8d6fc1acd380151e91a65cf4a6bb'>tree</a><a href='/guix/commit/gnu.scm?id=cab66570947a8d6fc1acd380151e91a65cf4a6bb'>commit</a><a href='/guix/diff/gnu.scm?id=cab66570947a8d6fc1acd380151e91a65cf4a6bb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu.scm'>
<input type='hidden' name='id' value='cab66570947a8d6fc1acd380151e91a65cf4a6bb'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=cab66570947a8d6fc1acd380151e91a65cf4a6bb'>root</a>/<a href='/guix/log/gnu.scm?id=cab66570947a8d6fc1acd380151e91a65cf4a6bb'>gnu.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu.scm?id=cab66570947a8d6fc1acd380151e91a65cf4a6bb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-25 19:11:37 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu.scm?id=d51bfe242fbe6f3f8f71d723e8fe0c7bbe711ba1'>Use 'formatted-message' instead of '&amp;message' where appropriate.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu.scm (%try-use-modules): Use 'formatted-message' instead of
'&amp;message'.
* gnu/machine/digital-ocean.scm (maybe-raise-unsupported-configuration-error):
Likewise.
* gnu/machine/ssh.scm (machine-check-file-system-availability): Likewise.
(machine-check-building-for-appropriate-system): Likewise.
(deploy-managed-host): Likewise.
(maybe-raise-unsupported-configuration-error): Likewise.
* gnu/packages.scm (search-patch): Likewise.
* gnu/services.scm (%service-with-default-value): Likewise.
(files-&gt;etc-directory): Likewise.
(fold-services): Likewise.
* gnu/system.scm (locale-name-&gt;definition*): Likewise.
* gnu/system/mapped-devices.scm (check-device-initrd-modules): Likewise.
(check-luks-device): Likewise.
* guix/channels.scm (latest-channel-instance): Likewise.
* guix/cve.scm (json-&gt;cve-items): Likewise.
* guix/git-authenticate.scm (commit-signing-key): Likewise.
(commit-authorized-keys): Likewise.
(authenticate-commit): Likewise.
(verify-introductory-commit): Likewise.
* guix/remote.scm (remote-pipe-for-gexp): Likewise.
* guix/scripts/graph.scm (assert-package): Likewise.
* guix/scripts/offload.scm (private-key-from-file*): Likewise.
* guix/ssh.scm (authenticate-server*): Likewise.
(open-ssh-session): Likewise.
(remote-inferior): Likewise.
* guix/ui.scm (matching-generations): Likewise.
* guix/upstream.scm (package-update): Likewise.
* tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"):
Catch 'formatted-message?'.
("authenticate-channel, wrong first commit signer"): Likewise.
* tests/lint.scm ("patches: not found"): Adjust message string.
* tests/packages.scm ("patch not found yields a run-time error"): Catch
'formatted-message?'.
* guix/lint.scm (check-patch-file-names): Handle 'formatted-message?'.
(check-derivation): Ditto.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-07-25 19:11:36 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu.scm?id=f9a8dd053c4e0fd1fc4b64291bb90de36520b3bc'>utils: Move '&amp;fix-hint' to (guix diagnostics).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/utils.scm (&amp;fix-hint): Move to...
* guix/diagnostics.scm (&amp;fix-hint): ... here.
* gnu.scm: Adjust imports accordingly.
* gnu/system/mapped-devices.scm: Likewise.
* guix/channels.scm: Likewise.
* guix/profiles.scm: Likewise.
* guix/scripts/system/reconfigure.scm: Likewise.
* guix/ssh.scm: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-07-25 19:11:36 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu.scm?id=a5e2fc73760a2ae023f2e56bdbf8025971f90e64'>utils: Move &lt;location&gt; and '&amp;error-location' to (guix diagnostics).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/utils.scm (&lt;location&gt;, source-properties-&gt;location)
(location-&gt;source-properties, &amp;error-location): Move to...
* guix/diagnostics.scm: ... here.
* gnu.scm: Adjust imports accordingly.
* gnu/machine.scm: Likewise.
* gnu/system.scm: Likewise.
* gnu/tests.scm: Likewise.
* guix/inferior.scm: Likewise.
* tests/channels.scm: Likewise.
* tests/packages.scm: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>