Index: ChangeLog
from Simon Odou <simon(a)lrde.epita.fr>
* configure.ac: Perl is needed by Doxygen.
Doxygen is needed for reference manual, not for documentation.
* doc/ref/doxygen.config.in: Autoconf sets the perl path.
configure.ac | 24 +++++++++++-------------
doc/ref/doxygen.config.in | 4 ++--
2 files changed, 13 insertions(+), 15 deletions(-)
Index: configure.ac
--- configure.ac (revision 24)
+++ configure.ac (working copy)
@@ -189,20 +189,7 @@
### Stuff pertaining to the documentation
###
-### The reference manual uses Doxygen
-### FIXME: could be much better.
- AC_ARG_WITH([doc],
- [Doxygen is needed to build the doc],
- [AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
- AC_CHECK_DOXYGEN_VERSION],
- [])
-
-## if test -z "$DOXYGEN"; then
-## AC_MSG_WARN([`doxygen' not found -- `doxygen' must be installed to generate
the documentation])
-
-## fi
-
### The documentation tree is both a component...
OLN_NON_COMPONENT([doc],
@@ -224,6 +211,17 @@
[doc/ref/Makefile],
[dnl Configuration for the manuals directory.
+ ### The reference manual uses Doxygen
+ ### FIXME: could be much better.
+
+ AC_ARG_WITH([doc-ref],
+ [Doxygen is needed to build the doc],
+ [AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
+ AC_CHECK_DOXYGEN_VERSION],
+ [])
+
+ AC_ARG_VAR([PERL], [Practical Extraction and Report Language])
+ AC_CHECK_PROGS([PERL], [perl], [$am_aux_dir/missing perl])
AC_ARG_VAR([TAR], [the tape archiver program])
AC_CHECK_PROGS([TAR], [tar], [$am_aux_dir/missing tar])
AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files])
Index: doc/ref/doxygen.config.in
--- doc/ref/doxygen.config.in (revision 24)
+++ doc/ref/doxygen.config.in (working copy)
@@ -39,7 +39,7 @@
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
-ALIASES = pouetcaption=
+ALIASES =
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
OPTIMIZE_OUTPUT_FOR_C = NO
@@ -181,7 +181,7 @@
GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
+PERL_PATH = @PERL@
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
Show replies by date