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
 ])
ed.scm'>log</a><a href='/guix/tree/gnu/installer/parted.scm?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>tree</a><a href='/guix/commit/gnu/installer/parted.scm?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>commit</a><a href='/guix/diff/gnu/installer/parted.scm?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/parted.scm'>
<input type='hidden' name='id' value='7758d5205c79a29d0d95ca03b08db548d1be12df'/><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=7758d5205c79a29d0d95ca03b08db548d1be12df'>root</a>/<a href='/guix/log/gnu?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>gnu</a>/<a href='/guix/log/gnu/installer?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>installer</a>/<a href='/guix/log/gnu/installer/parted.scm?id=7758d5205c79a29d0d95ca03b08db548d1be12df'>parted.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/installer/parted.scm?id=7758d5205c79a29d0d95ca03b08db548d1be12df&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-25 16:03:23 +0200'>2019-09-25</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=70c7b7c79920dd6500ba5e4e88fe147cc44923d8'>installer: Update to Guile-Parted 0.0.2 release.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2019-06-05 17:27:22 +0200'>2019-06-05</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=0b051bacb34dbd5218f3342c47129b5ed676f155'>installer: Always add '%base-initrd-modules' to 'initrd-modules'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-19 11:58:36 +0200'>2019-05-19</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=d68de958b60426798ed62797ff7c96c327a672ac'>installer: Fix Guile-Parted crash on i686.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-15 16:36:20 +0200'>2019-05-15</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=15374648193f813d036f377bb1e944c9bafd4636'>installer: Rename 'auto-partition' to 'auto-partition!'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-14 18:01:09 +0200'>2019-05-14</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=b7488b321d551277ea5a62c7dfa6d565e6986958'>installer: Fix docstring.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-05-14 18:01:08 +0200'>2019-05-14</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=628d09ae53047ea666f4f84ae5e5be911647fe8c'>installer: Add fat16.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-05-14 00:44:03 +0200'>2019-05-14</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=c5b1377840c3397e73de0d9f29bce60f8a91c286'>installer: Create btrfs file system.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-03-27 11:54:05 +0100'>2019-03-27</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=50247be5f4633a4c3446cddbd3515d027853ec0d'>installer: Produce an 'initrd-modules' field if needed.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-27 11:54:05 +0100'>2019-03-27</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=54043bf23f9b1a012f26082f57286862c5029865'>installer: Emit 'bootloader' field before 'swap-devices'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-25 23:37:05 +0100'>2019-03-25</span></td><td><a href='/guix/commit/gnu/installer/parted.scm?id=3191b5f6ba5ebbb59a7448facd999ad7f7aeae79'>installer: Set the system's 'keyboard-layout' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>