diff options
-rw-r--r-- | INSTALL | 6 | ||||
-rw-r--r-- | INSTALL.ide | 5 | ||||
-rwxr-xr-x | configure | 23 |
3 files changed, 18 insertions, 16 deletions
@@ -1,5 +1,5 @@ - INSTALLATION PROCEDURES FOR THE COQ V8.1 SYSTEM + INSTALLATION PROCEDURES FOR THE COQ V8.3 SYSTEM ----------------------------------------------- @@ -41,7 +41,7 @@ WHAT DO YOU NEED ? Should you need or prefer to compile Coq V8.2 yourself, you need: - - Objective Caml version 3.07 or later + - Objective Caml version 3.09.3 or later (available at http://caml.inria.fr/) For Ocaml version >= 3.10.0, you also need to install camlp5 @@ -89,7 +89,7 @@ QUICK INSTALLATION PROCEDURE. INSTALLATION PROCEDURE IN DETAILS (NORMAL USERS). ================================================= -1- Check that you have the Objective Caml compiler version 3.07 (or later) +1- Check that you have the Objective Caml compiler version 3.09.3 (or later) installed on your computer and that "ocamlmktop" and "ocamlc" (or its native code version "ocamlc.opt") lie in a directory which is present in your $PATH environment variable. diff --git a/INSTALL.ide b/INSTALL.ide index fbb484fd8..757d83548 100644 --- a/INSTALL.ide +++ b/INSTALL.ide @@ -23,7 +23,7 @@ On Gentoo GNU/Linux, do: Else, read the rest of this document to compile your own CoqIde. REQUIREMENT: - - OCaml >= 3.07 with native threads support. + - OCaml >= 3.09.3 with native threads support. - make world must succeed. - The graphical toolkit GTK+ 2.x. See http://www.gtk.org. The official supported version is at least 2.8.x. @@ -56,8 +56,7 @@ REQUIREMENT: One official releases of lablgtk2 is here: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-2.10.1.tar.gz - Note that even if its README requires ocaml > 3.07, it works - ok with 3.07. If you are in a hurry just run : + If you are in a hurry just run : cd /tmp && \ wget \ @@ -140,6 +140,8 @@ wwwcoq_spec=no with_geoproof=false with_doc=all with_doc_spec=no +force_caml_version=no +force_caml_version_spec=no COQSRC=`pwd` @@ -256,6 +258,9 @@ while : ; do -debug|--debug) coq_debug_flag=-g;; -profile|--profile) coq_profile_flag=-p;; -annotate|--annotate) coq_annotate_flag=-dtypes;; + -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) + force_caml_version_spec=yes + force_caml_version=yes;; *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; esac shift @@ -421,17 +426,15 @@ esac CAMLVERSION=`"$bytecamlc" -version` case $CAMLVERSION in - 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.08.0) + 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09.[012]) echo "Your version of Objective-Caml is $CAMLVERSION." - if [ "$CAMLVERSION" = "3.08.0" ] ; then - echo "You need Objective-Caml 3.07 or later (to the exception of 3.08.0)!" + if [ "$force_caml_version" = "yes" ]; then + echo "WARNING: you are compiling Coq with an outdated version of Objective-Caml" else - echo "You need Objective-Caml 3.07 or later!" - fi - echo "Configuration script failed!" - exit 1;; - 3.07*|3.08*) - echo "You have Objective-Caml $CAMLVERSION. Good!";; + echo "You need Objective-Caml 3.09.3 or later" + echo "Configuration script failed!" + exit 1 + fi;; ?*) CAMLP4COMPAT="-loc loc" echo "You have Objective-Caml $CAMLVERSION. Good!";; @@ -453,7 +456,7 @@ case $ARCH in CAMLLIB=`"$CAMLC" -where` esac -# We need to set va special flag for OCaml 3.07 +# We need to set a special flag for OCaml 3.07 case $CAMLVERSION in 3.07*) cflags="$cflags -DOCAML_307";; |