diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2011-05-12 00:04:19 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-05-12 10:50:48 +0100 |
| commit | 5cf4fc2caa34ccb3a1e01bbec912158127dcd169 (patch) | |
| tree | 299f294c47786cbba104521fb7f0796d71a634ec | |
| parent | c9c8f893ecfaa9d646dfd02b1e0f16c549bbb6cd (diff) | |
| download | hivex-5cf4fc2caa34ccb3a1e01bbec912158127dcd169.tar.gz hivex-5cf4fc2caa34ccb3a1e01bbec912158127dcd169.tar.xz hivex-5cf4fc2caa34ccb3a1e01bbec912158127dcd169.zip | |
hivex: check for presence of OCaml native compiler
Only compile bytecode otherwise, avoiding ocamlfind's helpful error
message "ocamlfind: Not supported in your configuration: ocamlopt"
(Successfully tested on Debian/unstable on alpha)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ocaml/Makefile.am | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b3e5c40..65aa538 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,7 @@ dnl Check for OCaml (optional, for OCaml bindings). AC_PROG_OCAML AC_PROG_FINDLIB AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAMLOPT], [test "x$OCAMLOPT" != "xno" -a "x$OCAMLFIND" != "xno"]) if test "x$OCAMLC" != "xno"; then dnl Check if we have caml/unixsupport.h header (OCaml bindings only). diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index b9451e3..fee3b88 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -31,7 +31,11 @@ AM_CPPFLAGS = \ if HAVE_OCAML -noinst_DATA = mlhivex.cma mlhivex.cmxa META +noinst_DATA = mlhivex.cma META + +if HAVE_OCAMLOPT +noinst_DATA += mlhivex.cmxa +endif OBJS = hivex_c.o hivex.cmo XOBJS = $(OBJS:.cmo=.cmx) |