From a1b8ae01723917a1829ef20d719cb005548347ce Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 21 Jan 2021 20:26:31 +0000 Subject: [PATCH 3/4] Use ounit2. --- _tags.in | 2 +- configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_tags.in b/_tags.in index 68c4d4e..b1987a3 100644 --- a/_tags.in +++ b/_tags.in @@ -11,7 +11,7 @@ true: -traverse <*/*.ml{i,}>: pp(cppo) <*/*.ml{i,}>: package(extlib), package(base64), @PKG_CUDF@, package(re.pcre) -<*/tests.*>: package(oUnit), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph) +<*/tests.*>: package(ounit2), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph) : use_common : use_common diff --git a/configure.ac b/configure.ac index 02d8579..fae22e1 100644 --- a/configure.ac +++ b/configure.ac @@ -203,11 +203,11 @@ AC_ARG_WITH(oUnit, HAS_OUNIT=no) AC_SUBST(HAS_OUNIT) if test "$HAS_OUNIT" = "yes" ; then - AC_CHECK_OCAML_PKG([oUnit]) - if test "$OCAML_PKG_oUnit" = "no"; then - AC_MSG_ERROR([Please install OCaml findlib module 'oUnit'.]) + AC_CHECK_OCAML_PKG([ounit2]) + if test "$OCAML_PKG_ounit2" = "no"; then + AC_MSG_ERROR([Please install OCaml findlib module 'ounit2'.]) fi - PKG_OUNIT="pkg_oUnit" + PKG_OUNIT="pkg_ounit2" fi AC_ARG_WITH(benchmark, -- 2.29.2