From 31e6cd88898a5742b53cf96eb53f7d2ff139f9af Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 24 Aug 2019 14:00:57 +0200 Subject: [PATCH] crypto/gc: Fix link error with --with-libgcrypt. * m4/gc.m4 (gl_GC): Set LIB_CRYPTO to the value found by the AC_LIB_HAVE_LINKFLAGS invocation. --- ChangeLog | 6 ++++++ m4/gc.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29e279aded..bafc87d6cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-08-24 Bruno Haible + + crypto/gc: Fix link error with --with-libgcrypt. + * m4/gc.m4 (gl_GC): Set LIB_CRYPTO to the value found by the + AC_LIB_HAVE_LINKFLAGS invocation. + 2019-08-24 Bruno Haible crypto/gc: Access the module indicators correctly. diff --git a/m4/gc.m4 b/m4/gc.m4 index 954459a694..a5d8f92b71 100644 --- a/m4/gc.m4 +++ b/m4/gc.m4 @@ -1,4 +1,4 @@ -# gc.m4 serial 11 +# gc.m4 serial 12 dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_GC], [ - AC_SUBST([LIB_CRYPTO]) AC_ARG_WITH([libgcrypt], AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]), libgcrypt=$withval, libgcrypt=no) @@ -15,11 +14,15 @@ AC_DEFUN([gl_GC], # version 1.4.4 or later, so test for it early. */ gl_good_gcrypt=no AM_PATH_LIBGCRYPT([1.4.4], [gl_good_gcrypt=yes], - [AC_MSG_ERROR([libgcrypt is too old])]) + [AC_MSG_ERROR([libgcrypt is too old])]) if test "x$gl_good_gcrypt" != xno; then + dnl Ignore the value of LIBGCRYPT_LIBS, because it does not include + dnl '-lgpg-error'. AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include ]) + LIB_CRYPTO="$LIBGCRYPT" else AC_MSG_ERROR([libgcrypt not found]) fi fi + AC_SUBST([LIB_CRYPTO]) ]) -- 2.39.5