From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 3 Apr 2017 11:34:13 +0000 (+0100)
Subject: tools: ocaml: In configure, check for ocamlopt
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4057c6ea805247e3fbb1f02e3e56aad840e39cf8;p=people%2Fiwj%2Fxen.git

tools: ocaml: In configure, check for ocamlopt

If ocaml.m4 didn't find ocamlopt, disable all the ocaml builds.

Currently our Makefiles do not work properly when the native code
compiler (`ocamlopt') is not available.  In principle this should be
fixed to fall back to bytecode, but this is not a task for this stage
of the Xen 4.9 release.

Without this change, we cannot build on systems with only ocamlc.
That includes Debian jessie ARM64, as used on the new ARM64 hardware
in the Xen Project CI test lab.

When the Makefiles are fixed, this commit should be reverted.

Committers: Please rerun autogen.sh.

CC: Julien Grall <julien.grall@arm.com>
CC: Christian Lindig <christian.lindig@citrix.com>
CC: Jonathan Ludlam <Jonathan.Ludlam@citrix.com>
CC: David Scott <dave@recoil.org>
CC: Wei Liu <wei.liu2@citrix.com>
Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
(cherry picked from commit 4d0240e03349fd0715332eae65372e0a47b5a43b)
---

diff --git a/tools/configure b/tools/configure
index e1a30e8189..abfc316ca8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -6554,11 +6554,11 @@ done
 
 if test "x$ocamltools" = "xy"; then :
 
-    if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then :
+    if test "x$OCAMLOPT" = "xno" || test "x$OCAMLFIND" = "xno"; then :
 
         if test "x$enable_ocamltools" = "xyes"; then :
 
-            as_fn_error $? "Ocaml tools enabled, but unable to find Ocaml" "$LINENO" 5
+            as_fn_error $? "Ocaml tools enabled, but missing ocamlopt or ocamlfind" "$LINENO" 5
 fi
         ocamltools="n"
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 873e18dafb..000c3ef264 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -295,9 +295,9 @@ AC_PROG_OCAML
 AC_PROG_FINDLIB
 
 AS_IF([test "x$ocamltools" = "xy"], [
-    AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [
+    AS_IF([test "x$OCAMLOPT" = "xno" || test "x$OCAMLFIND" = "xno"], [
         AS_IF([test "x$enable_ocamltools" = "xyes"], [
-            AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])])
+            AC_MSG_ERROR([Ocaml tools enabled, but missing ocamlopt or ocamlfind])])
         ocamltools="n"
     ], [
         AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [3.09.3], [