From: Akim Demaille <akim@lrde.epita.fr>
Date: Sun, 6 May 2012 07:37:10 +0000 (+0200)
Subject: build: AC_PROG_LEX: use more readable variable names.
X-Git-Tag: v2.5.1_rc2~30
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/355e5a7255e1959825a273ef0733226fa1189f3e

build: AC_PROG_LEX: use more readable variable names.

* m4/flex.m4 (AC_PROG_LEX): Prefer LEX_IS_FLEX to FLEX.
Prefer true/false to yes/no for such variables.
* configure.ac: Adjust.
---

diff --git a/configure.ac b/configure.ac
index 704f5aaa..3c3fa421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,9 +114,7 @@ AC_SUBST([YACC_LIBRARY])
 
 # Checks for programs.
 AC_PROG_LEX
-if test "$FLEX" != yes; then
-  AC_MSG_ERROR([Flex is required])
-fi
+$LEX_IS_FLEX || AC_MSG_ERROR([Flex is required])
 AC_PROG_YACC
 AC_PROG_RANLIB
 AC_PROG_GNU_M4
diff --git a/m4/flex.m4 b/m4/flex.m4
index 2073a0dc..984c5143 100644
--- a/m4/flex.m4
+++ b/m4/flex.m4
@@ -1,4 +1,4 @@
-# flex.m4 serial 1
+# flex.m4 serial 2
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@ fi])
 # and whether Lex declares yytext as a char * by default.
 m4_define([_AC_PROG_LEX_YYTEXT_DECL],
 [AC_CACHE_CHECK([whether lex is flex],
-                [ac_cv_prog_flex],
+                [ac_cv_prog_lex_is_flex],
 [cat >conftest.l <<_ACEOF[
 %option debug nodefault noinput nounput noyywrap never-interactive
 %x SC_CONF_TEST
@@ -32,15 +32,13 @@ m4_define([_AC_PROG_LEX_YYTEXT_DECL],
 a { BEGIN SC_CONF_TEST; }
 ]_ACEOF
 if _AC_DO_VAR([LEX conftest.l]); then
-  ac_cv_prog_flex=yes
+  ac_cv_prog_lex_is_flex=yes
 else
-  ac_cv_prog_flex=no
+  ac_cv_prog_lex_is_flex=no
 fi
 ])
-FLEX=
-if test $ac_cv_prog_flex = yes; then
-  AC_SUBST([FLEX], [yes])dnl
-fi
+AC_SUBST([LEX_IS_FLEX],
+         [`test "$ac_cv_prog_lex_is_flex" = yes && echo true || echo false`])dnl
 
 cat >conftest.l <<_ACEOF[
 %%