build broken with --enable-gcrypt

[Richard Henderson <richard.henderson@linaro.org>]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

The meson conversion seems to have not been properly accomplished for the
gcrypt option: we fail to link against -lgcrypt.

I tried aping the nettle bits, like the following, but it has no effect.  I
don't understand how the "nettle" token works, honestly, since it doesn't
appear to be used at all.


r~




[-- Attachment #2: z.txt --]
[-- Type: text/plain, Size: 1151 bytes --]

diff --git a/configure b/configure
index b1e11397a8..4fd50c0275 100755
--- a/configure
+++ b/configure
@@ -6972,6 +6972,8 @@ if test "$gcrypt" = "yes" ; then
   if test "$gcrypt_hmac" = "yes" ; then
     echo "CONFIG_GCRYPT_HMAC=y" >> $config_host_mak
   fi
+  echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak
+  echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak
 fi
 if test "$nettle" = "yes" ; then
   echo "CONFIG_NETTLE=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index f0fe5f8799..d45c548191 100644
--- a/meson.build
+++ b/meson.build
@@ -108,6 +108,11 @@ if 'CONFIG_NETTLE' in config_host
   nettle = declare_dependency(compile_args: config_host['NETTLE_CFLAGS'].split(),
                               link_args: config_host['NETTLE_LIBS'].split())
 endif
+gcrypt = not_found
+if 'CONFIG_GCRYPT' in config_host
+  gcrypt = declare_dependency(compile_args: config_host['GCRYPT_CFLAGS'].split(),
+                              link_args: config_host['GCRYPT_LIBS'].split())
+endif
 gnutls = not_found
 if 'CONFIG_GNUTLS' in config_host
   gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(),