From: Hilko Bengen <bengen@debian.org>
Date: Mon, 13 Jan 2020 19:13:30 +0000 (+0100)
Subject: Link .mli files corresponding to autorgenerated .ml files into builddir
X-Git-Tag: archive/raspbian/1%1.52.2-3+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d205d30d0bbd6afb29d7e507591c0f58367757ff;p=libguestfs.git

Link .mli files corresponding to autorgenerated .ml files into builddir

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
`----

Gbp-Pq: Name Link-.mli-files-corresponding-to-autorgenerated-.ml-files.patch
---

diff --git a/configure.ac b/configure.ac
index 8b75b2ec..3f3beaa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,9 @@ AC_CONFIG_FILES([Makefile
                  tests/disks/test-qemu-drive-libvirt.xml
                  website/index.html])
 
+AC_CONFIG_LINKS([common/mlstdutils/guestfs_config.mli:common/mlstdutils/guestfs_config.mli
+                 daemon/daemon_config.mli:daemon/daemon_config.mli])
+
 AC_OUTPUT
 
 dnl Produce summary.