* m4/oln-with-lib.m4 (_OLN_WITH_LIB): Set $5_CPPFLAGS instead of $5_CXXFLAGS.

--- ChangeLog | 7 +++++++ m4/oln-with-lib.m4 | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 5d6c5ef..b9fe2db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain roland@lrde.epita.fr

+ Fix Automake macro OLN_WITH_LIB (again). + + * m4/oln-with-lib.m4 (_OLN_WITH_LIB): Set $5_CPPFLAGS instead of + $5_CXXFLAGS. + +2009-06-10 Roland Levillain roland@lrde.epita.fr + Complete the installation of the Make rule `tests' in Olena.

* Makefile.am (LOCAL_RECURSIVE_TARGETS): Add tests. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 11bd5d5..1f59714 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -15,7 +15,7 @@ # This macro sets the shell variable oln_have_`SHELL_NAME' to `yes' if # the library is found and if it is working (and to `no' otherwise), # and defines a CPP macro and an Automake conditional both named -# HAVE_`CPP_NAME'. It also sets `CPP_NAME'_CXXFLAGS and +# HAVE_`CPP_NAME'. It also sets `CPP_NAME'_CPPFLAGS and # `CPP_NAME'_LDFLAGS. # # Examples of use: @@ -71,7 +71,7 @@ AC_DEFUN([_OLN_WITH_LIB], LDFLAGS=$oln_save_LDFLAGS TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS" fi - AC_SUBST([$5_CXXFLAGS], [$5_CPPFLAGS]) + AC_SUBST([$5_CPPFLAGS]) AC_SUBST([$5_LDFLAGS]) AM_CONDITIONAL([HAVE_$5], [test x$oln_have_$4 = xyes]) AC_LANG_POP([C++])