configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 11e7475402861ab2719cfefce35a405298946b71 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Fri Oct 4 17:21:48 2013 +0200
Check for minimum version of flex (2.5.35) since at least 5c2ba4aad61ce2c7c661202ae7ed26e1859c5216 flex 2.5.35 or newer is required, but linux baseline (CentOS 5.9) shippes with older one. Fail in configure/autogen instead of during make Signed-off-by: Stephan Bergmann <sberg...@redhat.com> ...and gracefully cope with Mac OS X flex --version returning "flex 2.5.35 Apple(flex-31)", so just look for the first run of d.d.d when determining the version number Change-Id: Ia5a324474aaa1a45910f50b4a78ab6ce6279575e diff --git a/configure.ac b/configure.ac index efbebc2..65013ae 100644 --- a/configure.ac +++ b/configure.ac @@ -9711,6 +9711,12 @@ fi AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then AC_MSG_ERROR([no flex found in \$PATH, install it]) +else + AC_MSG_CHECKING([the flex version]) + _flex_version=$($FLEX --version | $SED -e 's/^.*\([[[:digit:]]]\{1,\}\.[[[:digit:]]]\{1,\}\.[[[:digit:]]]\{1,\}\).*$/\1/') + if test $(echo $_flex_version | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}') -lt 2005035; then + AC_MSG_ERROR([failed ($FLEX $_flex_version found, but need at least 2.5.35)]) + fi fi AC_SUBST([FLEX]) dnl *************************************** _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits