Mercurial > octave-nkf

comparison configure.ac @ 16012:ca37c6023a79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Feb 2013 12:26:50 -0500
parents e27d9b9b71f4
children 5b2126a8c84f
comparison
equal deleted inserted replaced
16011:8122286c69a9 16012:ca37c6023a79
2183 #if HAVE_UNISTD_H 2183 #if HAVE_UNISTD_H
2184 # include <unistd.h> 2184 # include <unistd.h>
2185 #endif 2185 #endif
2186 ]]) 2186 ]])
2187 2187
2188 ### Need to disable building documentation if gnuplot was not found, 2188 ### Need to disable building documentation if either gnuplot or
2189 ### unless it was already disabled previously. 2189 ### makeinfo are missing. Skip this warning if building docs was
2190 2190 ### disabled with a configure option.
2191 if test -n "$DOCDIR" && test -n "$warn_gnuplot"; then 2191
2192 DOCDIR= 2192 if test -n "$DOCDIR"; then
2193 warn_docs="building documentation disabled because gnuplot was not found; make dist will fail" 2193 if test -n "$warn_gnuplot"; then
2194 OCTAVE_CONFIGURE_WARNING([warn_docs]) 2194 DOCDIR=
2195 warn_docs_gnuplot="building documentation disabled because gnuplot was not found; make dist will fail"
2196 OCTAVE_CONFIGURE_WARNING([warn_docs_gnuplot])
2197 fi
2198 if test -n "$warn_makeinfo"; then
2199 DOCDIR=
2200 warn_docs_makeinfo="building documentation disabled because makeinfo was not found; make dist will fail"
2201 OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo])
2202 fi
2195 fi 2203 fi
2196 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) 2204 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"])
2197 2205
2198 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're 2206 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're
2199 ### done feature testing. 2207 ### done feature testing.