From 5063c86f4ffc703ce0026ce2c84cd42d15df0e83 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 9 Oct 2008 20:16:41 +0000 Subject: [PATCH] fix doxygen m4 macro (make it more efl-ish and fix a bug) SVN revision: 36552 --- legacy/eina/configure.ac | 2 -- legacy/eina/doc/Makefile.am | 2 +- legacy/eina/m4/{doxygen.m4 => efl_doxygen.m4} | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) rename legacy/eina/m4/{doxygen.m4 => efl_doxygen.m4} (96%) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index e1844601e8..41e81c71fa 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -211,8 +211,6 @@ AC_PROG_CC EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) -AM_CONDITIONAL(EINA_BUILD_DOC, test "x${build_doc}" = "xyes") - ### Checks for types diff --git a/legacy/eina/doc/Makefile.am b/legacy/eina/doc/Makefile.am index 397357913b..d1fd867697 100644 --- a/legacy/eina/doc/Makefile.am +++ b/legacy/eina/doc/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in .PHONY: doc -if EINA_BUILD_DOC +if EFL_BUILD_DOC doc: all rm -rf html/ latex/ man/ diff --git a/legacy/eina/m4/doxygen.m4 b/legacy/eina/m4/efl_doxygen.m4 similarity index 96% rename from legacy/eina/m4/doxygen.m4 rename to legacy/eina/m4/efl_doxygen.m4 index 8b2897179b..e12f2e2426 100644 --- a/legacy/eina/m4/doxygen.m4 +++ b/legacy/eina/m4/efl_doxygen.m4 @@ -69,7 +69,9 @@ AC_ARG_WITH([doxygen], dnl dnl Substitution dnl -AC_SUBST([DOXYGEN]) +AC_SUBST([${DOXYGEN]]) + +AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes") if test "x${BUILD_DOCS}" = "xyes" ; then ifelse([$1], , :, [$1])