* m4/efl_doxygen.m4:

fix logic in efl_doxygen.m4



SVN revision: 38880
This commit is contained in:
Vincent Torri 2009-02-01 06:55:53 +00:00
parent f747799981
commit f15f2c1c64
2 changed files with 66 additions and 51 deletions

View File

@ -1,3 +1,8 @@
2009-02-01 Vincent Torri <doursse at users dot sf dot net>
* m4/efl_doxygen.m4:
fix logic in efl_doxygen.m4
2009-01-24 Vincent Torri <doursse at users dot sf dot net> 2009-01-24 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_fcntl.c: * src/lib/evil_fcntl.c:

View File

@ -11,73 +11,83 @@ dnl
AC_DEFUN([EFL_CHECK_DOXYGEN], AC_DEFUN([EFL_CHECK_DOXYGEN],
[ [
DOXYGEN="doxygen"
dnl dnl
dnl Disable the build of the documentation dnl Disable the build of the documentation
dnl dnl
AC_ARG_ENABLE([doc], AC_ARG_ENABLE([doc],
AC_HELP_STRING( [AC_HELP_STRING(
[--disable-doc], [--disable-doc],
[Disable the build of the documentation]), [Disable documentation build @<:@default=enabled@:>@])],
[if test "${disable_doc}" = "yes" ; then [
enable_doc="no" if test "x${enableval}" = "xyes" ; then
efl_enable_doc="yes"
else else
enable_doc="yes" efl_enable_doc="no"
fi], fi
[enable_doc="yes"] ],
[efl_enable_doc="yes"]
) )
if test "x${efl_enable_doc}" = "xyes" ; then
dnl dnl
dnl Specify the full file name, with path dnl Specify the full file name, with path
dnl dnl
AC_ARG_WITH([doxygen],
AC_HELP_STRING( efl_doxygen="doxygen"
[--with-doxygen=FILE],
[doxygen program to use @<:@default=doxygen@:>@]), AC_ARG_WITH([doxygen],
dnl [AC_HELP_STRING(
dnl Check the given doxygen program. [--with-doxygen=FILE],
dnl [doxygen program to use @<:@default=doxygen@:>@])],
[DOXYGEN=${withval} dnl
AC_CHECK_PROG([BUILD_DOCS], dnl Check the given doxygen program.
[${DOXYGEN}], dnl
[yes], [DOXYGEN=${withval}
[no]) AC_CHECK_PROG([efl_have_doxygen],
if test "x${BUILD_DOCS}" = "xno" ; then [${efl_doxygen}],
echo "WARNING:" [yes],
echo "The doxygen program you specified:" [no])
echo "$DOXYGEN" if test "x${efl_have_doxygen}" = "xno" ; then
echo "was not found. Please check the path and make sure " echo "WARNING:"
echo "the program exists and is executable." echo "The doxygen program you specified:"
AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) echo "$efl_doxygen"
fi echo "was not found. Please check the path and make sure "
], echo "the program exists and is executable."
[AC_CHECK_PROG([BUILD_DOCS], AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
[${DOXYGEN}], fi
[yes], ],
[no]) [AC_CHECK_PROG([efl_have_doxygen],
if test "x${BUILD_DOCS}" = "xno" ; then [${efl_doxygen}],
echo "WARNING:" [yes],
echo "The doxygen program was not found in your execute" [no])
echo "You may have doxygen installed somewhere not covered by your path." if test "x${efl_have_doxygen}" = "xno" ; then
echo "" echo "WARNING:"
echo "If this is the case make sure you have the packages installed, AND" echo "The doxygen program was not found in your execute"
echo "that the doxygen program is in your execute path (see your" echo "You may have doxygen installed somewhere not covered by your path."
echo "shell manual page on setting the \$PATH environment variable), OR" echo ""
echo "alternatively, specify the program to use with --with-doxygen." echo "If this is the case make sure you have the packages installed, AND"
AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) echo "that the doxygen program is in your execute path (see your"
fi 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
dnl Substitution dnl Substitution
dnl dnl
AC_SUBST([DOXYGEN]) AC_SUBST([efl_doxygen])
AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes") if ! test "x${efl_have_doxygen}" = "xyes" ; then
efl_enable_doc="no"
fi
if test "x${BUILD_DOCS}" = "xyes" ; then AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
if test "x${efl_enable_doc}" = "xyes" ; then
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
else else
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])