Mercurial > hg > octave-shane > gnulib-hg
changeset 16864:a5e99ec857bb
gc: fix libgcrypt detection on older machines.
* m4/gc.m4: Reject libgcrypt earlier than 1.4.4. Collapse
copyright years because the file has been distributed every year
since it was created.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Mon, 21 May 2012 16:03:01 +0200 |
| parents | 47b969df6626 |
| children | 6fd57016a5fd |
| files | ChangeLog m4/gc.m4 |
| diffstat | 2 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-21 Simon Josefsson <simon@josefsson.org> + + * m4/gc.m4: Reject libgcrypt earlier than 1.4.4. Collapse + copyright years because the file has been distributed every year + since it was created. + 2012-05-18 Paul Eggert <eggert@cs.ucla.edu> crypto: fix bug in large buffer handling
--- a/m4/gc.m4 +++ b/m4/gc.m4 @@ -1,5 +1,5 @@ -# gc.m4 serial 8 -dnl Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. +# gc.m4 serial 9 +dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,6 +10,14 @@ 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], [gpg-error], [#include <gcrypt.h>]) + AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [ +#include <gcrypt.h> +/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c + will fail on startup if we don't have 1.4.4 or later, so + test for it early. */ +#if !defined GCRY_MODULE_ID_USER +error too old libgcrypt +#endif +]) fi ])