From 90d2d7c80f070a443f46eb7f1409b70bd86af958 Mon Sep 17 00:00:00 2001
From: Thimo Neubauer <thimo@dune-project.org>
Date: Fri, 22 Oct 2004 12:06:20 +0000
Subject: [PATCH] don't fail dring make if a program to build documentation is
 not found.

[[Imported from SVN: r965]]
---
 configure.ac         | 7 +++++++
 doc/Makefile.am      | 2 +-
 istl/doc/Makefile.am | 6 ------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index febaa261f..1fe9d8fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,13 @@ AC_PROG_CXX
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 
+# check for auxiliary tools so that it's not fatal if they're missing
+AC_CHECK_PROGS([DOXYGEN], [doxygen], [true])
+AC_CHECK_PROGS([TEX], [latex], [true])
+AC_CHECK_PROGS([BIBTEX], [bibtex], [true])
+AC_CHECK_PROGS([DVIPDF], [dvipdf], [true])
+AC_CHECK_PROGS([DVIPS], [dvips], [true])
+
 # write output
 AC_CONFIG_FILES([Makefile
 	         common/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4fc614fe8..a34b12809 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@ all: doxygen-tag
 
 doxygen-tag: Doxyfile
 @AMDEP_TRUE@	./Doxydep $< $(DEPDIR)/doxygen.Po $@
-	doxygen > doxygen.log 2>&1
+	$(DOXYGEN) > doxygen.log 2>&1
 	touch doxygen-tag
 
 WEBDIR = /var/www/dune/doxygen
diff --git a/istl/doc/Makefile.am b/istl/doc/Makefile.am
index cf0d54ac5..69673c83c 100644
--- a/istl/doc/Makefile.am
+++ b/istl/doc/Makefile.am
@@ -2,12 +2,6 @@
 
 dist_pkgdata_DATA = istl.pdf istl.ps
 
-# !! let autoconf find the binaries
-TEX = latex
-BIBTEX = bibtex
-DVIPDF = dvipdf
-DVIPS = dvips
-
 SUFFIXES = .dvi .tex .pdf
 
 # rerun TEX if log-file suggests that
-- 
GitLab