From 54ad27419c6d784e5eb20cb5984b955de1c59de2 Mon Sep 17 00:00:00 2001 From: caro Date: Sun, 1 Feb 2009 06:52:37 +0000 Subject: [PATCH] fix logic in efl_doxygen.m4 git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@38877 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- m4/efl_doxygen.m4 | 112 +++++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 51 deletions(-) diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4 index 49a3dfa..eaac993 100644 --- a/m4/efl_doxygen.m4 +++ b/m4/efl_doxygen.m4 @@ -11,73 +11,83 @@ dnl AC_DEFUN([EFL_CHECK_DOXYGEN], [ -DOXYGEN="doxygen" - dnl dnl Disable the build of the documentation dnl AC_ARG_ENABLE([doc], - AC_HELP_STRING( - [--disable-doc], - [Disable the build of the documentation]), - [if test "${disable_doc}" = "yes" ; then - enable_doc="no" + [AC_HELP_STRING( + [--disable-doc], + [Disable documentation build @<:@default=enabled@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + efl_enable_doc="yes" else - enable_doc="yes" - fi], - [enable_doc="yes"] + efl_enable_doc="no" + fi + ], + [efl_enable_doc="yes"] ) +if test "x${efl_enable_doc}" = "xyes" ; then + dnl dnl Specify the full file name, with path dnl -AC_ARG_WITH([doxygen], - AC_HELP_STRING( - [--with-doxygen=FILE], - [doxygen program to use @<:@default=doxygen@:>@]), - dnl - dnl Check the given doxygen program. - dnl - [DOXYGEN=${withval} - AC_CHECK_PROG([BUILD_DOCS], - [${DOXYGEN}], - [yes], - [no]) - if test "x${BUILD_DOCS}" = "xno" ; then - echo "WARNING:" - echo "The doxygen program you specified:" - echo "$DOXYGEN" - echo "was not found. Please check the path and make sure " - echo "the program exists and is executable." - AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) - fi - ], - [AC_CHECK_PROG([BUILD_DOCS], - [${DOXYGEN}], - [yes], - [no]) - if test "x${BUILD_DOCS}" = "xno" ; then - echo "WARNING:" - echo "The doxygen program was not found in your execute" - echo "You may have doxygen installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the doxygen program is in your execute path (see your" - echo "shell manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the program to use with --with-doxygen." - AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) - fi - ] -) + + efl_doxygen="doxygen" + + AC_ARG_WITH([doxygen], + [AC_HELP_STRING( + [--with-doxygen=FILE], + [doxygen program to use @<:@default=doxygen@:>@])], +dnl +dnl Check the given doxygen program. +dnl + [DOXYGEN=${withval} + AC_CHECK_PROG([efl_have_doxygen], + [${efl_doxygen}], + [yes], + [no]) + if test "x${efl_have_doxygen}" = "xno" ; then + echo "WARNING:" + echo "The doxygen program you specified:" + echo "$efl_doxygen" + echo "was not found. Please check the path and make sure " + echo "the program exists and is executable." + AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) + fi + ], + [AC_CHECK_PROG([efl_have_doxygen], + [${efl_doxygen}], + [yes], + [no]) + if test "x${efl_have_doxygen}" = "xno" ; then + echo "WARNING:" + echo "The doxygen program was not found in your execute" + echo "You may have doxygen installed somewhere not covered by your path." + echo "" + echo "If this is the case make sure you have the packages installed, AND" + echo "that the doxygen program is in your execute path (see your" + echo "shell manual page on setting the \$PATH environment variable), OR" + echo "alternatively, specify the program to use with --with-doxygen." + AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) + fi + ] + ) +fi dnl dnl Substitution dnl -AC_SUBST([DOXYGEN]) +AC_SUBST([efl_doxygen]) + +if ! test "x${efl_have_doxygen}" = "xyes" ; then + efl_enable_doc="no" +fi -AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes") +AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes") -if test "x${BUILD_DOCS}" = "xyes" ; then +if test "x${efl_enable_doc}" = "xyes" ; then ifelse([$1], , :, [$1]) else ifelse([$2], , :, [$2]) -- 2.7.4