diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/gpg-error.m4 | 13 | ||||
| -rw-r--r-- | m4/ksba.m4 | 2 | ||||
| -rw-r--r-- | m4/libassuan.m4 | 2 | ||||
| -rw-r--r-- | m4/libgcrypt.m4 | 6 |
5 files changed, 20 insertions, 7 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index b9c3688ee..b699f4c69 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2007-05-09 Werner Koch <wk@g10code.com> + + * gpg-error.m4, ksba.m4, libassuan.m4, libgcrypt.m4: Updated. + 2007-05-07 gettextize <bug-gnu-gettext@gnu.org> * gettext.m4: Upgrade to gettext-0.16.1. diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index a5875f004..9d96d1675 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -1,4 +1,13 @@ -dnl Autoconf macros for libgpg-error +# gpg-error.m4 - autoconf macro to detect libgpg-error. +# Copyright (C) 2002, 2003, 2004 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 +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) @@ -42,7 +51,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR], if test $ok = yes; then GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) else GPG_ERROR_CFLAGS="" diff --git a/m4/ksba.m4 b/m4/ksba.m4 index e44b078c2..110038755 100644 --- a/m4/ksba.m4 +++ b/m4/ksba.m4 @@ -75,7 +75,7 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes ($ksba_config_version)]) else AC_MSG_RESULT(no) fi diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 index e099b666d..004eee392 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -74,7 +74,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], fi if test $ok = yes; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes ($libassuan_version)]) else AC_MSG_RESULT(no) fi diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 index 20bd10556..854eaaa8c 100644 --- a/m4/libgcrypt.m4 +++ b/m4/libgcrypt.m4 @@ -74,7 +74,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], fi fi if test $ok = yes; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes ($libgcrypt_config_version)]) else AC_MSG_RESULT(no) fi @@ -86,10 +86,10 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBGCRYPT API version]) if test "$req_libgcrypt_api" -eq "$tmp" ; then - AC_MSG_RESULT(okay) + AC_MSG_RESULT([okay]) else ok=no - AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)]) + AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) fi fi fi |