diff --git a/common b/common index 3cb34f6b6..64f6ee85f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 3cb34f6b6898d5fe48afbc62e35fdd81802613d6 +Subproject commit 64f6ee85f8e7c9d6627f0fe8777eac2e11dbab8a diff --git a/common-rules.mk b/common-rules.mk index b2e8ead2a..4df1e33f1 100644 --- a/common-rules.mk +++ b/common-rules.mk @@ -36,9 +36,6 @@ CLEANFILES += *.cmi *.cmo *.cma *.cmx *.cmxa dll*.so *.a # OCaml -annot files (used for displaying types in some IDEs). CLEANFILES += *.annot -# OCaml oUnit generated files. -CLEANFILES += oUnit-*.cache oUnit-*.log - # Manual pages - these are all generated from *.pod, so the # pages themselves should all be removed by 'make clean'. CLEANFILES += *.1 *.3 *.5 *.8 diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod index af1443730..08e6ad1f8 100644 --- a/docs/guestfs-building.pod +++ b/docs/guestfs-building.pod @@ -295,10 +295,6 @@ Optional. Used by L to parse Windows Event Log files. Optional. For localizing OCaml virt tools. -=item ocaml-ounit E 2.0.0 - -Optional. For testing the common OCaml modules. - =item Perl C E 0.19 =item Perl C diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index b36ea122d..10d443408 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -181,15 +181,6 @@ if test "x$enable_daemon" = "xyes"; then fi fi -# oUnit is optional, used by some tests in common/mlstdutils (that we -# should replace with regular tests one day). If used, oUnit >= 2 is -# required. -if test "x$OCAML_PKG_ounit2" != "xno"; then - AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2]) -fi -AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], - [test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"]) - dnl Flags we want to pass to every OCaml compiler call. OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6" AC_SUBST([OCAML_WARN_ERROR])