Re: [PATCH] Get more stuff compiled for the build machine

[Paolo Bonzini <bonzini at gnu dot org>]

> Do we really want to restrict the required version of makeinfo for gcc/ to
> be the same as that required for toplevel (so we can't use new Texinfo
> features in GCC manuals without forcing users of src to get new makeinfo
> as well)?  It is at present, but hasn't always been so in the past.

What about this one?

(Note that this is not only a cosmetic issue, because in a Canadian 
cross gcc was attempting to use the host Texinfo!)

Paolo
2004-07-01  Paolo Bonzini  <bonzini@gnu.org>

	* configure.ac: Rely on toplevel's MAKEINFO, FLEX and BISON.
	* configure: Regenerate.

Index: gcc/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.43
diff -u -r2.43 configure.ac
*** gcc/configure.ac	18 Jun 2004 01:59:45 -0000	2.43
--- gcc/configure.ac	1 Jul 2004 14:52:24 -0000
***************
*** 737,763 ****
  # 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,
!   [GNU texinfo.* \([0-9][0-9.]*\)],
!   [4.[2-9]*])
! fi
  
  if test $gcc_cv_prog_makeinfo_modern = no; then
!   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)
! fi
  
  # Is pod2man recent enough to regenerate manpages?
  AC_MSG_CHECKING([for recent Pod::Man])
--- 737,766 ----
  # See if we have the mktemp command.
  AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
  
! MISSING="${CONFIG_SHELL-/bin/sh} $srcdir/../missing"
! 
! # See if makeinfo has been installed and is modern enough
! # that we can use it.
! AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo])
! gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
! [GNU texinfo.* \([0-9][0-9.]*\)],
! [4.[2-9]*])
  
  if test $gcc_cv_prog_makeinfo_modern = no; then
!   MAKEINFO="$MISSING makeinfo"
! fi
! case "$MAKEINFO" in
!   *missing*)
!     AC_MSG_WARN([
  *** Makeinfo is missing or too old.
  *** Info documentation will not be built.])
!     BUILD_INFO=
!     ;;
!   *)
!     BUILD_INFO=info
!     AC_SUBST(BUILD_INFO)
!     ;;
! esac
  
  # Is pod2man recent enough to regenerate manpages?
  AC_MSG_CHECKING([for recent Pod::Man])
***************
*** 772,790 ****
  # 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
!   FLEX='$(objdir)/../flex/flex'
! else
!   AC_CHECK_PROG(FLEX, flex, flex, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing flex)
! 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
!   BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
! else
!   AC_CHECK_PROG(BISON, bison, bison, ${CONFIG_SHELL-/bin/sh} ${srcdir}/../missing bison)
! fi
  
  # --------------------
  # Checks for C headers
--- 766,776 ----
  # How about lex?
  dnl Don't use AC_PROG_LEX; we insist on flex.
  dnl LEXLIB is not useful in gcc.
! AC_CHECK_PROGS([FLEX], flex, [$MISSING flex])
  
  # Bison?
  # The -L switch is so bison can find its skeleton file.
! AC_CHECK_PROGS([BISON], bison, [$MISSING bison])
  
  # --------------------
  # Checks for C headers