summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-10-21 15:16:43 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-10-21 15:23:42 -0700
commit3a684d611ec61f6959ffdd84918717e77486263b (patch)
tree4b6c8a45ecf50a33cd6e1a779810766af13f2f8e
parenta9733794bb48f9d0779df47229210e5cb30d02a4 (diff)
downloadbison-3a684d611ec61f6959ffdd84918717e77486263b.tar.gz
build: examples/calc++/calc++ requires flex
* configure.ac (FLEX_CXX_WORKS): New AM_CONDITIONAL. * examples/calc++/local.mk (examples/calc++/calc++): Build if FLEX_CXX_WORKS, not BISON_CXX_WORKS.
-rw-r--r--configure.ac2
-rw-r--r--examples/calc++/local.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 992e2033..2843b671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,8 @@ $LEX_IS_FLEX || test "X$LEX" = X: || {
AC_MSG_WARN([bypassing lex because flex is required])
LEX=:
}
+AM_CONDITIONAL([FLEX_CXX_WORKS],
+ [$LEX_IS_FLEX && test $bison_cv_cxx_works = yes])
AC_PROG_YACC
AC_PROG_RANLIB
AC_PROG_GNU_M4
diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk
index d1d43a04..493b8c78 100644
--- a/examples/calc++/local.mk
+++ b/examples/calc++/local.mk
@@ -63,7 +63,7 @@ calc_sources = \
$(calc_sources_extracted) \
$(calc_sources_generated)
-if BISON_CXX_WORKS
+if FLEX_CXX_WORKS
check_PROGRAMS += examples/calc++/calc++
nodist_examples_calc___calc___SOURCES = \
$(calc_sources)