* configure.ac (FLEX, BISON): Only use tools from the build tree

if build equals host.
* configure: Rebuilt.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81406 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 9 insertions, 5 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb929086eed..81302ea71e7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-02  Alexandre Oliva  <aoliva@redhat.com>
 
+	* configure.ac (FLEX, BISON): Only use tools from the build tree
+	if build equals host.
+	* configure: Rebuilt.
+
 	* config/frv/frv-protos.h (frv_expand_epilogue,
 	frv_expand_fdpic_call): Add bool argument.
 	* config/frv/frv.c (frv_function_ok_for_sibcall): New.
diff --git a/gcc/configure b/gcc/configure
index 1f1baa0a15e..38c2591d4db 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1017,7 +1017,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -5326,7 +5326,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 # How about lex?
-if test -f $srcdir/../flex/skel.c; then
+if test x${build} = x${host} && test -f $srcdir/../flex/skel.c; then
   FLEX='$(objdir)/../flex/flex'
 else
   # Extract the first word of "flex", so it can be a program name with args.
@@ -5369,7 +5369,7 @@ fi
 
 # Bison?
 # The -L switch is so bison can find its skeleton file.
-if test -f $srcdir/../bison/bison.simple; then
+if test x${build} = x${host} && test -f $srcdir/../bison/bison.simple; then
   BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
 else
   # Extract the first word of "bison", so it can be a program name with args.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index c5b354ad526..799f3ef1400 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -760,7 +760,7 @@ fi
 # How about lex?
 dnl Don't use AC_PROG_LEX; we insist on flex.
 dnl LEXLIB is not useful in gcc.
-if test -f $srcdir/../flex/skel.c; then
+if test x${build} = x${host} && test -f $srcdir/../flex/skel.c; then
   FLEX='$(objdir)/../flex/flex'
 else
   AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex)
@@ -768,7 +768,7 @@ fi
 
 # Bison?
 # The -L switch is so bison can find its skeleton file.
-if test -f $srcdir/../bison/bison.simple; then
+if test x${build} = x${host} && test -f $srcdir/../bison/bison.simple; then
   BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
 else
   AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)