From 824d7c517893895406cf1d4885f495ba594992d9 Mon Sep 17 00:00:00 2001 From: rliebscher Date: Mon, 30 Jan 2012 20:47:26 +0000 Subject: [PATCH] * configure.ac: fixed detection of yylex_destroy availability by checking the version number of flex git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1049 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 5 +++++ configure.ac | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e05c208e..796cf588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-01-30 Rene Liebscher + + * configure.ac: fixed detection of yylex_destroy availability + by checking the version number of flex + 2012-01-30 Joerg Wunsch * lexer.l: Replace the old, now-defunct #define YY_NO_UNPUT by diff --git a/configure.ac b/configure.ac index 6d909163..5bb71d3e 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AM_CONFIG_HEADER(ac_cfg.h) # Checks for programs. AC_PROG_CC AC_PROG_INSTALL +AC_PROG_SED AC_PROG_YACC AC_PROG_LEX AC_PROG_RANLIB @@ -44,7 +45,26 @@ AH_TEMPLATE([HAVE_YYLEX_DESTROY], [Define if lex/flex has yylex_destroy]) # flex should have this if test "x$LEX" == xflex; then - AC_DEFINE([HAVE_YYLEX_DESTROY]) + AC_MSG_CHECKING([whether yylex_destroy is generated by flex]) + flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'` + case $flex_version in + [[0-1].*)] + AC_MSG_RESULT([version $flex_version => no]) + ;; + [2.[0-4].*)] + AC_MSG_RESULT([version $flex_version => no]) + ;; + [2.5.[0-8])] + AC_MSG_RESULT([version $flex_version => no]) + ;; + [2.5.[0-8][A-Za-z]*)] + AC_MSG_RESULT([version $flex_version => no]) + ;; + *) + AC_MSG_RESULT([version $flex_version => yes]) + AC_DEFINE([HAVE_YYLEX_DESTROY]) + ;; + esac fi dnl Makefile.am:77: compiling `config_gram.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'