From c53bc951c39b9d4ebcee0128c452fce7c8e4f92f Mon Sep 17 00:00:00 2001 From: Gaëtan Gilbert Date: Sun, 28 May 2017 12:56:19 +0200 Subject: Don't disable deprecation warning for configure.ml --- configure | 2 +- configure.ml | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 79c512f8a..09585e59e 100755 --- a/configure +++ b/configure @@ -26,7 +26,7 @@ done ## We check that $cmd is ok before the real exec $cmd -`$cmd -version > /dev/null 2>&1` && exec $cmd -w "-3" $script "$@" +`$cmd -version > /dev/null 2>&1` && exec $cmd $script "$@" ## If we're still here, something is wrong with $cmd diff --git a/configure.ml b/configure.ml index 7af18cb85..cfb226a8b 100644 --- a/configure.ml +++ b/configure.ml @@ -598,9 +598,11 @@ let config_camlpX () = let camlp5mod = "gramlib" in let camlp5libdir, camlp5o = check_camlp5 (camlp5mod^".cma") in let camlp5_version = check_camlp5_version camlp5o in - "camlp5", camlp5o, Filename.dirname camlp5o, camlp5libdir, camlp5mod, camlp5_version + "camlp5", "Camlp5", camlp5o, Filename.dirname camlp5o, camlp5libdir, camlp5mod, camlp5_version -let camlpX, camlpXo, camlpXbindir, fullcamlpXlibdir, camlpXmod, camlpX_version = config_camlpX () +let camlpX, capitalized_camlpX, camlpXo, + camlpXbindir, fullcamlpXlibdir, + camlpXmod, camlpX_version = config_camlpX () let shorten_camllib s = if starts_with s (camllib^"/") then @@ -959,9 +961,9 @@ let print_summary () = pr " OCaml version : %s\n" caml_version; pr " OCaml binaries in : %s\n" camlbin; pr " OCaml library in : %s\n" camllib; - pr " %s version : %s\n" (String.capitalize camlpX) camlpX_version; - pr " %s binaries in : %s\n" (String.capitalize camlpX) camlpXbindir; - pr " %s library in : %s\n" (String.capitalize camlpX) camlpXlibdir; + pr " %s version : %s\n" capitalized_camlpX camlpX_version; + pr " %s binaries in : %s\n" capitalized_camlpX camlpXbindir; + pr " %s library in : %s\n" capitalized_camlpX camlpXlibdir; if best_compiler = "opt" then pr " Native dynamic link support : %B\n" hasnatdynlink; if coqide <> "no" then -- cgit v1.2.3