* acinclude.m4 (AM_PROG_LEX): Override installed definition.

* aclocal.m4: Regenerate.
	* configure: Regenerate.
This commit is contained in:
Hans-Peter Nilsson 2001-02-08 06:01:31 +00:00
parent 56b48a7a9b
commit 8ca8f343f9
4 changed files with 32 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2001-02-08 Hans-Peter Nilsson <hp@bitrange.com>
* acinclude.m4 (AM_PROG_LEX): Override installed definition.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2001-02-07 Todd Vierling <tv@wasabisystems.com>
* bucomm.c (bfd_target_vector): Change extern array to pointer.

View File

@ -14,3 +14,19 @@ ifelse(yes,no,[
AC_DEFUN([CY_WITH_NLS],)
AC_SUBST(INTLLIBS)
])
## Replacement for AC_PROG_LEX and AC_DECL_YYTEXT
## by Alexandre Oliva <oliva@dcc.unicamp.br>
## We need to override the installed aclocal/lex.m4 because of a bug in
## this definition in the recommended automake snapshot of 000227:
## There were double-quotes around ``$missing_dir/missing flex'' which was
## bad since aclocal wraps it in double-quotes.
dnl AM_PROG_LEX
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
AC_DEFUN(AM_PROG_LEX,
[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
AC_CHECK_PROGS(LEX, flex lex, [$missing_dir/missing flex])
AC_PROG_LEX
AC_DECL_YYTEXT])

18
binutils/aclocal.m4 vendored
View File

@ -45,6 +45,15 @@ AC_DEFUN(AC_ISC_POSIX,
]
)
dnl AM_PROG_LEX
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
AC_DEFUN(AM_PROG_LEX,
[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
AC_CHECK_PROGS(LEX, flex lex, [$missing_dir/missing flex])
AC_PROG_LEX
AC_DECL_YYTEXT])
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
@ -160,15 +169,6 @@ for am_file in <<$1>>; do
done<<>>dnl>>)
changequote([,]))])
dnl AM_PROG_LEX
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
AC_DEFUN(AM_PROG_LEX,
[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
AC_PROG_LEX
AC_DECL_YYTEXT])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering

2
binutils/configure vendored
View File

@ -2561,7 +2561,7 @@ fi
test -n "$LEX" && break
done
test -n "$LEX" || LEX=""$missing_dir/missing flex""
test -n "$LEX" || LEX="$missing_dir/missing flex"
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2