configure.ac: Raise minimum makeinfo version to 4.6.

* configure.ac: Raise minimum makeinfo version to 4.6.
	* configure: Regenerate.

From-SVN: r128561
This commit is contained in:
Andreas Schwab 2007-09-17 22:44:27 +00:00 committed by Andreas Schwab
parent f5678792a3
commit 4fe7e75560
3 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2007-09-17 Andreas Schwab <schwab@suse.de>
* configure.ac: Raise minimum makeinfo version to 4.6.
* configure: Regenerate.
2007-09-17 Johannes Singler <singler@ira.uka.de> 2007-09-17 Johannes Singler <singler@ira.uka.de>
* MAINTAINERS (write-after-approval) add myself * MAINTAINERS (write-after-approval) add myself

4
configure vendored
View File

@ -6189,10 +6189,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.4 or # For an installed makeinfo, we require it to be from texinfo 4.6 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]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
: :
else else
MAKEINFO="$MISSING makeinfo" MAKEINFO="$MISSING makeinfo"

View File

@ -2459,10 +2459,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.4 or # For an installed makeinfo, we require it to be from texinfo 4.6 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]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
: :
else else
MAKEINFO="$MISSING makeinfo" MAKEINFO="$MISSING makeinfo"