From 008760822b973ff1f8122533787a4dadeed7e2a8 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Fri, 12 Oct 2012 20:54:45 +0300 Subject: [PATCH] configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti --- Makefile.am | 6 +++++- configure.ac | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8f5f83e5..306d7b33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = src protocol doc tests cursor +if BUILD_DOCS +doc_subdir = doc +endif + +SUBDIRS = src protocol $(doc_subdir) tests cursor ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/configure.ac b/configure.ac index 860d715f..c4e1f635 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_CHECK_FUNCS([accept4 mkostemp]) AC_ARG_ENABLE([scanner], [AC_HELP_STRING([--disable-scanner], - [Disable compilation of wayland-scannner])], + [Disable compilation of wayland-scanner])], [], [enable_scanner=yes]) @@ -76,7 +76,14 @@ fi AC_PATH_PROG(XSLTPROC, xsltproc) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) +AM_CONDITIONAL(BUILD_DOCS, [test x$enable_documentation = xyes]) if test "x$enable_documentation" = "xyes"; then + AC_PATH_PROG(DOXYGEN, doxygen) + + if test "x$DOXYGEN" = "x"; then + AC_MSG_ERROR([Documentation build requested but doxygen not found. Install doxygen or disable the documentation using --disable-documentation]) + fi + AC_PATH_PROG(PUBLICAN, publican) AC_CONFIG_FILES([