Index: ChangeLog from Simon Odou <simon@lrde.epita.fr> * config/oln.m4: set TOOLS_LDFLAGS inside of LDFLAGS. * configure.ac: Export TOOLS_LDFLAGS. Index: doc/ChangeLog from Simon Odou <simon@lrde.epita.fr> * ref/out/exdoc.config.in: Use TOOLS_LDFLAGS instead of LDLAGS. Index: configure.ac --- configure.ac Wed, 23 Jun 2004 12:41:33 +0200 van-vl_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.6 600) +++ configure.ac Thu, 24 Jun 2004 17:47:30 +0200 simon (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.6 600) @@ -457,6 +457,7 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) AC_SUBST([DOC_CPPFLAGS]) +AC_SUBST([TOOLS_LDFLAGS]) AC_OUTPUT Index: config/oln.m4 --- config/oln.m4 Mon, 14 Jun 2004 17:26:55 +0200 odou_s (oln/j/15_oln.m4 1.38.1.7 600) +++ config/oln.m4 Thu, 24 Jun 2004 17:41:32 +0200 simon (oln/j/15_oln.m4 1.38.1.7 600) @@ -573,7 +573,9 @@ FFTW_LDFLAGS="-L${with_fftw}/lib" fi oln_save_CXXFLAGS=$CXXFLAGS + oln_save_LDFLAGS=$LDFLAGS CXXFLAGS="$CXXFLAGS $FFTW_CXXFLAGS" + LDFLAGS="$LDFLAGS $FFTW_LDFLAGS" oln_have_fftw=no AC_CHECK_HEADER([fftw.h], [AC_CHECK_LIB([fftw], @@ -583,7 +585,8 @@ AC_DEFINE([HAVE_FFTW], 1, [Define to 1 if we can use fftw])])]) CXXFLAGS=$oln_save_CXXFLAGS - LDFLAGS="$LDFLAGS $FFTW_LDFLAGS" + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $FFTW_LDFLAGS" fi AC_SUBST([FFTW_CXXFLAGS]) AC_SUBST([FFTW_LDFLAGS]) @@ -614,7 +617,9 @@ ZLIB_LDFLAGS="-L${with_zlib}/lib" fi oln_save_CXXFLAGS=$CXXFLAGS + oln_save_LDFLAGS=$LDFLAGS CXXFLAGS="$CXXFLAGS $ZLIB_CXXFLAGS" + LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS" oln_have_zlib=no AC_CHECK_HEADER([zlib.h], [AC_CHECK_LIB([z], @@ -624,7 +629,8 @@ AC_DEFINE([HAVE_ZLIB], 1, [Define to 1 if we can use zlib])])]) CXXFLAGS=$oln_save_CXXFLAGS - LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS" + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $ZLIB_LDFLAGS" fi AC_SUBST([ZLIB_CXXFLAGS]) AC_SUBST([ZLIB_LDFLAGS]) Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Mon, 14 Jun 2004 17:26:55 +0200 odou_s (oln/k/7_exdoc.conf 1.9 600) +++ doc/ref/out/exdoc.config.in Thu, 24 Jun 2004 17:52:19 +0200 simon (oln/k/7_exdoc.conf 1.9 600) @@ -5,7 +5,7 @@ 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 # FIXME: we should write the compilation line in the source file (for libs). - OPTIONS = @DOC_CPPFLAGS@ @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_builddir@/olena -I@top_srcdir@/olena -I@top_srcdir@/metalic -I@top_builddir@ $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" -DHAVE_CONFIG_H @LDFLAGS@ # 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 -I@top_builddir@ $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" -DHAVE_CONFIG_H @TOOLS_LDFLAGS@ # 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 -- Simon Odou simon@lrde.epita.fr