[Olena] oln 10.21: fix swig detection

Fix https://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/SwigVersion . Applique le meme principe pour ruby. Index: ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * config/oln-local.m4: Fix swig detection. * configure.ac: Stop if ruby is not found. Stop if swig is not found. +2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + * configure.ac: Generate makefiles for swilena tests. 2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> Index: configure.ac --- configure.ac Sun, 21 Sep 2003 23:13:48 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.12 640) +++ configure.ac Sun, 21 Sep 2003 23:54:00 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.13 640) @@ -350,6 +350,12 @@ AC_CHECK_SWIG13 dnl definition in oln-local.m4 + # We cannot enable swilena without swig because we need the dynamic + # library (swig{py,rb}). + if test "x$oln_cv_recent_swig" != "xyes"; then + AC_MSG_ERROR([You need swig >= 1.3 to compile swilena. You can disable swilena by specifying --without-swilena to configure.]) + fi + AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) @@ -387,15 +393,20 @@ [tools/swilena/ruby/Makefile tools/swilena/ruby/tests/Makefile], [ + AC_CHECK_PROGS([RUBY], [ruby], [$am_aux_dir/missing ruby]) + if test "x$RUBY" = "x$am_aux_dir/missing ruby"; then + AC_MSG_ERROR([You need ruby to compile the ruby interface. Specify --without-rblena to disable the ruby interface.]) + fi + AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h]) - AC_ARG_WITH([python-includedir], [Include path for ruby.h], + AC_ARG_WITH([ruby-includedir], [Include path for ruby.h], [RUBY_CPPFLAGS="-I$withval"], [RUBY_CPPFLAGS="-I/usr/lib/ruby/1.6/i386-linux"]) CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, AC_MSG_ERROR( - [You need Ruby development files to compile the Ruby interface. Specify --with-python-includedir to set it manually or --without-rblena to disable it.])) + [You need Ruby development files to compile the Ruby interface. Specify --with-ruby-includedir to set it manually or --without-rblena to disable it.])) CPPFLAGS=$save_CPPFLAGS ], [ruby])dnl End of OLN_COMPONENT([tools/swilena/ruby]) Index: config/oln-local.m4 --- config/oln-local.m4 Mon, 04 Aug 2003 17:34:35 +0200 burrus_n (oln/p/37_oln-local. 1.6 640) +++ config/oln-local.m4 Sun, 21 Sep 2003 23:54:00 +0200 burrus_n (oln/p/37_oln-local. 1.7 640) @@ -60,12 +60,7 @@ AC_DEFUN([AC_CHECK_SWIG13], [dnl AC_ARG_VAR([SWIG], [the SWIG interface generator]) -# FIXME: cleanup this -# We cannot enable the compilation of swilena without swig, since -# the link phase requires libswigpy.so. -# AC_CHECK_PROGS([SWIG], [swig], [$am_aux_dir/missing swig]) - AC_CHECK_PROGS([SWIG], [swig], AC_MSG_ERROR([You need swig >= 1.3 to compile swilena. You can disable swilena by specifying --without-swilena to configure.])) - + AC_CHECK_PROGS([SWIG], [swig], [$am_aux_dir/missing swig]) AC_CACHE_CHECK([for SWIG >= 1.3], [oln_cv_recent_swig], [oln_cv_recent_swig=no @@ -81,4 +76,5 @@ fi fi fi]) + ])