Check for a suitably recent makeinfo.

3 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c9c307ba128..813452e1272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-24  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Check for a suitably recent makeinfo.
+
 2007-08-23  Johannes Weiner  <hannes@saeurebad.de>  (tiny change)
 
         * configure.in (Check for required libraries): Typo.
diff --git a/configure.in b/configure.in
index fbf0b440b1b..fe23864c0a9 100644
--- a/configure.in
+++ b/configure.in
@@ -1343,6 +1343,21 @@ AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 AC_PATH_PROG(GZIP_PROG, gzip)
 
+
+## Need makeinfo >= 4.8 (?) to build the manuals.
+AC_PATH_PROG(MAKEINFO, makeinfo, no)
+dnl By this stage, configure has already checked for egrep and set EGREP, 
+dnl or exited with an error if no egrep was found.
+if test "$MAKEINFO" != "no" && \
+  test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[8-9]])'`" = x; then
+   MAKEINFO=no    
+fi
+
+if test "$MAKEINFO" = "no"; then
+  AC_MSG_ERROR( [makeinfo >= 4.8 is required] )
+fi
+
+
 dnl Add our options to ac_link now, after it is set up.
 
 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfeef25ffcb..f1b082c618f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-08-24  Glenn Morris  <rgm@gnu.org>
 
+        * files.el (backup-buffer-copy): Revert 2007-08-22 change.
+
         * startup.el (tutorial-directory): Set with eval-at-startup so it
         gets the right value in an installed Emacs.