From 3d2c38d5ab9034fa541377c6fb32a14f978e083f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 1 Dec 2020 14:13:12 +0000
Subject: [PATCH] m4: Define INCLUDE_DIRECTORY for libguestfs only.

---
 common          | 2 +-
 m4/guestfs-c.m4 | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common b/common
index 101dac2ea..f7809dd29 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 101dac2eac8c61f0081c343b5d69cfa4efbc2a98
+Subproject commit f7809dd2973248f3d548c7675bf543ebd47f5e46
diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
index c91d4aaee..25ffea0d9 100644
--- a/m4/guestfs-c.m4
+++ b/m4/guestfs-c.m4
@@ -211,3 +211,10 @@ AC_ARG_ENABLE([gnulib-tests],
         [ENABLE_GNULIB_TESTS=yes])
 AM_CONDITIONAL([ENABLE_GNULIB_TESTS],[test "x$ENABLE_GNULIB_TESTS" = "xyes"])
 AC_MSG_RESULT([$ENABLE_GNULIB_TESTS])
+
+dnl Define this so that include/guestfs.h is included
+dnl instead of the possibly installed <guestfs.h>.  This is
+dnl only needed when compiling libguestfs itself.  It is
+dnl expanded in common/ submodule.  For other packages like
+dnl virt-v2v which also use common/ it is empty.
+AC_SUBST([INCLUDE_DIRECTORY], [-I\$\(top_srcdir\)/include])