From: Glenn Morris <rgm@gnu.org>
Date: Wed, 5 Dec 2012 02:13:40 +0000 (-0500)
Subject: * configure.ac: Handle info/ files with or without ".info" extension.
X-Git-Tag: emacs-24.2.91~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de0e31edcc3ab6ded038e43625b125d01c6b299d;p=emacs.git

* configure.ac: Handle info/ files with or without ".info" extension.
---

diff --git a/ChangeLog b/ChangeLog
index caec4db11a1..965c7882a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
+2012-12-05  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac: Handle info/ files with or without ".info" extension.
+
 2012-11-24  Eli Zaretskii  <eliz@gnu.org>
 
-	* make-dist (nt): Adjust to changes in names of the *.manifest
-	files.
+	* make-dist (nt): Adjust to changes in names of the *.manifest files.
 
 2012-11-21  Glenn Morris  <rgm@gnu.org>
 
diff --git a/configure.ac b/configure.ac
index 321cbd267f2..594fe94214d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,7 +814,7 @@ if test "$MAKEINFO" = "no"; then
   MAKEINFO=makeinfo
   if test "x${with_makeinfo}" = "xno"; then
     HAVE_MAKEINFO=no
-  elif test ! -e $srcdir/info/emacs; 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
 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