Skip to content

Commit 22c745a

Browse files
authored
Merge pull request #70 from ybertot/no-kill-on-warning
No kill on warning
2 parents 96b4bf6 + fd4cc6b commit 22c745a

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ OCAMLDEP=@OCAMLDEP@
4949
OCAMLLEX=@OCAMLLEX@
5050
OCAMLYACC=@OCAMLYACC@
5151

52-
OCAMLFLAGS := -w +a -warn-error +a -g -dtypes $(INCLUDES) -c
52+
WARN_ERR := -warn-error +a
53+
OCAMLFLAGS := -w +a $(WARN_ERR) -g -dtypes $(INCLUDES) -c
5354
OCAMLFLAGS += $(OCAML_EXTRA_OPTS)
5455
OCAMLOPTFLAGS = -c
5556

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ You can:
3333

3434
#### Requirements
3535

36-
- The latest version runs with Coq 8.7.0
36+
- The latest version runs with Coq 8.10.0
3737
- it has been tested with a version of Coq installed using opam and with
38-
Ocaml version 4.04.2
38+
Ocaml version 4.09.0
3939
- [ocamlgraph](http://ocamlgraph.lri.fr/) (for dpd2dot tool)
4040
Any version should work since only the basic feature are used.
4141

@@ -64,6 +64,15 @@ Depending on how you got hold of the archive, you may be in one of three situati
6464
$ autoconf
6565
$ configure && make && make install
6666

67+
#### lenient compilation
68+
69+
By default, compilation will fail if there is any warning emitted by
70+
the ocaml compiler. This can be disabled by type
71+
72+
make WARN_ERR=
73+
74+
instead of `make` in all previous commands.
75+
6776
#### install using opam
6877

6978
If you use opam, you can install `coq-dpdgraph` and `ocamlgraph`

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ COQVERSION=$($COQC -v | sed -n -e 's|.*version *\(.*\)$|\1|p' )
184184
AC_MSG_RESULT($COQVERSION)
185185

186186
case $COQVERSION in
187-
8.1[^0-9]*|8.2[0-9]*|8.3[0-9]*|8.4[0-9]*|8.5[0-9]*|8.6[0-9]*|8.7[0-9]*)
188-
AC_MSG_ERROR(AC_PACKAGE_NAME needs Coq version 8.8 or higher)
187+
8.[[0-9]][[^0-9]]*|8.10*)
188+
AC_MSG_ERROR(AC_PACKAGE_NAME needs Coq version 8.11 or higher)
189189
;;
190190
esac
191191

0 commit comments

Comments
 (0)