diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2015-01-05 14:53:03 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2015-01-06 15:06:54 -0800 |
| commit | 5ae13051249f6f9d44dae15e9deb62e7cb09aed7 (patch) | |
| tree | e8cd945f66f20b18fd52abf702d3a10ecb1f0ea0 /m4 | |
| parent | a8ef880a1b38cbcfc26e9f829338739d16cece99 (diff) | |
| download | external_mesa3d-5ae13051249f6f9d44dae15e9deb62e7cb09aed7.zip external_mesa3d-5ae13051249f6f9d44dae15e9deb62e7cb09aed7.tar.gz external_mesa3d-5ae13051249f6f9d44dae15e9deb62e7cb09aed7.tar.bz2 | |
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 <vlee@freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Jonathan Gray <jsg@openbsd.org>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_prog_flex.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/ax_prog_flex.m4 b/m4/ax_prog_flex.m4 index 82fbc30..1f1f597 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 '^\<flex\>'], + 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"], |