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
@@ -1,5 +1,11 @@
12019-08-24 Bruno Haible <bruno@clisp.org> 12019-08-24 Bruno Haible <bruno@clisp.org>
2 2
3 crypto/gc: Fix link error with --with-libgcrypt.
4 * m4/gc.m4 (gl_GC): Set LIB_CRYPTO to the value found by the
5 AC_LIB_HAVE_LINKFLAGS invocation.
6
72019-08-24 Bruno Haible <bruno@clisp.org>
8
3 crypto/gc: Access the module indicators correctly. 9 crypto/gc: Access the module indicators correctly.
4 * lib/gc-gnulib.c: Use '#if GNULIB_GC_*', not '#ifdef GNULIB_GC_*'. 10 * lib/gc-gnulib.c: Use '#if GNULIB_GC_*', not '#ifdef GNULIB_GC_*'.
5 * lib/gc-libgcrypt.c: Likewise. 11 * lib/gc-libgcrypt.c: Likewise.
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 @@
1# gc.m4 serial 11 1# gc.m4 serial 12
2dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl 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.
6 6
7AC_DEFUN([gl_GC], 7AC_DEFUN([gl_GC],
8[ 8[
9 AC_SUBST([LIB_CRYPTO])
10 AC_ARG_WITH([libgcrypt], 9 AC_ARG_WITH([libgcrypt],
11 AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]), 10 AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
12 libgcrypt=$withval, libgcrypt=no) 11 libgcrypt=$withval, libgcrypt=no)
@@ -15,11 +14,15 @@ AC_DEFUN([gl_GC],
15 # version 1.4.4 or later, so test for it early. */ 14 # version 1.4.4 or later, so test for it early. */
16 gl_good_gcrypt=no 15 gl_good_gcrypt=no
17 AM_PATH_LIBGCRYPT([1.4.4], [gl_good_gcrypt=yes], 16 AM_PATH_LIBGCRYPT([1.4.4], [gl_good_gcrypt=yes],
18 [AC_MSG_ERROR([libgcrypt is too old])]) 17 [AC_MSG_ERROR([libgcrypt is too old])])
19 if test "x$gl_good_gcrypt" != xno; then 18 if test "x$gl_good_gcrypt" != xno; then
19 dnl Ignore the value of LIBGCRYPT_LIBS, because it does not include
20 dnl '-lgpg-error'.
20 AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>]) 21 AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
22 LIB_CRYPTO="$LIBGCRYPT"
21 else 23 else
22 AC_MSG_ERROR([libgcrypt not found]) 24 AC_MSG_ERROR([libgcrypt not found])
23 fi 25 fi
24 fi 26 fi
27 AC_SUBST([LIB_CRYPTO])
25]) 28])

Return to:

Send suggestions and report system problems to the System administrator.