diff options
Diffstat (limited to 'gcc/configure.ac')
| -rw-r--r-- | gcc/configure.ac | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac index 5e01892..96d8e04 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -756,56 +756,45 @@ gcc_AC_PROG_CMP_IGNORE_INITIAL # See if we have the mktemp command. AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no) -# Do we have a single-tree copy of texinfo? -if test -f $srcdir/../texinfo/Makefile.in; then - MAKEINFO='$(objdir)/../texinfo/makeinfo/makeinfo' - gcc_cv_prog_makeinfo_modern=yes - AC_MSG_RESULT([Using makeinfo from the unified source tree.]) -else - # See if makeinfo has been installed and is modern enough - # that we can use it. - gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, +MISSING="${CONFIG_SHELL-/bin/sh} $srcdir/../missing" + +# See if makeinfo has been installed and is modern enough +# that we can use it. +gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, [GNU texinfo.* \([0-9][0-9.]*\)], [4.[2-9]*]) -fi - if test $gcc_cv_prog_makeinfo_modern = no; then + MAKEINFO="$MISSING makeinfo" AC_MSG_WARN([ *** Makeinfo is missing or too old. *** Info documentation will not be built.]) BUILD_INFO= else - BUILD_INFO=info AC_SUBST(BUILD_INFO) + BUILD_INFO=info fi +AC_SUBST(BUILD_INFO) # Is pod2man recent enough to regenerate manpages? AC_MSG_CHECKING([for recent Pod::Man]) if (perl -e 'use 1.10 Pod::Man') >/dev/null 2>&1; then AC_MSG_RESULT(yes) - GENERATED_MANPAGES=generated-manpages AC_SUBST(GENERATED_MANPAGES) + GENERATED_MANPAGES=generated-manpages else AC_MSG_RESULT(no) GENERATED_MANPAGES= fi +AC_SUBST(GENERATED_MANPAGES) # 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 \ - && test -d ../flex ; then - FLEX='$(objdir)/../flex/flex' -else - AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex) -fi +AC_CHECK_PROGS([FLEX], flex, [$MISSING flex]) # Bison? -# The -L switch is so bison can find its skeleton file. -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 +AC_CHECK_PROGS([BISON], bison, [$MISSING bison]) + +# Binutils are not build modules, unlike bison/flex/makeinfo. So we +# check for build == host before using them. # NM if test x${build} = x${host} && test -f $srcdir/../binutils/nm.c \ |