Re: [RFA:] toplevel: Don't use makeinfo older than texinfo 4

[Hans-Peter Nilsson <hp at bitrange dot com>]

On Sun, 4 Nov 2001, DJ Delorie wrote:
> If makeinfo doesn't exist on $PATH, does this end up printing an error
> message each time you try to run $MAKEINFO ?
>
> >   MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
> >   	then echo $$r/texinfo/makeinfo/makeinfo ; \
> > ! 	else if makeinfo --version \
> > ! 		  | grep 'texinfo[^0-9]*[123][^0-9]' >/dev/null 2>&1; \
> > !         then echo $$s/missing makeinfo; else echo makeinfo; fi; fi`

Oops, yes, and so would a non-makeinfo makeinfo.  Not that
things would be worse than before, though. :-)  Update:

	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/Makefile.in,v
retrieving revision 1.88
diff -p -c -r1.88 Makefile.in
*** Makefile.in	2001/09/29 19:36:13	1.88
--- Makefile.in	2001/11/05 09:19:47
*************** M4 = `if [ -f $$r/m4/m4 ] ; \
*** 140,148 ****
  	then echo $$r/m4/m4 ; \
  	else echo ${DEFAULT_M4} ; fi`

  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/texinfo/makeinfo/makeinfo ; \
! 	else echo makeinfo ; fi`

  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
--- 140,152 ----
  	then echo $$r/m4/m4 ; \
  	else echo ${DEFAULT_M4} ; fi`

+ # For an installed makeinfo, we require it to be from texinfo 4 or
+ # higher, else we use the "missing" dummy.
  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/texinfo/makeinfo/makeinfo ; \
! 	else if (makeinfo --version 2>/dev/null \
! 	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9][^0-9])' >/dev/null 2>&1); \
!         then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`

  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still

brgds, H-P