Cleanup: bison and flex detection

The previous detection code was quite convoluted and required to have
two variables set to the same value to work. For example, the lexer in
autotools is configured through the LEX variable, even if we require a
specific implementation we have to use it and base our detection code on
it.

The situation is now :

  - the FLEX and BISON variables are now ignored.
  - the LEX and YACC variables need to be set if required like before.

Also some minor cleanups.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 5ee539766432dccbe8512777eb44de4736b31a95..42f7c57834dd3a76a9c52d52414c530816ee6e0c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,20 +24,67 @@ AC_PROG_CC_STDC
 
 # Checks for programs.
 AC_PROG_GREP
-AC_PROG_LEX
 AC_PROG_MAKE_SET
 AC_PROG_SED
-AC_PROG_YACC
-AC_PATH_PROG(report_fold, fold)
+AC_PATH_PROG([report_fold], [fold])
 LT_INIT
 
 # Check for objcopy, required by the base address statedump and dynamic linker tests
-AC_CHECK_TOOL([OBJCOPY], objcopy, no)
-AS_IF([test "x$OBJCOPY" = xno],
-       [AC_MSG_WARN([Cannont find objcopy. The base address statedump and dynamic linker tests will be disabled. Install the binutils package to remediate this.])]
+AC_CHECK_TOOL([OBJCOPY], [objcopy], [no])
+AS_IF([test "x$OBJCOPY" = "xno"],
+       [AC_MSG_WARN([Cannot find objcopy. The base address statedump and dynamic linker tests will be disabled. Install the binutils package to remediate this.])]
 )
 AM_CONDITIONAL([HAVE_OBJCOPY], [test "x$OBJCOPY" != xno])
 
+# check for pgrep
+AC_PATH_PROG([PGREP], [pgrep], [no])
+AM_CONDITIONAL([HAVE_PGREP], [test "x$PGREP" != "xno"])
+
+# check for bison
+AC_PROG_YACC
+BISON=$YACC
+AX_PROG_BISON_VERSION([2.4], [have_bison=yes])
+
+AS_IF([test "x$have_bison" != "xyes"], [
+  AS_IF([test "x$in_git_repo" = "xyes"], [
+    AC_MSG_FAILURE([
+Bison >= 2.4 is required when building from the Git repository. You can
+set the YACC variable to override automatic detection.
+    ])
+  ], [
+    AC_MSG_WARN([
+Missing Bison >= 2.4. Note that the parser files are already built in
+this distribution tarball, so Bison is only needed if you intend to
+modify their sources. You can set the YACC variable to override automatic
+detection.
+    ])
+  ])
+])
+AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
+
+# check for flex
+AC_PROG_LEX
+FLEX=$LEX
+AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes])
+
+AS_IF([test "x$have_flex" != "xyes"], [
+  AS_IF([test "x$in_git_repo" = "xyes"], [
+    AC_MSG_FAILURE([
+Flex >= 2.5.35 is required when building from the Git repository. You can
+set the LEX variable to override automatic detection.
+    ])
+  ], [
+    AC_MSG_WARN([
+Missing Flex >= 2.5.35. Note that the lexer files are already built in
+this distribution tarball, so Flex is only needed if you intend to
+modify their sources. You can set the LEX variable to override automatic
+detection.
+    ])
+  ])
+])
+AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
+
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_INT32_T
@@ -915,54 +962,6 @@ AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes
 AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes])
 AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
 
-# check for pgrep
-AC_PATH_PROG([PGREP], [pgrep], [no])
-AM_CONDITIONAL([HAS_PGREP], [test "x$PGREP" != "xno"])
-
-# check for bison
-have_bison=yes
-
-AS_IF([test "x$(basename "$YACC")" != "xbison -y"], [have_bison=no])
-AC_PATH_PROG([BISON], [bison])
-AX_PROG_BISON_VERSION([2.4], [], [have_bison=no])
-
-AS_IF([test "x$have_bison" = "xno"], [
-       AS_IF([test "x$in_git_repo" = "xyes"], [
-               AC_MSG_ERROR([Bison >= 2.4 is required when building from the Git repository.])
-       ], [
-               AC_MSG_WARN([
-Missing Bison >= 2.4. Note that the parser files are already built in
-this distribution tarball, so Bison is only needed if you intend to
-modify their sources.
-               ])
-       ])
-])
-
-# export bison condition
-AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
-
-# check for flex
-have_flex=yes
-
-AS_IF([test "x$LEX" != "xflex"], [have_flex=no])
-AC_PATH_PROG([FLEX], [flex])
-AX_PROG_FLEX_VERSION([2.5.35], [], [have_flex=no])
-
-AS_IF([test "x$have_flex" = "xno"], [
-       AS_IF([test "x$in_git_repo" = "xyes"], [
-               AC_MSG_ERROR([Flex >= 2.5.35 is required when building from the Git repository.])
-       ], [
-               AC_MSG_WARN([
-Missing Flex >= 2.5.35. Note that the lexer files are already built in
-this distribution tarball, so Flex is only needed if you intend to
-modify their sources.
-               ])
-       ])
-])
-
-# export flex condition
-AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
-
 AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 685d93c6ad6974e41aa91958e25b6d1651e33d62..94ac152603d74cbcd2d7b91c7755df4dfa8bbedf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS = utils unit regression stress destructive perf
 
 if BUILD_TESTS
 SUBDIRS += . utils unit regression stress destructive perf
-if HAS_PGREP
+if HAVE_PGREP
 check-am:
        $(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
 endif