summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2017-04-14 09:36:45 -0700
committerGitHub <noreply@github.com>2017-04-14 09:36:45 -0700
commite4f961be0946639eb4356e274268dd9b5e90da9b (patch)
treeed8420c65d9ebbeed9b8f1c981b3af1df0c77f02 /aclocal.m4
parentce040f6c1ef4d31bad8a3ce51a766a0f82c7d2a0 (diff)
downloadcpython-git-e4f961be0946639eb4356e274268dd9b5e90da9b.tar.gz
improve alignment autoconf test (#1129)
Replace the deprecated AC_TRY_RUN with AC_RUN_IFELSE. Also, standardize the variable name and allow for caching of the result.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 9a9cc55728..2a745e5746 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
+dnl serial 11 (pkg-config-0.29.1)
dnl
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -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])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
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