Merge PR #13049: [configure] Fix version checks for lablgtk and zarith

Reviewed-by: SkySkimmer
Reviewed-by: vbgl
Ack-by: Zimmi48
Ack-by: JasonGross

1 files changed, 12 insertions, 12 deletions

diff --git a/configure.ml b/configure.ml
index 43c55af495..7fd1acb53e 100644
--- a/configure.ml
+++ b/configure.ml
@@ -692,10 +692,16 @@ let operating_system =
 
 let check_for_zarith () =
   let zarith,_ = tryrun camlexec.find ["query";"zarith"] in
+  let zarith_version, _ = run camlexec.find ["query"; "zarith"; "-format"; "%v"] in
   match zarith with
   | ""  ->
     die "Zarith library not installed, required"
-  | _   -> cprintf "You have the Zarith library installed. Good!"
+  | _   ->
+    let zarith_version_int = List.map int_of_string (numeric_prefix_list zarith_version) in
+    if zarith_version_int >= [1;10;0] then
+      cprintf "You have the Zarith library %s installed. Good!" zarith_version
+    else
+      die ("Zarith version 1.10 is required, you have " ^ zarith_version)
 
 let numlib = check_for_zarith ()
 
@@ -710,20 +716,14 @@ let get_lablgtkdir () =
 
 let check_lablgtk_version () =
   let v, _ = tryrun camlexec.find ["query"; "-format"; "%v"; "lablgtk3"] in
-  (true, v)
-
-(* ejgallego: we wait to do version checks until an official release is out *)
-(*  try
-    let vi = numeric_prefix_list v in
-    (* Temporary hack *)
-    if vi = ["3";"0";"beta3"] then (false, v) else
-    let vi = List.map s2i vi in
-    if vi < [3; 0; 0] then
+  try
+    let vl = numeric_prefix_list v in
+    let vn = List.map int_of_string vl in
+    if vn < [3; 1; 0] then
       (false, v)
     else
       (true, v)
   with _ -> (false, v)
-*)
 
 let pr_ide = function No -> "no" | Byte -> "only bytecode" | Opt -> "native"
 
@@ -751,7 +751,7 @@ let check_coqide () =
   else
     let (ok, version) = check_lablgtk_version () in
     let found = sprintf "LablGtk3 and LablGtkSourceView3 found (%s)" version in
-    if not ok then set_ide No (found^", but too old (required >= 3.0, found " ^ version ^ ")");
+    if not ok then set_ide No (found^", but too old (required >= 3.1.0, found " ^ version ^ ")");
     (* We're now sure to produce at least one kind of coqide *)
     lablgtkdir := shorten_camllib dir;
     if !prefs.coqide = Some Byte then set_ide Byte (found^", bytecode requested");