summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index adc0a509490..9aac8d0496b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-25 Paul Eggert <eggert@cs.ucla.edu>
+
+ * configure.ac (MAKEINFO): Allow 'makeinfo' to be called 'texi2any'.
+
2014-09-23 Paul Eggert <eggert@cs.ucla.edu>
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
MAKEINFO=makeinfo
fi
case `($MAKEINFO --version) 2>/dev/null` in
- 'makeinfo (GNU texinfo) '4.[[7-9]]* | \
- 'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \
- 'makeinfo (GNU texinfo) '[[5-9]]* | \
- 'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;;
+ *' (GNU texinfo) '4.[[7-9]]* | \
+ *' (GNU texinfo) '4.[[1-9][0-9]]* | \
+ *' (GNU texinfo) '[[5-9]]* | \
+ *' (GNU texinfo) '[[1-9][0-9]]* ) ;;
*) MAKEINFO=no;;
esac
fi