[empathy: 4/14] move GTK+ check to its own PKG_CHECK_MODULES

[Guillaume Desmottes <gdesmott src gnome org>]

commit bc2b3bf0966076e8452a170a9741ded016051f44
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Jul 7 15:49:08 2010 +0200

    move GTK+ check to its own PKG_CHECK_MODULES

 configure.ac                       |    3 ++-
 libempathy-gtk/Makefile.am         |    2 ++
 nautilus-sendto-plugin/Makefile.am |    3 ++-
 src/Makefile.am                    |    2 ++
 tests/interactive/Makefile.am      |    4 +++-
 5 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5c5921a..12d9cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,6 @@ PKG_CHECK_MODULES(EMPATHY,
    gobject-2.0
    gstreamer-0.10
    gstreamer-interfaces-0.10
-   gtk+-2.0 >= $GTK_REQUIRED
    libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
    libebook-1.2
    libxml-2.0
@@ -166,6 +165,8 @@ PKG_CHECK_MODULES(EMPATHY,
    x11
 ])
 
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
 
 # -----------------------------------------------------------
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2a891bc..5762f5c 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
+	$(GTK_CFLAGS)				\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
@@ -130,6 +131,7 @@ nodist_libempathy_gtk_la_SOURCES =\
 
 libempathy_gtk_la_LIBADD =			\
 	$(EMPATHY_LIBS)			\
+	$(GTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
 	$(ENCHANT_LIBS)				\
 	$(LIBCHAMPLAIN_LIBS)			\
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index adc9bfb..03564fe 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES =					\
 	$(NST_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
-	$(EMPATHY_CFLAGS)
+	$(EMPATHY_CFLAGS) \
+	$(GTK_CFLAGS)
 
 plugin_LTLIBRARIES = libnstempathy.la
 
diff --git a/src/Makefile.am b/src/Makefile.am
index eaac3c3..dc199c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
+	$(GTK_CFLAGS)				\
 	$(ERROR_CFLAGS)					\
 	-I$(top_srcdir)                          	\
 	-DG_LOG_DOMAIN=\"empathy\"			\
@@ -24,6 +25,7 @@ LDADD =								\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(LIBNOTIFY_LIBS)					\
 	$(EMPATHY_LIBS)						\
+	$(GTK_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(WEBKIT_LIBS)
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 8fc19eb..bd3acea 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -3,13 +3,15 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
+	$(GTK_CFLAGS) \
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
-	$(EMPATHY_LIBS)
+	$(EMPATHY_LIBS) \
+	$(GTK_LIBS)
 
 noinst_PROGRAMS =			\
 	contact-manager			\