Merge branch 'coq-8.6' of https://github.com/maximedenes/CompCert into maximedenes-coq-8.6

1 files changed, 4 insertions, 4 deletions

diff --git a/configure b/configure
index eacc28d3..182e086a 100755
--- a/configure
+++ b/configure
@@ -407,15 +407,15 @@ 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.5pl2|8.5pl3)
+  8.6)
         echo "version $coq_ver -- good!";;
   ?.*)
         echo "version $coq_ver -- UNSUPPORTED"
-        echo "Error: CompCert requires Coq version 8.5pl2."
+        echo "Error: CompCert requires Coq version 8.6."
         missingtools=true;;
   *)
         echo "NOT FOUND"
-        echo "Error: make sure Coq version 8.5pl2 is installed."
+        echo "Error: make sure Coq version 8.6 is installed."
         missingtools=true;;
 esac
 
@@ -448,7 +448,7 @@ else
   ocaml_opt_comp=false
 fi
 
-MENHIR_REQUIRED=20160303
+MENHIR_REQUIRED=20161201
 echo "Testing Menhir... " | tr -d '\n'
 menhir_ver=`menhir --version 2>/dev/null | sed -n -e 's/^.*version \([0-9]*\).*$/\1/p'`
 case "$menhir_ver" in