[Olena-patches] oln 10.139: Fixes for g++-3.2 and the documentation generation

Index: ChangeLog from Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; * configure.ac: Add a workaround for some versions of cc1plus. Add new variable `DOC_CPPFLAGS' for the documentation generation. * config/oln.m4: Readd normal flags for g++-3.2 Add `DOC_CPPFLAGS ' affectation. +2004-04-09 Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; + * cleanup.sh: Replace `-or' by `-o' which is more portable. * config/oln.m4: Improve quoting. Index: doc/ChangeLog from Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; * doc/ref/Makefile.am: Remove MY_CPPFLAGS. * doc/ref/exdoc.pl: Likewise. * doc/ref/out/exdoc.config.in: Remove the use of the third argument. The script directly use the `DOC_CPPFLAGS' variable. +2004-04-09 Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; + * doc/ref/Makefile.am: Fix files cleaning. Add MY_CPPFLAGS=... when running make on out/makefile. * doc/ref/exdoc.pl: Add a third argument to the generated scripts. Index: configure.ac --- configure.ac Mon, 29 Mar 2004 00:39:14 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16 600) +++ configure.ac Fri, 09 Apr 2004 16:51:18 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.17 600) @@ -436,6 +436,18 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) + +# Workaround for old versions of cc1plus. + +if test x"$srcdir" = x. ; then + DEFAULT_INCLUDES=-I. +else + DEFAULT_INCLUDES="-I. -I\$(srcdir)" +fi +AC_SUBST([DEFAULT_INCLUDES]) +AC_SUBST([DOC_CPPFLAGS]) + + AC_OUTPUT if test "x$oln_cxxflags_clean" = xno; then Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.18 600) +++ doc/ref/Makefile.am Fri, 09 Apr 2004 16:07:11 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.19 600) @@ -15,7 +15,7 @@ doxy: $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img - cd $(OUT_DIR) && $(MAKE) -f makefile MY_CPPFLAGS="$(CPPFLAGS)" + cd $(OUT_DIR) && $(MAKE) -f makefile $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config Index: config/oln.m4 --- config/oln.m4 Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/j/15_oln.m4 1.39 600) +++ config/oln.m4 Fri, 09 Apr 2004 16:48:18 +0200 thivol_d (oln/j/15_oln.m4 1.40 600) @@ -350,6 +350,7 @@ CPPFLAGS=$oln_save_CPPFLAGS]) if test "x$[]oln_cv_$1_flags" = xredef; then CPPFLAGS="$CPPFLAGS -DNEED_$2" + DOC_CPPFLAGS="$DOC_CPPFLAGS -DNEED_$2" elif test "x$[]oln_cv_$1_flags" = xisodef; then CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE=1" fi @@ -435,7 +436,7 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep [' 3\.[34]'] >/dev/null ; then + if $CXX --version | grep [' 3\.[234]'] >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: doc/ref/exdoc.pl --- doc/ref/exdoc.pl Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/v/26_exdoc.pl 1.5 700) +++ doc/ref/exdoc.pl Fri, 09 Apr 2004 16:07:29 +0200 thivol_d (oln/v/26_exdoc.pl 1.6 700) @@ -254,7 +254,7 @@ print $makefile "chmod 700 ./\$<.cmd "; print $makefile "&& eval ./\$@."; print $makefile $config[$i]{"ext"}; - print $makefile ".cmd \$< \$@ \"\$(MY_CPPFLAGS)\""; + print $makefile ".cmd \$< \$@"; print $makefile "\n\n"; } Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/k/7_exdoc.conf 1.6 600) +++ doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 16:07:42 +0200 thivol_d (oln/k/7_exdoc.conf 1.7 600) @@ -4,7 +4,7 @@ TAG_CLOSE = endcode CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers - OPTIONS = $3 @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_builddir@/olena -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags + OPTIONS = @DOC_CPPFLAGS@ @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_builddir@/olena -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags OUT = out # FIXME: should be obsolete EXT = cc # Extension of generated file STD_OUT_EXT = std # Extension of generated file standard output -- Damien Thivolle damien.thivolle(a)lrde.epita.fr