Changeset 1397


Ignore:
Timestamp:
Aug 6, 2008, 7:56:39 PM (13 years ago)
Author:
Peter
Message:

fixes #409

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r1371 r1397  
    8181
    8282[http://www.doxygen.org/ Doxygen] is required for generation of the
    83 API documentation
     83API documentation. Doxygen uses a number of applications, epstopdf,
     84latex, makeindex, and pdflatex. If any of these applications are
     85missing, generation of API documentation is disabled.
    8486
    8587= Documentation =
  • trunk/configure.ac

    r1394 r1397  
    5959AC_PROG_INSTALL
    6060AC_PROG_SED
    61 AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [true], [false])
    62 
    63 AM_CONDITIONAL(HAVE_DOXYGEN, test "$HAVE_DOXYGEN" = "true")
     61
     62AC_MSG_NOTICE([checking whether tools for generating documentation is available])
     63have_dox_tools="yes"
     64AC_PATH_PROG([DOXYGEN], [doxygen], [no])
     65if test "$DOXYGEN" = "no"; then
     66   AC_MSG_WARN([unable to find doxygen application])
     67   have_dox_tools=no
     68fi
     69AC_CHECK_PROG([have_epstopdf], [epstopdf], [yes], [no])
     70if test "$have_epstopdf" != "yes"; then
     71   AC_MSG_WARN([unable to find epstopdf application])
     72   have_dox_tools=no
     73fi
     74AC_CHECK_PROG([have_latex], [latex], [yes], [no])
     75if test "$have_latex" != "yes"; then
     76   AC_MSG_WARN([unable to find latex application])
     77fi
     78AC_CHECK_PROG([have_makeindex], [makeindex], [yes], [no])
     79if test "$have_makeindex" != "yes"; then
     80   AC_MSG_WARN([unable to find makeindex application])
     81   have_dox_tools=no
     82fi
     83AC_CHECK_PROG([have_pdflatex], [pdflatex], [yes], [no])
     84if test "$have_pdflatex" != "yes"; then
     85   AC_MSG_WARN([unable to find pdflatex application])
     86   have_dox_tools=no
     87fi
     88
     89AM_CONDITIONAL(HAVE_DOXYGEN, test "$have_dox_tools" = "yes")
    6490AC_CONFIG_FILES([test/documentation_test.sh],
    6591                [chmod +x test/documentation_test.sh])
     
    229255
    230256# warning about missing doxygen
    231 if (test "$HAVE_DOXYGEN" != "true") ; then
    232   AC_MSG_WARN([
    233   Doxygen was not found. Yat will compile and work without doxygen.
    234   However, in order to enable generation of documentation, please
    235   install Doxygen available at http://www.doxygen.org/
     257if (test "$HAVE_DOX_TOOLS" != "yes") ; then
     258  AC_MSG_WARN([
     259  Some pre-requisites for generating documentation were not
     260  fulfilled. The build will not create any documentation.
     261  Please consult the 'README' file for more information about
     262  what is needed to generate documentation and refer to above
     263  warning messages.
    236264  ])
    237265fi
  • trunk/doc/Makefile.am

    r1347 r1397  
    6969
    7070$(DX_HTML_OUTPUT)/index.html: Makefile doxygen.config stamp-doxygen
    71   @(cat doxygen.config; $(ECHO) GENERATE_HTML = YES) | doxygen -;
     71  @(cat doxygen.config; $(ECHO) GENERATE_HTML = YES) | $(DOXYGEN) -;
    7272
    7373$(DX_LATEX_OUTPUT)/refman.tex: Makefile doxygen.config stamp-doxygen
    74   @(cat doxygen.config; $(ECHO) GENERATE_LATEX = YES) | doxygen -;
     74  @(cat doxygen.config; $(ECHO) GENERATE_LATEX = YES) | $(DOXYGEN) -;
    7575
    7676$(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
Note: See TracChangeset for help on using the changeset viewer.