On Tue, Jan 14, 2020 at 12:04:49AM +0100, Hilko Bengen wrote:
This avoids build failures in separate builds such as this one:
,----
| ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo
stringSet.cmo std_utils.cmo -o mlstdutils.cma
| ar cr libmlstdutils.a libmlstdutils_a-dummy.o
| ranlib libmlstdutils.a
| File "_none_", line 1:
| Error: Files std_utils.cmo and guestfs_config.cmo
| make inconsistent assumptions over interface Guestfs_config
| make[4]: *** [Makefile:2580: mlstdutils.cma] Error 2
`----
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index 5f8310a640..77a1e986cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,10 @@ AC_CONFIG_FILES([Makefile
tools/Makefile
website/index.html])
+AC_CONFIG_LINKS([common/mlstdutils/guestfs_config.mli:common/mlstdutils/guestfs_config.mli
+ daemon/daemon_config.mli:daemon/daemon_config.mli
+ v2v/config.mli:v2v/config.mli])
+
AC_OUTPUT
I had to look up what AC_CONFIG_LINKS does :-)
I think this is broadly OK, but I'm fairly sure you don't need the
v2v/ link (since virt-v2v is now a separate project:
https://github.com/libguestfs/virt-v2v). Maybe this was applied
against a different branch from master?
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top