From 37dfee80b9c9f2b0a07214a64abd831a9f7f0449 Mon Sep 17 00:00:00 2001 From: "Peter W. Draper" <p.w.draper@durham.ac.uk> Date: Mon, 7 Sep 2015 11:12:49 +0100 Subject: [PATCH] Handle disable doxygen configure option Previously this broke when using the --disable-doxygen-doc option Former-commit-id: f89fa64e4b00c94f5d83e10e6983e6708c99f6ad --- configure.ac | 3 ++- doc/Makefile.am | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cbdbf5469b..f1d69e1eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -290,8 +290,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]) diff --git a/doc/Makefile.am b/doc/Makefile.am index cb645898f5..1736a4ad81 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,9 @@ + doxyfile.stamp: +if HAVE_DOXYGEN @DX_ENV@ @DX_DOXYGEN@ Doxyfile echo `date` > doxyfile.stamp +endif CLEANFILES = doxyfile.stamp -- GitLab