Commit b46e36d3 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'autotools-update' into 'master'

Handle disable doxygen configure option

Previously this broke when using the --disable-doxygen-doc option
as detailed in #44.

See merge request !33

Former-commit-id: 840b6991d97b81feacf07cce60fc9e4193da78de
parents 3c9a3d8a 37dfee80
......@@ -279,8 +279,9 @@ AC_MSG_RESULT($rtc_ok)
AC_PATH_PROG([GIT_CMD], [git])
AC_SUBST([GIT_CMD])
# Make the documentation.
# Make the documentation. Add conditional to handle disable option.
DX_INIT_DOXYGEN(libswift,doc/Doxyfile,doc/)
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
# Handle .in files.
AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile doc/Makefile doc/Doxyfile])
......
doxyfile.stamp:
if HAVE_DOXYGEN
@DX_ENV@ @DX_DOXYGEN@ Doxyfile
echo `date` > doxyfile.stamp
endif
CLEANFILES = doxyfile.stamp
......
Supports Markdown
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