problems re: makeinfo '--split-size' arg?

[cgd@broadcom.com]

So, i just tried building the head of the recently-created binutils
release branch (for target mips-elf, host x86-linux), and ran into:

/path/.../makeinfo: unrecognized option `--split-size=5000000'


My makeinfo has version:

> makeinfo (GNU texinfo) 4.0
> 
> Copyright (C) 1999 Free Software Foundation, Inc.
> There is NO warranty.  You may redistribute this software
> under the terms of the GNU General Public License.
> For more information about these matters, see the files named COPYING.

And the toplevel 'Makefile.tpl' says:

# For an installed makeinfo, we require it to be from texinfo 4 or
# higher, else we use the "missing" dummy.


While I realize that i should probably be using a newer 'makeinfo', I
cannot easily do so at this time.

I suspect that the top-level Makefile should be modified so that
it uses 'missing' instead of makeinfo if the --split-size option isn't
supported.  (Looks like it was added in rev 4.1 of the texinfo
package.)


I suspect that a diff like the one below is in order.  I tried it, and
it seems to DTRT for the version of makeinfo that i have (which is all
i tried 8-).

If approved, could somebody else please check it in for me?  (I hacked
it into my Makefile.in by hand to test it, but i don't have autogen
and wouldn't want to check in an improperly-generated file, etc...)


thanks,

chris
--
2003-04-28  Chris Demetriou  <cgd@broadcom.com>

	* Makefile.tpl (MAKEINFO): Require makeinfo 4.1 and later.
        * Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.56.4.1
diff -u -p -r1.56.4.1 Makefile.tpl
--- Makefile.tpl	28 Apr 2003 02:25:36 -0000	1.56.4.1
+++ Makefile.tpl	28 Apr 2003 17:49:39 -0000
@@ -194,13 +194,13 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
 	then echo $$r/m4/m4 ; \
 	else echo ${DEFAULT_M4} ; fi`
 
-# For an installed makeinfo, we require it to be from texinfo 4 or
+# For an installed makeinfo, we require it to be from texinfo 4.1 or
 # higher, else we use the "missing" dummy.
 MAKEINFO=@MAKEINFO@
 USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
 	then echo $$r/texinfo/makeinfo/makeinfo ; \
 	else if (makeinfo --version \
-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[1-9]|[5-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