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

	* aclocal.m4: Regenerate.
	* configure: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6efff5c25589746c36d653b024dd618451da51f4..4cbb07d085f7dadf301272248d2e6bdf5592d84f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -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.

diff --git a/binutils/acinclude.m4 b/binutils/acinclude.m4
index 403aa0e2860b871a5821127a0722bcb535487b87..7ffc031dee405c54b06a551366906721ed708b9d 100644 (file)
--- a/binutils/acinclude.m4
+++ b/binutils/acinclude.m4
@@ -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])

diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index e68badb201cc57ac1eeefaf146bc2233f40c5564..37c162a1d4374f0dedf09aa48c628626bb160e28 100644 (file)
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -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
 

diff --git a/binutils/configure b/binutils/configure
index 83f6ee3d1d5b0fd23380da926056982dc5b636ae..3b25807fba84ef503666dbcec963ed0eeead8844 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -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