From 85f4120b6aa485a4a611a06adce8835e95bcb163 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 30 Aug 2012 23:34:49 -0700 Subject: [PATCH] Improve check for Cython version. [#249 state:resolved] --- m4/cython.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/m4/cython.m4 b/m4/cython.m4 index ba6b3cab..e56bfba0 100644 --- a/m4/cython.m4 +++ b/m4/cython.m4 @@ -2,13 +2,14 @@ dnl a macro to check for the installed Cython version; note PYTHON needs to dnl be set before this function is called. dnl CYTHON_CHECK_VERSION([MIN-VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE]) AC_DEFUN([CYTHON_CHECK_VERSION], - [prog="import sys + [prog="import re, sys from Cython.Compiler.Version import version def get_int(arg): - try: - return int(arg) - except ValueError: + matched = re.match(r'\d+', arg) + if matched is None: return 0 + else: + return int(matched.group(0)) # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [[0, 0, 0]] -- 2.40.0