* m4/with-swilena.m4 (_OLN_WITH_SWIG): Disable tests on Ruby.
---
ChangeLog | 6 ++++++
m4/with-swilena.m4 | 49 +++++++++++++++++++++++++++----------------------
2 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de54993..ed57f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-03 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Do not require Ruby for Swilena.
+
+ * m4/with-swilena.m4 (_OLN_WITH_SWIG): Disable tests on Ruby.
+
2009-05-29 Thierry Geraud <thierry.geraud(a)lrde.epita.fr>
Update makefile list.
diff --git a/m4/with-swilena.m4 b/m4/with-swilena.m4
index 5c52206..602abc6 100644
--- a/m4/with-swilena.m4
+++ b/m4/with-swilena.m4
@@ -50,28 +50,33 @@ if test x$with_swig != xno; then
CPPFLAGS=$save_CPPFLAGS
- # Check for Ruby.
- AC_CHECK_PROGS([RUBY], [ruby], [$am_aux_dir/missing ruby])
- if test "x$RUBY" = "x$am_aux_dir/missing ruby"; then
- AC_MSG_ERROR([no suitable Ruby interpreter found])
- fi
-
- AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h])
- AC_ARG_WITH([ruby-includedir], [Include path for ruby.h],
- [RUBY_CPPFLAGS="-I$withval"],
- [RUBY_CPPFLAGS="-I`$RUBY -e 'puts $:.join("\n")' | \
- while read line
- do
- if [[ -f ${line}/ruby.h ]]; then
- echo $line
- fi
- done`"])
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS"
- AC_CHECK_HEADERS([ruby.h], [],
- [AC_MSG_ERROR(
- [You need Ruby development files to compile the Ruby interface.])])
- CPPFLAGS=$save_CPPFLAGS
+# FIXME: Disabled. Swilena does not support Ruby again (as it used to
+# in Olena 0.11). Moreover, the user should be given the choice
+# between the front ends (Python, Ruby, etc.); enabling Swilena shall
+# not systematically imply compiling the *whole* back ends!
+#
+# # Check for Ruby.
+# AC_CHECK_PROGS([RUBY], [ruby], [$am_aux_dir/missing ruby])
+# if test "x$RUBY" = "x$am_aux_dir/missing ruby"; then
+# AC_MSG_ERROR([no suitable Ruby interpreter found])
+# fi
+#
+# AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h])
+# AC_ARG_WITH([ruby-includedir], [Include path for ruby.h],
+# [RUBY_CPPFLAGS="-I$withval"],
+# [RUBY_CPPFLAGS="-I`$RUBY -e 'puts $:.join("\n")' | \
+# while read line
+# do
+# if [[ -f ${line}/ruby.h ]]; then
+# echo $line
+# fi
+# done`"])
+# save_CPPFLAGS=$CPPFLAGS
+# CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS"
+# AC_CHECK_HEADERS([ruby.h], [],
+# [AC_MSG_ERROR(
+# [You need Ruby development files to compile the Ruby interface.])])
+# CPPFLAGS=$save_CPPFLAGS
AC_PROG_SWIG([1.3.31])
if (eval "$SWIG -version") >/dev/null 2>&1; then :; else
--
1.6.1.2
