Mercurial > octave-nkf

changeset 14579:4dc85c4f151b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable building documentation if gnuplot not found * configure.ac: Disable building documentation if gnuplot not found
author Mike Miller <mtmiller@ieee.org>
date Tue, 24 Apr 2012 20:27:42 -0400
parents f579a94aacaa
children 721442e1b82c
files configure.ac
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Apr 24 20:08:35 2012 -0400
+++ b/configure.ac	Tue Apr 24 20:27:42 2012 -0400
@@ -196,7 +196,6 @@
      AC_MSG_WARN([$warn_docs])
    fi], [])
 AC_SUBST(DOCDIR)
-AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"])
 
 ### If possible, use a 64-bit integer type for array dimensions and indexing.
 
@@ -1901,6 +1900,16 @@
 OCTAVE_PROG_TEXI2DVI
 OCTAVE_PROG_TEXI2PDF
 
+### 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"
+  AC_MSG_WARN([$warn_docs])
+fi
+AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"])
+
 ### Even though we include config.h, we need to have the preprocessor
 ### defines available in a variable for the testif feature of the
 ### scripts/testfun/test.m function.  Use UGLY_DEFS to hold all the -D