hivex: Use OCaml bytecode compiler for caml_raise_with_args check
authorHilko Bengen <bengen@hilluzination.de>
Wed, 11 May 2011 22:04:18 +0000 (00:04 +0200)
committerRichard W.M. Jones <rjones@redhat.com>
Thu, 12 May 2011 09:50:46 +0000 (10:50 +0100)
On installations where no native OCaml compiler is available, the
test program can't be compiled and so we get this message:

,----
| checking for function caml_raise_with_args... not found
`----

This breaks building of the OCaml bindings.

,----
| gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib   -g -O2 -fPIC -Wall -c hivex_c.c
| hivex_c.c:52: error: static declaration of 'caml_raise_with_args' follows non-static declaration
| /usr/lib/ocaml/caml/fail.h:30: note: previous declaration of 'caml_raise_with_args' was here
| make[2]: *** [hivex_c.o] Error 1
`----

(Successfully tested on Debian/unstable on alpha)

configure.ac

index 9528b3e..b3e5c40 100644 (file)
@@ -192,9 +192,9 @@ if test "x$OCAMLC" != "xno"; then
     echo "char $f (); char foo() { return $f (); }" > conftest.c
     rm -f conftest_ml.ml
     touch conftest_ml.ml
-    if $OCAMLOPT -c conftest.c 2>/dev/null && \
-       $OCAMLOPT -c conftest_ml.ml 2>/dev/null && \
-       $OCAMLOPT conftest.o conftest_ml.cmx -o conftest 2>/dev/null ; then
+    if $OCAMLC -c conftest.c 2>/dev/null && \
+       $OCAMLC -c conftest_ml.ml 2>/dev/null && \
+       $OCAMLC conftest.o conftest_ml.cmo -o conftest 2>/dev/null ; then
         AC_DEFINE([HAVE_CAML_RAISE_WITH_ARGS],[1],
                   [Defined if function caml_raise_with_args exists.])
         AC_MSG_RESULT([found])