2006-06-30 Roland Levillain <roland(a)lrde.epita.fr>
* config/oln.m4 (AC_CHECK_SWIG_FLAGS): Don't check for the `-c'
nor the `-noruntime' flags.
Index: 10.223/config/oln.m4
--- 10.223/config/oln.m4 Thu, 15 Sep 2005 17:50:38 +0200 levill_r (oln/j/15_oln.m4
1.38.1.11 600)
+++ 10.223(w)/config/oln.m4 Fri, 30 Jun 2006 11:52:07 +0200 levill_r (oln/j/15_oln.m4
1.38.1.11 600)
@@ -319,25 +319,28 @@
AC_LANG_POP([C++])
])
-# Recent versions of SWIG use -nountime instead of -c
+# Recent versions of SWIG no longer link with a runtime library (the
+# runtime is embedded in the C++ wrapper).
+# FIXME: Clean up.
AC_DEFUN([AC_CHECK_SWIG_FLAGS],
[dnl
- AC_CACHE_CHECK([for SWIG supports for -noruntime],
- [ac_cv_swig_flags],
- [if $SWIG -help 2>&1 | grep -- "-noruntime" >
/dev/null 2>&1; then
- ac_cv_swig_flags=recent
- else
- ac_cv_swig_flags=old
- fi])
- case "$ac_cv_swig_flags" in
- recent)
- SWIG_FLAGS="-noruntime"
- ;;
- old)
- SWIG_FLAGS="-c"
- ;;
- esac
+# AC_CACHE_CHECK([for SWIG supports for -noruntime],
+# [ac_cv_swig_flags],
+# [if $SWIG -help 2>&1 | grep -- "-noruntime" >
/dev/null 2>&1; then
+# ac_cv_swig_flags=recent
+# else
+# ac_cv_swig_flags=old
+# fi])
+# case "$ac_cv_swig_flags" in
+# recent)
+# SWIG_FLAGS="-noruntime"
+# ;;
+# old)
+# SWIG_FLAGS="-c"
+# ;;
+# esac
+ SWIG_FLAGS=''
AC_SUBST([SWIG_FLAGS])
])
Index: 10.223/config/oln-local.m4
--- 10.223/config/oln-local.m4 Sun, 21 Sep 2003 23:54:00 +0200 burrus_n
(oln/p/37_oln-local. 1.7 600)
+++ 10.223(w)/config/oln-local.m4 Fri, 23 Jun 2006 17:27:01 +0200 levill_r
(oln/p/37_oln-local. 1.7 600)
@@ -57,6 +57,7 @@
AC_CONFIG_FILES([metalic/tests/$1/Makefile])
fi])dnl End of MLC_TESTS
+# FIXME: Improve this (see TC's swig.m4).
AC_DEFUN([AC_CHECK_SWIG13],
[dnl
AC_ARG_VAR([SWIG], [the SWIG interface generator])