# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1360258010 18000
# Node ID ca37c6023a799673a2d9c2070d4ee58c822c5889
# Parent  8122286c69a958d720912e205ad8404a3fe92a54
don't abort configure if makeinfo is missing

* acinclude.m4 (OCTAVE_PROG_MAKEINFO): Issue warning instead of error
if makeinfo is not found.
* configure.ac: Disable building docs if makeinfo is not found.

diff -r 8122286c69a9 -r ca37c6023a79 configure.ac
--- a/configure.ac	Thu Feb 07 11:58:46 2013 -0500
+++ b/configure.ac	Thu Feb 07 12:26:50 2013 -0500
@@ -2185,13 +2185,21 @@
 #endif
 ]])
 
-### Need to disable building documentation if gnuplot was not found,
-### unless it was already disabled previously.
-
-if test -n "$DOCDIR" && test -n "$warn_gnuplot"; then
-  DOCDIR=
-  warn_docs="building documentation disabled because gnuplot was not found; make dist will fail"
-  OCTAVE_CONFIGURE_WARNING([warn_docs])
+### Need to disable building documentation if either gnuplot or
+### makeinfo are missing.  Skip this warning if building docs was
+### disabled with a configure option.
+
+if test -n "$DOCDIR"; then
+  if test -n "$warn_gnuplot"; then
+    DOCDIR=
+    warn_docs_gnuplot="building documentation disabled because gnuplot was not found; make dist will fail"
+    OCTAVE_CONFIGURE_WARNING([warn_docs_gnuplot])
+  fi
+  if test -n "$warn_makeinfo"; then
+    DOCDIR=
+    warn_docs_makeinfo="building documentation disabled because makeinfo was not found; make dist will fail"
+    OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo])
+  fi
 fi
 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"])
 
diff -r 8122286c69a9 -r ca37c6023a79 m4/acinclude.m4
--- a/m4/acinclude.m4	Thu Feb 07 11:58:46 2013 -0500
+++ b/m4/acinclude.m4	Thu Feb 07 12:26:50 2013 -0500
@@ -1537,7 +1537,12 @@
   dnl exist which will then 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])
+    warn_makeinfo="
+
+I didn't find makeinfo, which is required for reading documentation.
+You may install a copy later for Octave to use.
+"
+    OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
   fi
 ])
 dnl