diff options
| author |   David Carlier <dcarlier@afilias.info> | 2019-05-23 04:32:44 +0000 |
|---|---|---|
| committer |   Inada Naoki <songofacandy@gmail.com> | 2019-05-23 13:32:44 +0900 |
| commit | 51aa35e9e17eef60d04add9619fe2a7eb938358c (patch) | |
| tree | 87251bf2800e940f6872fa45d84342bb1dc455ec /aclocal.m4 | |
| parent | bpo-36763: Fix _PyPreConfig_InitCompatConfig() utf8_mode (GH-13518) (diff) | |
| download | cpython-51aa35e9e17eef60d04add9619fe2a7eb938358c.tar.gz cpython-51aa35e9e17eef60d04add9619fe2a7eb938358c.tar.bz2 cpython-51aa35e9e17eef60d04add9619fe2a7eb938358c.zip | |
bpo-33164: update blake2 implementation (GH-6286)
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 85f00dd5fac..038bd4e2cea 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -55,7 +55,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -187,7 +187,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full |