procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump makeinfo requirement from 4.7 to 4.13

Browse source 
* configure.ac: Bump makeinfo version requirement from 4.7 to 4.13.
We need at least 4.8, and that may be buggy, so go for the last
of the 4 series, which is 8 years old.  (Bug#25108)
This commit is contained in:
Glenn Morris 2016-12-10 18:23:51 -08:00
parent 442e2f61b7
commit 5f7d906e88
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -1189,14 +1189,13 @@ esac
AC_SUBST([PAXCTL_dumped]) AC_SUBST([PAXCTL_dumped])
AC_SUBST([PAXCTL_notdumped]) AC_SUBST([PAXCTL_notdumped])
## Need makeinfo >= 4.7 (?) to build the manuals. ## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
if test "$MAKEINFO" != "no"; then if test "$MAKEINFO" != "no"; then
if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
MAKEINFO=makeinfo MAKEINFO=makeinfo
fi fi
case `($MAKEINFO --version) 2>/dev/null` in case `($MAKEINFO --version) 2>/dev/null` in
*' (GNU texinfo) '4.[[7-9]]* | \ *' (GNU texinfo) '4.1[[3-9]]* | \
*' (GNU texinfo) '4.[[1-9][0-9]]* | \
*' (GNU texinfo) '[[5-9]]* | \ *' (GNU texinfo) '[[5-9]]* | \
*' (GNU texinfo) '[[1-9][0-9]]* ) ;; *' (GNU texinfo) '[[1-9][0-9]]* ) ;;
*) MAKEINFO=no;; *) MAKEINFO=no;;
@ -1219,7 +1218,7 @@ if test "$MAKEINFO" = "no"; then
if test "x${with_makeinfo}" = "xno"; then if test "x${with_makeinfo}" = "xno"; then
HAVE_MAKEINFO=no HAVE_MAKEINFO=no
elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then
AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.13, and your
source tree does not seem to have pre-built manuals in the 'info' directory. source tree does not seem to have pre-built manuals in the 'info' directory.
Either install a suitable version of makeinfo, or re-run configure Either install a suitable version of makeinfo, or re-run configure
with the '--without-makeinfo' option to build without the manuals.] ) with the '--without-makeinfo' option to build without the manuals.] )