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

Marc-André Lureau marcandre.lureau at gmail.com
Thu Feb 27 04:54:22 PST 2014


On Thu, Feb 27, 2014 at 1:47 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> 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.

I am not really sure this is a good idea... Everything is not linking
by default with glib-compat.c.

config.h should only be for #define... no?


> ---
>  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
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel



-- 
Marc-André Lureau


More information about the Spice-devel mailing list