From 5ae13051249f6f9d44dae15e9deb62e7cb09aed7 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 5 Jan 2015 14:53:03 -0800 Subject: ax_prog_flex.m4: Merge upstream OpenBSD fixes. Merge the following upstream autoconf-archive patches. ax_prog_flex: change grep syntax to accept e.g. "flex.real" in case a wrapper or symlink is used. AX_PROG_FLEX: avoid use of grep empty string escape extension (fix for OpenBSD) AX_PROG_FLEX: Also accept gflex. Signed-off-by: Vinson Lee Reviewed-by: Matt Turner Reviewed-by: Jonathan Gray --- m4/ax_prog_flex.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/ax_prog_flex.m4 b/m4/ax_prog_flex.m4 index 82fbc30c32..1f1f597761 100644 --- a/m4/ax_prog_flex.m4 +++ b/m4/ax_prog_flex.m4 @@ -42,7 +42,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 9 +#serial 12 # mattst88: # Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...) @@ -53,7 +53,7 @@ AC_DEFUN([AX_PROG_FLEX], [ AC_REQUIRE([AC_PROG_EGREP]) AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[ - AS_IF([$LEX --version 2>/dev/null | $EGREP -q '^\'], + AS_IF([$LEX --version 2>/dev/null | $EGREP -qw '^g?flex'], [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no]) ]) AS_IF([test "$ax_cv_prog_flex" = "yes"], -- cgit v1.2.3