Mercurial > hg > octave-nkf

changeset 10235:c022ff4a2b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: let automake handle makeinfo via missing script
author John W. Eaton <jwe@octave.org>
date Mon, 01 Feb 2010 11:00:57 -0500
parents c4c2bda71f82
children 8e58c402ebb2
files ChangeLog acinclude.m4 configure.ac
diffstat 3 files changed, 6 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-01  John W. Eaton  <jwe@octave.org>
+
+	* acinclude.m4 (OCTAVE_PROG_MAKEINFO): Delete macro.
+	* configure.ac: Don't call it.  Don't issue warning about
+	makeinfo in summary.
+
 2010-01-31  Jaroslav Hajek  <highegg@gmail.com>
 
 	* NEWS: Update.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -677,19 +677,6 @@
   AC_SUBST(GHOSTSCRIPT)
 ])
 dnl
-dnl Is makeinfo installed?
-dnl
-dnl OCTAVE_PROG_MAKEINFO
-AC_DEFUN([OCTAVE_PROG_MAKEINFO], [
-  AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, [])
-  if test -z "$MAKEINFO"; then
-    MAKEINFO='$(top_srcdir)/missing makeinfo'
-    warn_makeinfo="I didn't find makeinfo, but it's only a problem if you need to reconstruct the Info version of the manual"
-    AC_MSG_WARN([$warn_makeinfo])
-  fi
-  AC_SUBST(MAKEINFO)
-])
-dnl
 dnl Is texi2dvi installed?
 dnl
 dnl OCTAVE_PROG_TEXI2DVI
--- a/configure.ac
+++ b/configure.ac
@@ -1777,7 +1777,6 @@
 OCTAVE_PROG_GPERF
 
 OCTAVE_PROG_GHOSTSCRIPT
-OCTAVE_PROG_MAKEINFO
 OCTAVE_PROG_TEXI2DVI
 OCTAVE_PROG_TEXI2PDF
 
@@ -2332,11 +2331,6 @@
   warn_msg_printed=true
 fi
 
-if test -n "$warn_makeinfo"; then
-  AC_MSG_WARN([$warn_makeinfo])
-  warn_msg_printed=true
-fi
-
 if test -n "$warn_texi2dvi"; then
   AC_MSG_WARN([$warn_texi2dvi])
   warn_msg_printed=true