summaryrefslogtreecommitdiffabout
authorBruno Haible <bruno@clisp.org>2019-08-24 12:00:57 (GMT)
committer Bruno Haible <bruno@clisp.org>2019-08-24 12:00:57 (GMT)
commit31e6cd88898a5742b53cf96eb53f7d2ff139f9af (patch) (side-by-side diff)
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog6
-rw-r--r--m4/gc.m49
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 29e279a..bafc87d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2019-08-24 Bruno Haible <bruno@clisp.org>
+ 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.
* lib/gc-gnulib.c: Use '#if GNULIB_GC_*', not '#ifdef GNULIB_GC_*'.
* lib/gc-libgcrypt.c: Likewise.
diff --git a/m4/gc.m4 b/m4/gc.m4
index 954459a..a5d8f92 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 <gcrypt.h>])
+ LIB_CRYPTO="$LIBGCRYPT"
else
AC_MSG_ERROR([libgcrypt not found])
fi
fi
+ AC_SUBST([LIB_CRYPTO])
])

Return to:

Send suggestions and report system problems to the System administrator.