diff --git a/daemon/chroot.ml b/daemon/chroot.ml index 62f387ee0..087b50316 100644 --- a/daemon/chroot.ml +++ b/daemon/chroot.ml @@ -51,7 +51,7 @@ let f t func arg = try let chan = out_channel_of_descr wfd in output_value chan ret; - Pervasives.flush chan; + Stdlib.flush chan; Exit._exit 0 with exn -> diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod index 5a7fa40f5..2c0845212 100644 --- a/docs/guestfs-building.pod +++ b/docs/guestfs-building.pod @@ -119,7 +119,7 @@ virt tools which are still written in Perl. I. Part of Perl core. -=item OCaml E 4.04 +=item OCaml E 4.07 =item OCaml findlib diff --git a/generator/pr.ml b/generator/pr.ml index d7e6eba31..ed6e93725 100644 --- a/generator/pr.ml +++ b/generator/pr.ml @@ -25,7 +25,7 @@ open Std_utils open Utils (* Output channel, 'pr' prints to this. *) -let chan = ref Pervasives.stdout +let chan = ref Stdlib.stdout (* Number of lines generated. *) let lines = ref 0 @@ -53,7 +53,7 @@ let output_to ?(perm = 0o444) filename k = chan := open_out filename_new; k (); close_out !chan; - chan := Pervasives.stdout; + chan := Stdlib.stdout; (* Is the new file different from the current file? *) if Sys.file_exists filename && files_equal filename filename_new then diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index 850207177..39a8346f3 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -38,10 +38,10 @@ AC_ARG_ENABLE([ocaml], [], [enable_ocaml=yes]) -dnl OCaml >= 4.04 is required. -ocaml_ver_str=4.04 +dnl OCaml >= 4.07 is required. +ocaml_ver_str=4.07 ocaml_min_major=4 -ocaml_min_minor=4 +ocaml_min_minor=7 AC_MSG_CHECKING([if OCaml version >= $ocaml_ver_str]) ocaml_major="`echo $OCAMLVERSION | $AWK -F. '{print $1}'`" ocaml_minor="`echo $OCAMLVERSION | $AWK -F. '{print $2}' | sed 's/^0//'`"