Commit 71d77033 authored by Martyn Russell's avatar Martyn Russell

build: Don't use HAVE_GTK_DOC to determine building docs

Now we use ENABLE_GTK_DOC like other projects and have updated configure
according to the latest recommendations from the gtk-doc documentation.
Additionally, we only use ENABLE_GTK_DOC to disable building ontology
documentation because we use that before detection of the other tools we need
when building documentation (such as dia and graphviz).

Fixes GB#659995.
parent 04d1f13e
......@@ -548,11 +548,20 @@ AM_CONDITIONAL(DIST_FUNCTIONAL_TESTS, test "x$enable_functional_tests" != "xno")
# Check for gtk-doc and docbook-tools
####################################################################
# Check for GTK_DOC_CHECK availability. The GTK_DOC_CHECK invocation
# must be on its own line, gtkdocize relies on it
m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.8])
if test "x$enable_gtk_doc" != "xno"; then
AC_DEFINE(HAVE_GTK_DOC, 1, [Define if we have gtk-doc (with gtk-doc)])
# NOTE: We need to use a separate automake conditional for this
# to make this work with the tarballs.
AM_CONDITIONAL([ENABLE_GTK_DOC], test "x$enable_gtk_doc" = xyes)
],
[
AM_CONDITIONAL([ENABLE_GTK_DOC], false)
])
if test "x$enable_gtk_doc" != xno; then
# Check for dia if we are building gtk_doc
AC_PATH_PROG(DIA, dia)
AC_SUBST(DIA)
......@@ -570,7 +579,6 @@ if test "x$enable_gtk_doc" != "xno"; then
fi
fi
AM_CONDITIONAL(HAVE_GTK_DOC, test "$enable_gtk_doc" = "yes")
AM_CONDITIONAL(HAVE_GRAPHVIZ_FDP, test -n "$GRAPHVIZ_FDP")
####################################################################
......
include $(top_srcdir)/Makefile.decl
SUBDIRS = manpages design
SUBDIRS = manpages design tools reference
if HAVE_GTK_DOC
SUBDIRS += tools reference
# require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtk-doc:
else
dist-check-gtk-doc:
@echo "*** gtk-doc must be enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtk-doc
......@@ -4,6 +4,8 @@ SUBDIRS = \
libtracker-sparql \
libtracker-client \
libtracker-extract \
libtracker-miner \
ontology
libtracker-miner
if ENABLE_GTK_DOC
SUBDIRS += ontology
endif
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