Commit 414adbdd by Geoffrey Keating Committed by Geoffrey Keating

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
parent b4f96efe
2004-08-12 Geoffrey Keating <geoffk@apple.com>
* configure.ac: When testing for flex, nm, ar, and bison, check
that they will actually be built.
* configure: Regenerate.
2004-08-12 Ulrich Weigand <uweigand@de.ibm.com> 2004-08-12 Ulrich Weigand <uweigand@de.ibm.com>
* config/s390/s390.h (MAX_FIXED_MODE_SIZE): Define. * config/s390/s390.h (MAX_FIXED_MODE_SIZE): Define.
......
...@@ -791,7 +791,8 @@ fi ...@@ -791,7 +791,8 @@ fi
# How about lex? # How about lex?
dnl Don't use AC_PROG_LEX; we insist on flex. dnl Don't use AC_PROG_LEX; we insist on flex.
dnl LEXLIB is not useful in gcc. 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' FLEX='$(objdir)/../flex/flex'
else else
AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex) AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex)
...@@ -799,21 +800,24 @@ fi ...@@ -799,21 +800,24 @@ fi
# Bison? # Bison?
# The -L switch is so bison can find its skeleton file. # 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/' BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
else else
AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison) AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)
fi fi
# NM # 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' NM='$(objdir)/../binutils/nm-new'
else else
AC_CHECK_PROG(NM, nm, nm, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing nm) AC_CHECK_PROG(NM, nm, nm, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing nm)
fi fi
# AR # 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' AR='$(objdir)/../binutils/ar'
else else
AC_CHECK_PROG(AR, ar, ar, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing ar) AC_CHECK_PROG(AR, ar, ar, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing ar)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment