[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110989: * configure.ac: Handle info/ files with or without ".info" extension.

[Glenn Morris]

------------------------------------------------------------
revno: 110989
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-12-04 21:13:40 -0500
message:
  * configure.ac: Handle info/ files with or without ".info" extension.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-11-24 16:58:28 +0000
+++ b/ChangeLog 2012-12-05 02:13:40 +0000
@@ -1,7 +1,10 @@
+2012-12-05  Glenn Morris  <address@hidden>
+
+       * configure.ac: Handle info/ files with or without ".info" extension.
+
 2012-11-24  Eli Zaretskii  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-11-24 15:31:31 +0000
+++ b/configure.ac      2012-12-05 02:13:40 +0000
@@ -814,7 +814,7 @@
   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