ocaml build teaks from the Debian maintainer:

	Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>

diff --git a/configure.ac b/configure.ac
index a6b3e45923ad5f4066bc94919bf8b631e4836bb5..f136c85e47487f69b6bdefc1903b56b104e779a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -721,6 +721,7 @@ if test `$SWIG -help 2>&1 | $GREP -c '\-ocaml *- Generate'` = 0; then
        AC_MSG_WARN([swig does not support ocaml. The OCAML packages will not be built])
 else
 AC_CHECK_PROG(OCAML,ocaml,ocaml)
+AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
 OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
 OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
 save_CPPFLAGS=$CPPFLAGS
@@ -736,6 +737,7 @@ fi
 fi
 fi
 AM_CONDITIONAL(WITH_OCAML, [test "x$OCAML" != "x"])
+AM_CONDITIONAL(WITH_OCAMLOPT, [test "x$OCAML_OPT" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PERL

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 726072d1f1e5eeceada234c65f118c0ac890986f..5c9185e8c787f9a29cefde5d12f33a8baf918cbc 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -69,7 +69,10 @@ gv_lua.cpp: gv.i
        $(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
 
 pkgocamldir = $(pkglibdir)/ocaml
-OCAML_data = gv.cma gv.cmi gv.cma gv.cmi gv.a gv.cmx gv.cmxa gv.mli META.gv
+OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv
+if WITH_OCAMLOPT
+OCAML_data += gv.a gv.cmx gv.cmxa
+endif
 nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data)
 libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
 libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@