build: examples/calc++/calc++ requires flex
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 21 Oct 2013 22:16:43 +0000 (15:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 21 Oct 2013 22:23:42 +0000 (15:23 -0700)
* configure.ac (FLEX_CXX_WORKS): New AM_CONDITIONAL.
* examples/calc++/local.mk (examples/calc++/calc++):
Build if FLEX_CXX_WORKS, not BISON_CXX_WORKS.

configure.ac
examples/calc++/local.mk

index 992e203..2843b67 100644 (file)
@@ -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
index d1d43a0..493b8c7 100644 (file)
@@ -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)