From bd3f51f7208ff7ee1e0052705ecc3beb02df3fe6 Mon Sep 17 00:00:00 2001 From: wingo Date: Mon, 25 Mar 2002 02:48:20 +0000 Subject: [PATCH] fix for the no-doxygen case git-svn-id: svn+ssh://jackaudio.org/trunk/jack@164 0c269be4-1314-0410-8aa9-9f06e86f4224 --- Makefile.am | 2 +- configure.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7be8f5a..ecd56e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \ if HAVE_DOXYGEN SUBDIRS = . jack doc else -SUBDIRS = . jack doc +SUBDIRS = . jack endif DIST_SUBDIRS = jack doc diff --git a/configure.in b/configure.in index 5184fd2..308cdaf 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.) JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=24 -JACK_MICRO_VERSION=1 +JACK_MICRO_VERSION=2 BETA= @@ -81,10 +81,10 @@ if test $HAVE_SNDFILE = "false"; then fi # you need doxygen to make dist. -AC_CHECK_PROG(DOXYGEN, doxygen, - [HAVE_DOXYGEN=true], - [HAVE_DOXYGEN=false; AC_MSG_WARN([*** doxygen not found, docs will not be built])] -) +AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) +if test $HAVE_SNDFILE = "false"; then + AC_MSG_WARN([*** doxygen not found, docs will not be built]) +fi AM_CONDITIONAL(HAVE_FLTK, $HAVE_FLTK) AM_CONDITIONAL(HAVE_SNDFILE, $HAVE_SNDFILE)