From 1bb73933593e775ac70ac548c55267d2005ce0e7 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 9 Jan 2010 18:26:27 +0100 Subject: [PATCH 1/2] don't build docs if doxygen isn't available Signed-off-by: Marc Kleine-Budde --- Makefile.am | 10 ++++++++-- configure.ac | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 68d9831..79dc8d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,15 @@ else DEMO = endif -ACLOCAL_AMFLAGS= +if DOCS +DOC = doc +else +DOC = +endif + +ACLOCAL_AMFLAGS= -SUBDIRS = cgicc doc support $(DEMO) +SUBDIRS = cgicc support $(DEMO) $(DOC) CLEANFILES = *~ diff --git a/configure.ac b/configure.ac index 23ae071..6cee368 100644 --- a/configure.ac +++ b/configure.ac @@ -17,8 +17,9 @@ dnl Checks for programs. AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL -AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) +AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) +AM_CONDITIONAL(DOCS, [test -n "${DOXYGEN}"]) dnl Determine host system type -- 1.6.6