summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--m4/gc.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e9fc3e39f..eae5a5c811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-01-12 Simon Josefsson <simon@josefsson.org>
+ * m4/gc.m4: Check if linking to libgcrypt also needs linking to
+ libgpg-error.
+
+2010-01-12 Simon Josefsson <simon@josefsson.org>
+
* tests/test-xalloc-die.sh: Use $EXEEXT.
2010-01-12 Simon Josefsson <simon@josefsson.org>
diff --git a/m4/gc.m4 b/m4/gc.m4
index b43e30b638..f237d8dd37 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 5
+# gc.m4 serial 6
dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_GC],
AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
libgcrypt=$withval, libgcrypt=no)
if test "$libgcrypt" != no; then
- AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>])
fi
if test "$ac_cv_libgcrypt" = yes; then
AC_LIBOBJ([gc-libgcrypt])