diff options
| author | Pierre Boutillier | 2014-09-18 10:56:34 +0200 |
|---|---|---|
| committer | Pierre Boutillier | 2014-09-18 10:59:03 +0200 |
| commit | 21335959eac94b9c35424516ef78fd45b6acf551 (patch) | |
| tree | 26c03659bc75f451906044c2bfb6258839457edf | |
| parent | e1f64f6cf69c4f97c106576d80853b7412ce2b06 (diff) | |
configure.ml: opam camlp5 + system ocaml works
I didn't understand the purpose of the previous behavior so please check this commit
| -rw-r--r-- | configure.ml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ml b/configure.ml index 6412a629ed..68674805bc 100644 --- a/configure.ml +++ b/configure.ml @@ -543,15 +543,18 @@ let check_camlp5 testcma = match !Prefs.camlp5dir with camllib/"camlp5" else if Sys.file_exists (camllib/"site-lib"/"camlp5"/testcma) then camllib/"site-lib"/"camlp5" - else - let () = printf "No Camlp5 installation found." in - let () = printf "Looking for Camlp4 instead...\n" in - raise NoCamlp5 - in + else "" + in (* if the two values are different than camlp5 has been relocated * and will not be able to find its own files, so we prefer the * path where the files actually do exist *) - if dir = "" then dir2 else if dir <> dir2 then dir2 else dir + if dir2 = "" then + if dir = "" then + let () = printf "No Camlp5 installation found." in + let () = printf "Looking for Camlp4 instead...\n" in + raise NoCamlp5 + else dir + else dir2 let check_camlp5_version () = let s = camlexec.p4 in |