summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-08-24 14:00:57 +0200
committerBruno Haible <bruno@clisp.org>2019-08-24 14:00:57 +0200
commit31e6cd88898a5742b53cf96eb53f7d2ff139f9af (patch)
treec9496e4f2e0a2c85f8b4bb656278ff4310d96f4e
parenta92abe38de441a080045926840f856ee9f651dbb (diff)
downloadgnulib-31e6cd88898a5742b53cf96eb53f7d2ff139f9af.tar.gz
gnulib-31e6cd88898a5742b53cf96eb53f7d2ff139f9af.tar.bz2
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.
-rw-r--r--ChangeLog6
-rw-r--r--m4/gc.m49
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 29e279aded..bafc87d6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,2 +2,8 @@
+ 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 <bruno@clisp.org>
+
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,2 +1,2 @@
-# gc.m4 serial 11
+# gc.m4 serial 12
dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
@@ -8,3 +8,2 @@ AC_DEFUN([gl_GC],
[
- AC_SUBST([LIB_CRYPTO])
AC_ARG_WITH([libgcrypt],
@@ -17,5 +16,8 @@ AC_DEFUN([gl_GC],
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 <gcrypt.h>])
+ LIB_CRYPTO="$LIBGCRYPT"
else
@@ -24,2 +26,3 @@ AC_DEFUN([gl_GC],
fi
+ AC_SUBST([LIB_CRYPTO])
])

Return to:

Send suggestions and report system problems to the System administrator.