Cleanup: bison and flex detection

[babeltrace.git] / m4 / ax_prog_flex_version.m4

diff --git a/m4/ax_prog_flex_version.m4 b/m4/ax_prog_flex_version.m4
index da60e00f52497e08aa2065d152af0e3ead0e0194..6a9bfbe4c86ae9c9f4db157f0afb68ac9bc2d775 100644 (file)
--- a/m4/ax_prog_flex_version.m4
+++ b/m4/ax_prog_flex_version.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
 # ===========================================================================

-#   http://www.gnu.org/software/autoconf-archive/ax_prog_flex_version.html
+#   https://www.gnu.org/software/autoconf-archive/ax_prog_flex_version.html

 # ===========================================================================
 #
 # SYNOPSIS
 # ===========================================================================
 #
 # SYNOPSIS


@@ -11,41 +11,49 @@
 #   Makes sure that flex version is greater or equal to the version
 #   indicated. If true the shell commands in ACTION-IF-TRUE are executed. If
 #   not the shell commands in commands in ACTION-IF-TRUE are executed. If
 #   Makes sure that flex version is greater or equal to the version
 #   indicated. If true the shell commands in ACTION-IF-TRUE are executed. If
 #   not the shell commands in commands in ACTION-IF-TRUE are executed. If

-#   not the shell commands in ACTION-IF-FALSE are run. Note if $FLEX is not
-#   set (for example by running AC_CHECK_PROG or AC_PATH_PROG) the macro
+#   not the shell commands in ACTION-IF-FALSE are run. Note if $LEX is not
+#   set (for example by running AC_PROG_LEX or AC_PATH_PROG) the macro

 #   will fail.
 #
 #   Example:
 #
 #   will fail.
 #
 #   Example:
 #

-#     AC_PATH_PROG([FLEX],[flex])
+#     AC_PROG_LEX

 #     AX_PROG_FLEX_VERSION([2.5.39],[ ... ],[ ... ])
 #
 #   This will check to make sure that the flex you have is at least version
 #   2.5.39 or greater.
 #
 #     AX_PROG_FLEX_VERSION([2.5.39],[ ... ],[ ... ])
 #
 #   This will check to make sure that the flex you have is at least version
 #   2.5.39 or greater.
 #

-#   NOTE: This macro uses the $FLEX variable to perform the check.
+#   NOTE: This macro uses the $LEX variable to perform the check, if it's
+#   empty it will failover to the $FLEX variable for backwards compatibility.

 #
 # LICENSE
 #
 #   Copyright (c) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
 # LICENSE
 #
 #   Copyright (c) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>

+#                 2017 Michael Jeanson <mjeanson@efficios.com>

 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 

-#serial 1
+#serial 3

 
 AC_DEFUN([AX_PROG_FLEX_VERSION],[
     AC_REQUIRE([AC_PROG_SED])
     AC_REQUIRE([AC_PROG_GREP])
 
 
 AC_DEFUN([AX_PROG_FLEX_VERSION],[
     AC_REQUIRE([AC_PROG_SED])
     AC_REQUIRE([AC_PROG_GREP])
 

-    AS_IF([test -n "$FLEX"],[
+    AS_IF([test -z "$LEX"],[
+        AS_IF([test -n "$FLEX"],[
+            LEX=$FLEX
+        ])
+    ])
+
+    AS_IF([test -n "$LEX"],[

         ax_flex_version="$1"
 
         AC_MSG_CHECKING([for flex version])
         changequote(<<,>>)
         ax_flex_version="$1"
 
         AC_MSG_CHECKING([for flex version])
         changequote(<<,>>)

-        flex_version=`$FLEX --version 2>&1 \
+        flex_version=`$LEX --version 2>&1 \

           | $SED -n -e '/flex /b inspect
 b
 : inspect
           | $SED -n -e '/flex /b inspect
 b
 : inspect