Commit b56e8791 authored by Martyn Russell's avatar Martyn Russell

Make graphviz a build dependency but only with gtk-doc enabled

parent b3960fe7
......@@ -222,10 +222,6 @@ fi
AC_PATH_PROG(VALAC, valac, valac)
AC_SUBST(VALAC)
AC_PATH_PROG(GRAPHVIZ_FDP, fdp)
AC_SUBST(GRAPHVIZ_FDP)
AM_CONDITIONAL(HAVE_GRAPHVIZ_FDP, test -n "$GRAPHVIZ_FDP")
# Check we have the DBUS binding tool we need
AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
if test -z $DBUSBINDINGTOOL; then
......@@ -364,7 +360,6 @@ AC_SUBST(GCOV_VALAFLAGS)
AC_SUBST(GCOV_CFLAGS)
AC_SUBST(GCOV_LIBS)
####################################################################
# Should we build GLib based unit tests
####################################################################
......@@ -1572,9 +1567,21 @@ AM_CONDITIONAL(DIST_FUNCTIONAL_TESTS, test "x$enable_functional_tests" != "xno")
GTK_DOC_CHECK([1.8])
AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
if test "x$enable_gtk_doc" != "xno"; then
AC_DEFINE(HAVE_GTK_DOC, 1, [Define if we have gtk-doc (with gtk-doc)])
# Check for graphviz if we are building gtk_doc
AC_PATH_PROG(GRAPHVIZ_FDP, fdp)
AC_SUBST(GRAPHVIZ_FDP)
if test -z "$GRAPHVIZ_FDP"; then
AC_MSG_ERROR([Couldn't find Graphviz's fdp tool (graphviz).])
fi
fi
AM_CONDITIONAL(HAVE_GTK_DOC, test "$enable_gtk_doc" = "yes")
AM_CONDITIONAL(HAVE_GRAPHVIZ_FDP, test -n "$GRAPHVIZ_FDP")
##################################################################
# Check for older tracker project files which can cause problems
##################################################################
......@@ -1723,6 +1730,8 @@ Build Configuration:
Win32: $native_win32
Enable gtk doc (for documentation): $enable_gtk_doc
Enable unit tests: $have_unit_tests
Enable unac accent stripper: $have_unac
......
include $(top_srcdir)/Makefile.decl
SUBDIRS = manpages design tools reference
SUBDIRS = manpages design
if HAVE_GTK_DOC
SUBDIRS += tools reference
endif
\ No newline at end of file
......@@ -44,27 +44,21 @@ gen-doc.stamp: ttl2sgml
$(top_srcdir)/docs/tools/gen-doc.sh
$(AM_V_GEN) touch $@
if HAVE_GRAPHVIZ_FDP
dist-check-graphviz:
else
dist-check-graphviz:
@echo "*** Graphviz's fdp tool must be installed in order to make dist"
@false
endif
ontology.dot: ontology-graph
$(AM_V_GEN) $(top_srcdir)/docs/tools/ontology-graph -d $(top_srcdir)/data/ontologies -o ontology.dot
ontology.png: ontology.dot
$(AM_V_GEN)$(GRAPHVIZ_FDP) -Tpng -o $(top_srcdir)/docs/reference/ontology/ontology.png ontology.dot
BUILT_SOURCES = gen-doc.stamp
BUILT_SOURCES = \
ontology.png \
gen-doc.stamp
EXTRA_DIST = \
gen-doc.sh \
EXTRA_DIST = \
gen-doc.sh \
$(BUILT_SOURCES)
DISTCLEANFILES = ontology.dot
CLEANFILES = $(BUILT_SOURCES)
dist-hook: dist-check-graphviz ontology.dot ontology.png
make-hook: ontology.dot ontology.png
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment