diff options
| author | Paul Eggert | 2014-09-24 19:59:45 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-24 19:59:45 -0700 |
| commit | 2494447b719e8d50eee6fc04b83b44b957b67957 (patch) | |
| tree | 7fb314cae17db6c25e9da388da5da4d4defab352 | |
| parent | 10381f58949355413c86315c571508afb40f0de6 (diff) | |
| download | emacs-2494447b719e8d50eee6fc04b83b44b957b67957.tar.gz emacs-2494447b719e8d50eee6fc04b83b44b957b67957.zip | |
* configure.ac (MAKEINFO): Allow 'makeinfo' to be called 'texi2any'.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 8 insertions, 4 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * configure.ac (MAKEINFO): Allow 'makeinfo' to be called 'texi2any'. | ||
| 4 | |||
| 1 | 2014-09-23 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-09-23 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Merge from gnulib, incorporating: | 7 | Merge from gnulib, incorporating: |
diff --git a/configure.ac b/configure.ac index 179a4a5faea..4d9cc0d0274 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1103,10 +1103,10 @@ if test "$MAKEINFO" != "no"; then | |||
| 1103 | MAKEINFO=makeinfo | 1103 | MAKEINFO=makeinfo |
| 1104 | fi | 1104 | fi |
| 1105 | case `($MAKEINFO --version) 2>/dev/null` in | 1105 | case `($MAKEINFO --version) 2>/dev/null` in |
| 1106 | 'makeinfo (GNU texinfo) '4.[[7-9]]* | \ | 1106 | *' (GNU texinfo) '4.[[7-9]]* | \ |
| 1107 | 'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \ | 1107 | *' (GNU texinfo) '4.[[1-9][0-9]]* | \ |
| 1108 | 'makeinfo (GNU texinfo) '[[5-9]]* | \ | 1108 | *' (GNU texinfo) '[[5-9]]* | \ |
| 1109 | 'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;; | 1109 | *' (GNU texinfo) '[[1-9][0-9]]* ) ;; |
| 1110 | *) MAKEINFO=no;; | 1110 | *) MAKEINFO=no;; |
| 1111 | esac | 1111 | esac |
| 1112 | fi | 1112 | fi |