Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: AC_PROG_LEX: use more readable variable names.

Browse Source 
* m4/flex.m4 (AC_PROG_LEX): Prefer LEX_IS_FLEX to FLEX.
Prefer true/false to yes/no for such variables.
* configure.ac: Adjust.
This commit is contained in:
Akim Demaille
2012-05-06 09:37:10 +02:00
parent 9c883a6bb0
commit 355e5a7255
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -114,9 +114,7 @@ AC_SUBST([YACC_LIBRARY])
# Checks for programs. # Checks for programs.
AC_PROG_LEX AC_PROG_LEX
if test "$FLEX" != yes; then $LEX_IS_FLEX || AC_MSG_ERROR([Flex is required])
AC_MSG_ERROR([Flex is required])
fi
AC_PROG_YACC AC_PROG_YACC
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PROG_GNU_M4 AC_PROG_GNU_M4

14
m4/flex.m4
View File

@@ -1,4 +1,4 @@
# flex.m4 serial 1 # flex.m4 serial 2
# Copyright (C) 2012 Free Software Foundation, Inc. # Copyright (C) 2012 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@ fi])
# and whether Lex declares yytext as a char * by default. # and whether Lex declares yytext as a char * by default.
m4_define([_AC_PROG_LEX_YYTEXT_DECL], m4_define([_AC_PROG_LEX_YYTEXT_DECL],
[AC_CACHE_CHECK([whether lex is flex], [AC_CACHE_CHECK([whether lex is flex],
[ac_cv_prog_flex], [ac_cv_prog_lex_is_flex],
[cat >conftest.l <<_ACEOF[ [cat >conftest.l <<_ACEOF[
%option debug nodefault noinput nounput noyywrap never-interactive %option debug nodefault noinput nounput noyywrap never-interactive
%x SC_CONF_TEST %x SC_CONF_TEST
@@ -32,15 +32,13 @@ m4_define([_AC_PROG_LEX_YYTEXT_DECL],
a { BEGIN SC_CONF_TEST; } a { BEGIN SC_CONF_TEST; }
]_ACEOF ]_ACEOF
if _AC_DO_VAR([LEX conftest.l]); then if _AC_DO_VAR([LEX conftest.l]); then
ac_cv_prog_flex=yes ac_cv_prog_lex_is_flex=yes
else else
ac_cv_prog_flex=no ac_cv_prog_lex_is_flex=no
fi fi
]) ])
FLEX= AC_SUBST([LEX_IS_FLEX],
if test $ac_cv_prog_flex = yes; then [`test "$ac_cv_prog_lex_is_flex" = yes && echo true || echo false`])dnl
AC_SUBST([FLEX], [yes])dnl
fi
cat >conftest.l <<_ACEOF[ cat >conftest.l <<_ACEOF[
%% %%