From c893f06f0492774550d2754d82319a4d73d77e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnim=20L=C3=A4uger?= Date: Sun, 17 Feb 2008 16:55:58 +0000 Subject: [PATCH] check for pre-generated src/svf/svf_flex.c -> second part of [ 1895353 ] git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1042 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 2 ++ jtag/configure.ac | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 2a58d789..89321ee4 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,7 @@ 2008-02-17 Arnim Laeuger + * configure.ac: check for pre-generated src/svf/svf_flex.c + -> second part of [ 1895353 ] * src/bsdl/Makefile.am (noinst_HEADERS): bsdl_sysdep.h added for proper release packing -> first part of [ 1895353 ] diff --git a/jtag/configure.ac b/jtag/configure.ac index 8d19ac03..d7e03719 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -314,9 +314,17 @@ AS_IF([test "$LEX" == flex], [ AM_CONDITIONAL([BISON_LOCATIONS], true) bison_locations=yes ], [ - AC_MSG_RESULT([no - flex $flex_version]) - AM_CONDITIONAL([BISON_LOCATIONS], false) - bison_locations=no + AS_IF([test -r src/svf/svf_flex.c], [ + # If the transformed svf_flex.c is already existing, it shouldn't matter + # that flex is too old for building a lexer with bison locations + AC_MSG_RESULT([using pre-generated src/svf/svf_flex.c]) + AM_CONDITIONAL([BISON_LOCATIONS], false) + bison_locations="as is" + ], [ + AC_MSG_RESULT([no - flex $flex_version]) + AM_CONDITIONAL([BISON_LOCATIONS], false) + bison_locations=no + ]) ]) # bsdl lexer requires flex >= 2.5.33