[libvirt] [PATCH 6/7] build: link to glib library

[Daniel P. Berrangé]

Add the main glib.h to internal.h so that all common code can use it.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/Makefile.am            | 2 ++
 src/internal.h             | 1 +
 src/lxc/Makefile.inc.am    | 2 ++
 src/remote/Makefile.inc.am | 1 +
 src/util/Makefile.inc.am   | 1 +
 tests/Makefile.am          | 3 ++-
 tools/Makefile.am          | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f5093b9c90..85993309d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ AM_CPPFLAGS =	-I../gnulib/lib \
 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
 
 AM_CFLAGS =	$(LIBXML_CFLAGS) \
+		$(GLIB_CFLAGS) \
 		$(WARN_CFLAGS) \
 		$(LOCK_CHECKING_CFLAGS) \
 		$(WIN32_EXTRA_CFLAGS) \
@@ -560,6 +561,7 @@ libvirt_admin_la_LIBADD += \
 		$(YAJL_LIBS) \
 		$(DEVMAPPER_LIBS) \
 		$(LIBXML_LIBS) \
+		$(GLIB_LIBS) \
 		$(SSH2_LIBS) \
 		$(SASL_LIBS) \
 		$(GNUTLS_LIBS) \
diff --git a/src/internal.h b/src/internal.h
index adc1e3f496..55aaf937cf 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <glib.h>
 
 #if STATIC_ANALYSIS
 # undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble.  */
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index b4d560702c..0c9618e185 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -184,6 +184,7 @@ libvirt_lxc_LDFLAGS = \
 	$(PIE_LDFLAGS) \
 	$(CAPNG_LIBS) \
 	$(LIBXML_LIBS) \
+	$(GLIB_LIBS) \
 	$(NULL)
 libvirt_lxc_LDADD = \
 	libvirt.la \
@@ -200,6 +201,7 @@ libvirt_lxc_CFLAGS = \
 	$(PIE_CFLAGS) \
 	$(CAPNG_CFLAGS) \
 	$(LIBXML_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(FUSE_CFLAGS) \
 	$(DBUS_CFLAGS) \
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index abf04d998a..e05ae64169 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -38,6 +38,7 @@ REMOTE_DAEMON_SOURCES = \
 
 REMOTE_DAEMON_CFLAGS = \
 	$(LIBXML_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(GNUTLS_CFLAGS) \
 	$(SASL_CFLAGS) \
 	$(XDR_CFLAGS) \
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index 46866cf213..73ada1d6a3 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -288,6 +288,7 @@ libvirt_util_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(WIN32_EXTRA_LIBS) \
 	$(LIBXML_LIBS) \
+	$(GLIB_LIBS) \
 	$(SECDRIVER_LIBS) \
 	$(NUMACTL_LIBS) \
 	$(ACL_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a319e386ec..fdc991a97a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,6 +35,7 @@ AM_CFLAGS = \
 	-Dabs_srcdir="\"$(abs_srcdir)\"" \
 	-Dabs_top_srcdir="\"$(abs_top_srcdir)\"" \
 	$(LIBXML_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(GNUTLS_CFLAGS) \
 	$(SASL_CFLAGS) \
@@ -522,7 +523,7 @@ libxlxml2domconfigtest_LDADD = $(libxl_LDADDS) $(LIBXML_LIBS)
 
 libxlmock_la_SOURCES = \
 	libxlmock.c
-libxlmock_la_CFLAGS = $(LIBXL_CFLAGS) $(LIBXML_CFLAGS)
+libxlmock_la_CFLAGS = $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) $(GLIB_CFLAGS)
 libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 libxlmock_la_LIBADD = $(MOCKLIBS_LIBS)
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 29fdbfe846..9489cb35db 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -36,6 +36,7 @@ AM_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	$(PIE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)
 
 AM_LDFLAGS = \
-- 
2.21.0