Displaying 2 results from an estimated 2 matches for "d0f3349".
Did you mean:
043349
2017 Jul 31
3
[PATCH] build: require ocaml-hivex for the daemon
...at build time,
failing earlier if not present. The check is performed only when the
daemon is enabled, as ocaml-hivex is not used for anything else than the
daemon.
---
m4/guestfs_ocaml.m4 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4
index d0f3349..e577b31 100644
--- a/m4/guestfs_ocaml.m4
+++ b/m4/guestfs_ocaml.m4
@@ -56,6 +56,14 @@ AM_CONDITIONAL([HAVE_OCAMLOPT],
AM_CONDITIONAL([HAVE_OCAMLDOC],
[test "x$OCAMLDOC" != "xno"])
+if test "x$enable_daemon" = "xyes"; then
+ OCAML_PKG_hi...
2017 Jul 24
1
[PATCH] common/mlstdutils: Fix parallel builds of bytes.ml.
...\
stringSet.mli
-SOURCES_ML = \
+if HAVE_BYTES_COMPAT_ML
+SOURCES_ML = bytes.ml
+else
+SOURCES_ML =
+endif
+
+SOURCES_ML += \
guestfs_config.ml \
- $(OCAML_BYTES_COMPAT_ML) \
libdir.ml \
stringMap.ml \
stringSet.ml \
diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4
index a7334cd..d0f3349 100644
--- a/m4/guestfs_ocaml.m4
+++ b/m4/guestfs_ocaml.m4
@@ -123,6 +123,8 @@ EOF
])
AC_SUBST([OCAML_BYTES_COMPAT_CMO])
AC_SUBST([OCAML_BYTES_COMPAT_ML])
+AM_CONDITIONAL([HAVE_BYTES_COMPAT_ML],
+ [test "x$OCAML_BYTES_COMPAT_ML" != "x"])
dnl Flags we want to pass to...