diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
commit | 4f7a90bf6ce831063d721324e712f8c38e85c678 (patch) | |
tree | 73e980746ddc55c4285d145769a94b2845cbfcdf /configure.ac | |
parent | 620e5a3cd4464aaffaa3568d6f6b89764de5cfbd (diff) | |
parent | 9adb101353e1f3d41a8f822fa4164e9b41e82ce5 (diff) | |
download | emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.tar.gz |
Merge from origin/emacs-25
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks
# Conflicts:
# lisp/menu-bar.el
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index cd6c689a52c..07b2e7f085d 100644 --- a/configure.ac +++ b/configure.ac @@ -1218,14 +1218,13 @@ esac AC_SUBST([PAXCTL_dumped]) 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" = "${am_missing_run}makeinfo"; then MAKEINFO=makeinfo fi case `($MAKEINFO --version) 2>/dev/null` in - *' (GNU texinfo) '4.[[7-9]]* | \ - *' (GNU texinfo) '4.[[1-9][0-9]]* | \ + *' (GNU texinfo) '4.1[[3-9]]* | \ *' (GNU texinfo) '[[5-9]]* | \ *' (GNU texinfo) '[[1-9][0-9]]* ) ;; *) MAKEINFO=no;; @@ -1248,7 +1247,7 @@ if test "$MAKEINFO" = "no"; then if test "x${with_makeinfo}" = "xno"; then HAVE_MAKEINFO=no 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. Either install a suitable version of makeinfo, or re-run configure with the '--without-makeinfo' option to build without the manuals.] ) |