From: Pierre C. <ca...@gm...> - 2009-01-22 21:20:42
|
Enlightenment SVN wrote: > Log: > fix logic in efl_doxygen.m4 > > Author: caro > Date: 2009-01-22 13:14:12 -0800 (Thu, 22 Jan 2009) > New Revision: 38700 > > Modified: > trunk/eet/configure.ac trunk/eet/doc/Makefile.am trunk/eet/m4/efl_doxygen.m4 > > Modified: trunk/eet/configure.ac > =================================================================== > --- trunk/eet/configure.ac 2009-01-22 20:55:22 UTC (rev 38699) > +++ trunk/eet/configure.ac 2009-01-22 21:14:12 UTC (rev 38700) > @@ -365,7 +365,7 @@ > echo " Cipher support.....: ${have_cipher}" > echo " Signature..........: ${have_signature}" > echo > -echo " Documentation........: ${enable_doc}" > +echo " Documentation........: ${build_doc}" > echo " Tests................: ${enable_tests}" > echo " Coverage.............: ${enable_coverage}" > echo > > Modified: trunk/eet/doc/Makefile.am > =================================================================== > --- trunk/eet/doc/Makefile.am 2009-01-22 20:55:22 UTC (rev 38699) > +++ trunk/eet/doc/Makefile.am 2009-01-22 21:14:12 UTC (rev 38700) > @@ -10,8 +10,8 @@ > doc-clean: > rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar* > > -doc: all doc-clean > - $(DOXYGEN) > +doc: doc-clean > + $(efl_doxygen) > cp img/* html/ > rm -rf $(PACKAGE_DOCNAME).tar* > mkdir -p $(PACKAGE_DOCNAME)/doc > > Modified: trunk/eet/m4/efl_doxygen.m4 > =================================================================== > --- trunk/eet/m4/efl_doxygen.m4 2009-01-22 20:55:22 UTC (rev 38699) > +++ trunk/eet/m4/efl_doxygen.m4 2009-01-22 21:14:12 UTC (rev 38700) > @@ -11,52 +11,55 @@ > 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"] > ) > > dnl > dnl Specify the full file name, with path > dnl > + > +efl_doxygen="doxygen" > + > AC_ARG_WITH([doxygen], > - AC_HELP_STRING( > - [--with-doxygen=FILE], > - [doxygen program to use @<:@default=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}], > + AC_CHECK_PROG([efl_have_doxygen], > + [${efl_doxygen}], > [yes], > [no]) > - if test "x${BUILD_DOCS}" = "xno" ; then > + if test "x${efl_have_doxygen}" = "xno" ; then > echo "WARNING:" > echo "The doxygen program you specified:" > - echo "$DOXYGEN" > + 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([BUILD_DOCS], > - [${DOXYGEN}], > + [AC_CHECK_PROG([efl_have_doxygen], > + [${efl_doxygen}], > [yes], > [no]) > - if test "x${BUILD_DOCS}" = "xno" ; then > + 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." > @@ -73,11 +76,15 @@ > dnl > dnl Substitution > 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]) > else > ifelse([$2], , :, [$2]) > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by: > SourcForge Community > SourceForge wants to tell your story. > http://p.sf.net/sfu/sf-spreadtheword > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > Why test for doxygen if no doc is needed? see patch at trac #198 Also, wouldn't it be easier if all efl_doxygen.m4 file are the same all over the efl's? Vtorri will post his patches tonight also. I hope they are the same :) cazze |
From: Vincent T. <vt...@un...> - 2009-01-22 23:07:32
|
On Thu, 22 Jan 2009, Pierre Cassimans wrote: > Why test for doxygen if no doc is needed? see patch at trac #198 I was lazy :p I'll fix that > Also, wouldn't it be easier if all efl_doxygen.m4 file are the same all > over the efl's? i'll copy that all over the efl using 'make doc', don't worry. But I'll wait for the patch to be tested a bit first :) > Vtorri will post his patches tonight also. I hope they are the same :) Like Jimmy Cliff says: "We Are The Same Person" :) Vincent |