[Spice-devel] [spice-gtk 2/3] Include glib-compat.h at the end of config.h

[Christophe Fergeau]

As long as .c files include config.h, this will ensure we don't forget
to include glib-compat.h when needed, and only notice when someone tests
a RHEL6 build.
---
 configure.ac               | 1 +
 gtk/controller/Makefile.am | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index 192d748..7ba19aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([spice-gtk], [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
+AH_BOTTOM([#include "glib-compat.h"])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror -Wno-portability])
diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 00552e8..e30857e 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"GSpiceController\"	\
+	-I$(top_srcdir)/gtk			\
 	$(GIO_CFLAGS)				\
 	$(COMMON_CFLAGS)			\
 	$(NULL)
-- 
1.8.5.3