From bb6d1b48f61d483fc75a17b4d140c489afe43ef0 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 1 Mar 2011 14:28:59 +0100 Subject: [PATCH] Update some M4 files and AUTHORS. --- AUTHORS | 8 ++++++-- ChangeLog | 4 ++++ configure.ac | 2 +- m4/ChangeLog | 4 ++++ m4/gpg-error.m4 | 13 ++++++------- m4/ksba.m4 | 20 +++++++++++++++++--- m4/libgcrypt.m4 | 13 ++++++------- 7 files changed, 44 insertions(+), 20 deletions(-) diff --git a/AUTHORS b/AUTHORS index de27957d2..d690e77b7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,6 +14,8 @@ Ales Nyakhaychyk Translations [be] Andrey Jivsov Assigns past and future changes for ECC. (g10/ecdh.c. other changes to support ECC) +Ben Kibbey Assigns past and future changes. + Birger Langkjer Translations [da] Maxim Britov Translations [ru] @@ -123,6 +125,8 @@ Werner Koch Assigns GNU Privacy Guard and future changes. Yosiaki IIDA Translations [ja] +Yutaka Niibe Assigns Past and Future Changes + (scd/) Other authors @@ -145,7 +149,7 @@ by Colin Tuckley and Daniel Leidert for the GNU/Debian distribution. Copyright ========= -GnuPG is distributed under the GNU General Public License, version 2 +GnuPG is distributed under the GNU General Public License, version 3 or later. A few files are under the Lesser General Public License, a few other files carry the all permissive license note as found at the bottom of this file. Certain files in keyserver/ allow one specific @@ -168,7 +172,7 @@ name gpg2keys_*. ========= Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2010 Free Software Foundation, Inc. + 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/ChangeLog b/ChangeLog index 17d049f99..4acd1213e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-02-25 Werner Koch + + * configure.ac: Require libksba 1.2. + 2011-02-04 Werner Koch * autogen.sh: Ensure that the git pre-commit hoom has been diff --git a/configure.ac b/configure.ac index f79ff53e9..e372d33ad 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ NEED_LIBASSUAN_API=2 NEED_LIBASSUAN_VERSION=2.0.0 NEED_KSBA_API=1 -NEED_KSBA_VERSION=1.1.0 +NEED_KSBA_VERSION=1.2.0 PACKAGE=$PACKAGE_NAME diff --git a/m4/ChangeLog b/m4/ChangeLog index c63346893..29af1fbd6 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2011-02-25 Werner Koch + + * ksba.m4: Update from git master. + 2011-02-23 Werner Koch * libgcrypt.m4, gpg-error.m4: Update from their GIT masters. diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index 8d8292562..2e5a0abce 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -1,5 +1,5 @@ # gpg-error.m4 - autoconf macro to detect libgpg-error. -# Copyright (C) 2002, 2003, 2004 g10 Code GmbH +# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -14,7 +14,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS dnl AC_DEFUN([AM_PATH_GPG_ERROR], -[ AC_ARG_WITH(gpg-error-prefix, +[ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_WITH(gpg-error-prefix, AC_HELP_STRING([--with-gpg-error-prefix=PFX], [prefix where GPG Error is installed (optional)]), gpg_error_config_prefix="$withval", gpg_error_config_prefix="") @@ -53,10 +54,9 @@ AC_DEFUN([AM_PATH_GPG_ERROR], GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) - if test x"$host" != x ; then - gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` - if test x"$gpg_error_config_host" != xnone ; then - if test x"$gpg_error_config_host" != x"$host" ; then + gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` + if test x"$gpg_error_config_host" != xnone ; then + if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ *** *** The config script $GPG_ERROR_CONFIG was @@ -65,7 +65,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], *** You may want to use the configure option --with-gpg-error-prefix *** to specify a matching config script. ***]]) - fi fi fi else diff --git a/m4/ksba.m4 b/m4/ksba.m4 index 110038755..73b2e26d1 100644 --- a/m4/ksba.m4 +++ b/m4/ksba.m4 @@ -15,13 +15,14 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed dnl with the API version to also check the API compatibility. Example: -dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed +dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using dnl this features allows to prevent build against newer versions of libksba dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], -[ AC_ARG_WITH(ksba-prefix, +[AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_WITH(ksba-prefix, AC_HELP_STRING([--with-ksba-prefix=PFX], [prefix where KSBA is installed (optional)]), ksba_config_prefix="$withval", ksba_config_prefix="") @@ -60,7 +61,7 @@ AC_DEFUN([AM_PATH_KSBA], sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` if test "$major" -gt "$req_major"; then ok=yes - else + else if test "$major" -eq "$req_major"; then if test "$minor" -gt "$req_minor"; then ok=yes @@ -99,6 +100,19 @@ AC_DEFUN([AM_PATH_KSBA], KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags` KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs` ifelse([$2], , :, [$2]) + libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none` + if test x"$libksba_config_host" != xnone ; then + if test x"$libksba_config_host" != x"$host" ; then + AC_MSG_WARN([[ +*** +*** The config script $LIBKSBA_CONFIG was +*** built for $libksba_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-libksba-prefix +*** to specify a matching config script. +***]]) + fi + fi else KSBA_CFLAGS="" KSBA_LIBS="" diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 index 831dc0c6f..6cf482fcb 100644 --- a/m4/libgcrypt.m4 +++ b/m4/libgcrypt.m4 @@ -1,5 +1,5 @@ dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. dnl dnl This file is free software; as a special exception the author gives dnl unlimited permission to copy and/or distribute it, with or without @@ -21,7 +21,8 @@ dnl this features allows to prevent build against newer versions of libgcrypt dnl with a changed API. dnl AC_DEFUN([AM_PATH_LIBGCRYPT], -[ AC_ARG_WITH(libgcrypt-prefix, +[ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_WITH(libgcrypt-prefix, AC_HELP_STRING([--with-libgcrypt-prefix=PFX], [prefix where LIBGCRYPT is installed (optional)]), libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") @@ -98,10 +99,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ifelse([$2], , :, [$2]) - if test x"$host" != x ; then - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then + if test x"$libgcrypt_config_host" != x"$host" ; then AC_MSG_WARN([[ *** *** The config script $LIBGCRYPT_CONFIG was @@ -110,7 +110,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], *** You may want to use the configure option --with-libgcrypt-prefix *** to specify a matching config script. ***]]) - fi fi fi else