diff options
| author | Tiago Vignatti <tiago.vignatti@intel.com> | 2012-10-12 20:54:45 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-10-15 13:10:08 -0400 |
| commit | 008760822b973ff1f8122533787a4dadeed7e2a8 (patch) | |
| tree | c185575df7ea1b058a286c698c19c2791b5dcbb1 | |
| parent | doc: doxygen: Add .gitignore (diff) | |
| download | wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar.gz wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar.bz2 wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar.lz wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar.xz wayland-008760822b973ff1f8122533787a4dadeed7e2a8.tar.zst wayland-008760822b973ff1f8122533787a4dadeed7e2a8.zip | |
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 <tiago.vignatti@intel.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8f5f83e..306d7b3 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 860d715..c4e1f63 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([ |