[Olena-patches] proto-1.0 69: Maintenance on configure.ac and oln.m4

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Prevent .in files from the doc from being needed when the doc is not going to be built. * config/oln.m4: Change OLN_VERSION to 1.0. config/oln.m4 | 2 +- configure.ac | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) Index: configure.ac --- configure.ac (revision 59) +++ configure.ac (working copy) @@ -19,7 +19,6 @@ OLN_PATH_LOCAL([olena]) AC_WITH_OLN -echo $CPPFLAGS # Some library archives are used. Some C code used. AC_PROG_RANLIB @@ -39,10 +38,8 @@ metalic/mlc/Makefile olena/Makefile olena/oln/Makefile - olena/oln/config/pconf.hh:olena/oln/config/pconf-hh.in - doc/ref/out/exdoc.config:doc/ref/out/exdoc.config.in - doc/ref/exdoc.mk:doc/ref/exdoc.mk.in - doc/ref/doxygen.config:doc/ref/doxygen.config.in]) + olena/img/Makefile + olena/oln/config/pconf.hh:olena/oln/config/pconf-hh.in]) ### Olena components. @@ -104,6 +101,7 @@ OLN_TESTS([core]) OLN_TESTS([sanity]) OLN_TESTS([io]) + OLN_TESTS([level]) AC_SUBST([OLN_TESTS_SUBDIRS]) @@ -141,6 +139,8 @@ # NTG_TESTS defined in oln-local.m4 NTG_TESTS([sanity]) + NTG_TESTS([types]) + NTG_TESTS([utils]) AC_SUBST([NTG_TESTS_SUBDIRS]) @@ -216,6 +216,12 @@ ### The reference manual uses Doxygen ### FIXME: could be much better. + AC_CONFIG_FILES([ + doc/ref/out/exdoc.config:doc/ref/out/exdoc.config.in + doc/ref/exdoc.mk:doc/ref/exdoc.mk.in + doc/ref/doxygen.config:doc/ref/doxygen.config.in]) + + AC_ARG_WITH([doc-ref], [Doxygen is needed to build the doc], [AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen]) Index: config/oln.m4 --- config/oln.m4 (revision 59) +++ config/oln.m4 (working copy) @@ -628,7 +628,7 @@ ### # $Format: "m4_define([OLN_VERSION], [0.$ProjectMajorVersion$])"$ -m4_define([OLN_VERSION], [0.10]) +m4_define([OLN_VERSION], [1.0]) m4_define([OLN_CONTACT], [olena-bugs(a)lrde.epita.fr]) # OLN_COLLECTION([subdirs-variable-name],