X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=a5023d1155ed014171c2daa7fcb2a3c2136d200d;hb=298cc147ee0015df2128f9efe0402004e9820b9c;hp=7426b9f3fce2db414e7b4380cb9442384e17a927;hpb=8176bbb1610d4c1acc206686906cb26d6fc78a29;p=guestfs-browser.git

diff --git a/configure.ac b/configure.ac
index 7426b9f..a5023d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,20 @@ AC_PROG_SED
 
 dnl Check for OCaml compiler.
 AC_PROG_OCAML
-if test "$OCAMLOPT" = "no"; then
-    AC_MSG_ERROR([You must install the OCaml native compiler (ocamlopt)])
+if test "$OCAMLC" = "no"; then
+    AC_MSG_ERROR([You must install the OCaml compiler (ocamlc or ocamlopt)])
 fi
 
+dnl Choose native code if available, but allow the user to specify
+dnl bytecode only (useful for debugging).
+AC_ARG_WITH([native],
+        [AS_HELP_STRING([--without-native],
+                [disable native compilation (slow, but useful for debugging)])],
+        [],
+        [with_native=yes])
+AM_CONDITIONAL([HAVE_OCAMLOPT],
+        [test "x$with_native" != "xno" && test "x$OCAMLBEST" = "xopt"])
+
 dnl Check for OCaml findlib.
 AC_PROG_FINDLIB
 if test "$OCAMLFIND" = "no"; then