diff options
| author | Werner Koch <wk@gnupg.org> | 2011-02-23 16:29:45 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-02-23 16:29:45 +0100 |
| commit | cf8878cb18f3ad830994b77f6ee05b5d47a1c557 (patch) | |
| tree | 5f0bd739624c743b77868f1cdc31ede5c8bb01f1 /m4/libgcrypt.m4 | |
| parent | Fix dirmngr crash (bug#1300) (diff) | |
| download | gnupg2-cf8878cb18f3ad830994b77f6ee05b5d47a1c557.tar.xz gnupg2-cf8878cb18f3ad830994b77f6ee05b5d47a1c557.zip | |
Update gpg-error.m4 and libgcrypt.m4
Diffstat (limited to 'm4/libgcrypt.m4')
| -rw-r--r-- | m4/libgcrypt.m4 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 index 854eaaa8c..831dc0c6f 100644 --- a/m4/libgcrypt.m4 +++ b/m4/libgcrypt.m4 @@ -15,7 +15,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_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.2.5 won't pass the test unless the installed +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using dnl this features allows to prevent build against newer versions of libgcrypt dnl with a changed API. @@ -31,7 +31,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], fi fi - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) + AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` @@ -59,7 +59,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 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 @@ -98,6 +98,21 @@ 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 + AC_MSG_WARN([[ +*** +*** The config script $LIBGCRYPT_CONFIG was +*** built for $libgcrypt_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-libgcrypt-prefix +*** to specify a matching config script. +***]]) + fi + fi + fi else LIBGCRYPT_CFLAGS="" LIBGCRYPT_LIBS="" |