move GTK+ check to its own PKG_CHECK_MODULES

diff --git a/configure.ac b/configure.ac
index 5c5921a83d2e9247aa58436a5f2975f1c5098d08..12d9cac08890a07de32191501b4bff0416e7846b 100644 (file)
--- 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 2a891bc72e118f90c279d56ec805de6010b3d9b4..5762f5c9e92741900aea50595369942df58adfe8 100644 (file)
--- 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 adc9bfb672d468f27b78ade10604e13e7faba28e..03564fe0236dafe3c5b7e7045109e81cc88e33a2 100644 (file)
--- 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 eaac3c341d542fde4f1bf5b0a9d4ce13e6662f98..dc199c2f66a5a1a3000b854a5e1c057075ddfef2 100644 (file)
--- 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 8fc19eb3e02384f95a840173acb8d288a87dde36..bd3acea676726cc6613d9a9a631c152dc6383933 100644 (file)
--- 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                 \