From 8e0140143b8eafe15c0ea64ccccd19abcaf6056b Mon Sep 17 00:00:00 2001
From: Enrico Tassi <Enrico.Tassi@inria.fr>
Date: Mon, 26 Feb 2018 13:34:53 +0100
Subject: configure: -warn-error: now takes a bool so that you can also turn it
 off

---
 .travis.yml  | 6 +++---
 configure.ml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ec936b0c..12c2c346d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,7 +190,7 @@ matrix:
     # Ocaml warnings with two compilers
     - env:
       - MAIN_TARGET="coqocaml"
-      - EXTRA_CONF="-byte-only -coqide byte -warn-error"
+      - EXTRA_CONF="-byte-only -coqide byte -warn-error yes"
       - EXTRA_OPAM="hevea ${LABLGTK}"
       # dummy target
       - BUILD_TARGET="clean"
@@ -209,7 +209,7 @@ matrix:
       - COMPILER="${COMPILER_BE}"
       - FINDLIB_VER="${FINDLIB_VER_BE}"
       - CAMLP5_VER="${CAMLP5_VER_BE}"
-      - EXTRA_CONF="-byte-only -coqide byte -warn-error"
+      - EXTRA_CONF="-byte-only -coqide byte -warn-error yes"
       - EXTRA_OPAM="num hevea ${LABLGTK_BE}"
       # dummy target
       - BUILD_TARGET="clean"
@@ -239,7 +239,7 @@ matrix:
       - CAMLP5_VER=".6.17"
       - NATIVE_COMP="no"
       - COQ_DEST="-prefix ${PWD}/_install"
-      - EXTRA_CONF="-coqide opt -warn-error"
+      - EXTRA_CONF="-coqide opt -warn-error yes"
       - EXTRA_OPAM="${LABLGTK}"
       before_install:
       - brew update
diff --git a/configure.ml b/configure.ml
index 5d9722a4f..30d2d31f3 100644
--- a/configure.ml
+++ b/configure.ml
@@ -315,7 +315,7 @@ let devel state = { state with
   annot = true;
   warn_error = true;
 }
-let devel_doc = "-local -annot -bin-annot -warn-error"
+let devel_doc = "-local -annot -bin-annot -warn-error yes"
 
 let get = function
   | "devel" -> devel
@@ -428,8 +428,8 @@ let args_options = Arg.align [
     " Force OCaml version";
   "-force-findlib-version", arg_set (fun p force_findlib_version -> { p with force_findlib_version }),
     " Force findlib version";
-  "-warn-error", arg_set (fun p warn_error -> { p with warn_error }),
-    " Make OCaml warnings into errors";
+  "-warn-error", arg_bool (fun p warn_error -> { p with warn_error }),
+    "(yes|no) Make OCaml warnings into errors (default no)";
   "-camldir", Arg.String (fun _ -> ()),
     "<dir> Specifies path to 'ocaml' for running configure script";
   "-profile", arg_profile,
-- 
cgit v1.2.3