drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR binutils/1860 

* configure.in: Require makeinfo 4.4 or higher.
	* configure: Regenerate.
This commit is contained in:
Ben Elliston 2006-03-31 02:32:20 +00:00
parent bb09410538
commit 3bdcd964f9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-31 Ben Elliston <bje@au.ibm.com>
PR binutils/1860
* configure.in: Require makeinfo 4.4 or higher.
* configure: Regenerate.
2006-03-14 Paolo Bonzini <bonzini@gnu.org> 2006-03-14 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate. * Makefile.in: Regenerate.

4
configure vendored
View File

@ -3628,10 +3628,10 @@ case " $build_configdirs " in
*" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
*) *)
# For an installed makeinfo, we require it to be from texinfo 4.2 or # For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy. # higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \ if ${MAKEINFO} --version \
| egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
: :
else else
MAKEINFO="$MISSING makeinfo" MAKEINFO="$MISSING makeinfo"

4
configure.in
View File

@ -2203,10 +2203,10 @@ case " $build_configdirs " in
*" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
*) *)
changequote(,) changequote(,)
# For an installed makeinfo, we require it to be from texinfo 4.2 or # For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy. # higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \ if ${MAKEINFO} --version \
| egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
: :
else else
MAKEINFO="$MISSING makeinfo" MAKEINFO="$MISSING makeinfo"