aboutsummaryrefslogtreecommitdiff
path: root/gcc/configure.ac
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@apple.com>2004-08-12 23:03:20 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2004-08-12 23:03:20 +0000
commit414adbdd70b7093ba9e4087c811ef82b458b54f0 (patch)
tree5870b4c582ac23638cfb168ea877e29a6279476f /gcc/configure.ac
parentb4f96efee96dde23f568300a934300cb735e3f7c (diff)
downloadgcc-414adbdd70b7093ba9e4087c811ef82b458b54f0.zip
gcc-414adbdd70b7093ba9e4087c811ef82b458b54f0.tar.gz
gcc-414adbdd70b7093ba9e4087c811ef82b458b54f0.tar.bz2
configure.ac: When testing for flex, nm, ar, and bison, check that they will actually be built.
* configure.ac: When testing for flex, nm, ar, and bison, check that they will actually be built. * configure: Regenerate. From-SVN: r85914
Diffstat (limited to 'gcc/configure.ac')
-rw-r--r--gcc/configure.ac12
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac
index bb6f7bf..83416f2 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -791,7 +791,8 @@ fi
# How about lex?
dnl Don't use AC_PROG_LEX; we insist on flex.
dnl LEXLIB is not useful in gcc.
-if test x${build} = x${host} && test -f $srcdir/../flex/skel.c; then
+if test x${build} = x${host} && test -f $srcdir/../flex/skel.c \
+ && test -d ../flex ; then
FLEX='$(objdir)/../flex/flex'
else
AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex)
@@ -799,21 +800,24 @@ fi
# Bison?
# The -L switch is so bison can find its skeleton file.
-if test x${build} = x${host} && test -f $srcdir/../bison/bison.simple; then
+if test x${build} = x${host} && test -f $srcdir/../bison/bison.simple \
+ && test -d ../bison ; then
BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
else
AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)
fi
# NM
-if test x${build} = x${host} && test -f $srcdir/../binutils/nm.c; then
+if test x${build} = x${host} && test -f $srcdir/../binutils/nm.c \
+ && test -d ../binutils ; then
NM='$(objdir)/../binutils/nm-new'
else
AC_CHECK_PROG(NM, nm, nm, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing nm)
fi
# AR
-if test x${build} = x${host} && test -f $srcdir/../binutils/ar.c; then
+if test x${build} = x${host} && test -f $srcdir/../binutils/ar.c \
+ && test -d ../binutils ; then
AR='$(objdir)/../binutils/ar'
else
AC_CHECK_PROG(AR, ar, ar, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing ar)