From c96c50577569c6077c42e756bbf12d31d9c82717 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Fri, 20 Oct 2017 10:36:22 +0200
Subject: Coq 8.7.0 support

configure: accept Coq 8.7.0 and 8.6.1.
  (Coq 8.6 became incompatible with commit b4f59c4.)
Changelog: updated.
---
 Changelog | 5 +++++
 configure | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index f87d392f..59f184e2 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,11 @@ Usability:
 Bug fixing:
 - Issue #P25: make sure sizeof(long double) = sizeof(double) in all contexts.
 
+Coq and Caml development:
+- Pull request #191: Support Coq version 8.7.0 in addition to Coq 8.6.1.
+  Coq 8.6 (.0) is no longer supported owing to an incompatibility with 8.7.0.
+  (Sigurd Schneider)
+
 
 Release 3.1, 2017-08-18
 =======================
diff --git a/configure b/configure
index cc6731ec..65537b8a 100755
--- a/configure
+++ b/configure
@@ -478,19 +478,19 @@ missingtools=false
 echo "Testing Coq... " | tr -d '\n'
 coq_ver=$(${COQBIN}coqc -v 2>/dev/null | sed -n -e 's/The Coq Proof Assistant, version \([^ ]*\).*$/\1/p')
 case "$coq_ver" in
-  8.6|8.6.1)
+  8.6.1|8.7.0)
         echo "version $coq_ver -- good!";;
   ?*)
         echo "version $coq_ver -- UNSUPPORTED"
         if $ignore_coq_version; then
             echo "Warning: this version of Coq is unsupported, proceed at your own risks."
         else
-            echo "Error: CompCert requires Coq version 8.6."
+            echo "Error: CompCert requires Coq version 8.6.1 or 8.7.0."
             missingtools=true
         fi;;
   "")
         echo "NOT FOUND"
-        echo "Error: make sure Coq version 8.6 is installed."
+        echo "Error: make sure Coq version 8.7.0 is installed."
         missingtools=true;;
 esac
 
-- 
cgit