Mercurial > octave-nkf

changeset 15126:25200c04bc25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Require makeinfo to be present before building Octave. * configure.ac: Add new OCTAVE_PROG_MAKEINFO test. * m4/acinclude.m4: Add new OCTAVE_PROG_MAKEINFO check for presence of makeinfo.
author Rik <rik@octave.org>
date Wed, 08 Aug 2012 07:23:21 -0700
parents 067699edef86
children 87411930d6c4
files configure.ac m4/acinclude.m4
diffstat 2 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Aug 07 13:34:22 2012 -0700
+++ b/configure.ac	Wed Aug 08 07:23:21 2012 -0700
@@ -2058,6 +2058,7 @@
 OCTAVE_PROG_GPERF
 
 OCTAVE_PROG_GHOSTSCRIPT
+OCTAVE_PROG_MAKEINFO
 OCTAVE_PROG_TEXI2DVI
 OCTAVE_PROG_TEXI2PDF
 
--- a/m4/acinclude.m4	Tue Aug 07 13:34:22 2012 -0700
+++ b/m4/acinclude.m4	Wed Aug 08 07:23:21 2012 -0700
@@ -685,6 +685,19 @@
   AC_SUBST(GHOSTSCRIPT)
 ])
 dnl
+dnl Find makeinfo required for reading documentation
+dnl
+dnl OCTAVE_PROG_MAKEINFO
+AC_DEFUN([OCTAVE_PROG_MAKEINFO],
+dnl use MKINFO, not MAKEINFO, for variable name because Automake automatically
+dnl defines a value for MAKEINFO even when it does not exist which will then
+dnl fool the 'test -z' line.
+  [AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, [])
+   if test -z "$MKINFO"; then
+     AC_MSG_ERROR([makeinfo program required for reading documentation])
+   fi
+])
+dnl
 dnl Is texi2dvi installed?
 dnl
 dnl OCTAVE_PROG_TEXI2DVI