mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-04 07:15:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Make documentation option work in fact

Browse source 
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>
This commit is contained in:
Tiago Vignatti 2012-10-12 20:54:45 +03:00 • committed by Kristian Høgsberg
parent 96a6ee58b9
commit 008760822b
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -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} ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

9
configure.ac
View file

@ -43,7 +43,7 @@ AC_CHECK_FUNCS([accept4 mkostemp])
AC_ARG_ENABLE([scanner], AC_ARG_ENABLE([scanner],
[AC_HELP_STRING([--disable-scanner], [AC_HELP_STRING([--disable-scanner],
[Disable compilation of wayland-scannner])], [Disable compilation of wayland-scanner])],
[], [],
[enable_scanner=yes]) [enable_scanner=yes])
@ -76,7 +76,14 @@ fi
AC_PATH_PROG(XSLTPROC, xsltproc) AC_PATH_PROG(XSLTPROC, xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
AM_CONDITIONAL(BUILD_DOCS, [test x$enable_documentation = xyes])
if test "x$enable_documentation" = "xyes"; then 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_PATH_PROG(PUBLICAN, publican)
AC_CONFIG_FILES([ AC_CONFIG_FILES([