* configure.ac: ...here. Adjust paths accordingly. --- extatica/ChangeLog | 7 +++++++ extatica/configure.ac | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index ebffa33..0e17c33 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland@lrde.epita.fr> + Add support for configuration option `--with-milena' in Extatica. + + * configure.ac: ...here. + Adjust paths accordingly. + +2010-11-08 Roland Levillain <roland@lrde.epita.fr> + Fix the distribution of Extatica. * config/Makefile.am (ruby.m4): Remove wrong and useless diff --git a/extatica/configure.ac b/extatica/configure.ac index f872d57..a22bf98 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -200,8 +200,35 @@ AC_SUBST([DYN_DATADIR], [$my_abs_builddir/data]) AC_SUBST([DYN_FIXTURES], [$my_abs_srcdir/test/fixtures]) +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Extatica a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +# FIXME: Make Milena an optional dependency of Extatica. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Swilena. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS # Absolute path to Milena. -AC_SUBST([MILENA_DIR], [$my_abs_srcdir/../milena]) +MILENA_DIR=`cd "$with_milena" && pwd` +AC_SUBST([MILENA_DIR]) ## ------------------- ## ## Ruby Configuration. ## -- 1.5.6.5