[empathy: 9/14] link on unique-3 when using GTK3
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 9/14] link on unique-3 when using GTK3
- Date: Thu, 8 Jul 2010 12:36:49 +0000 (UTC)
commit ce007d41e6854b9434efe29621e98efe95ff0d3b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Jul 8 10:01:01 2010 +0200
link on unique-3 when using GTK3
configure.ac | 3 ++-
src/Makefile.am | 4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1ebc23a..b99ae25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,6 @@ PKG_CHECK_MODULES(EMPATHY,
telepathy-farsight
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
telepathy-logger-0.1 >= $TELEPATHY_LOGGER
- unique-1.0 >= $UNIQUE_REQUIRED
x11
])
@@ -178,6 +177,7 @@ if test "x$enable_gtk3" != "xno"; then
# GTK3 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
+ PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
fi
# ...if not use GTK+2
@@ -188,6 +188,7 @@ if test "x$enable_gtk3" == "xno"; then
# GTK2 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+ PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
# Enable GSEAL checks if needed
if test $USE_MAINTAINER_MODE = yes; then
diff --git a/src/Makefile.am b/src/Makefile.am
index dc199c2..8209d92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ AM_LDFLAGS = -lm
AM_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(LIBNOTIFY_CFLAGS) \
+ $(UNIQUE_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(WEBKIT_CFLAGS) \
$(NULL)
@@ -24,6 +25,7 @@ LDADD = \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/extensions/libemp-extensions.la \
$(LIBNOTIFY_LIBS) \
+ $(UNIQUE_LIBS) \
$(EMPATHY_LIBS) \
$(GTK_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
@@ -45,6 +47,7 @@ libempathy_accounts_common_la_SOURCES = \
libempathy_accounts_common_la_LIBADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(LIBNOTIFY_LIBS) \
+ $(UNIQUE_LIBS) \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS) \
@@ -134,6 +137,7 @@ empathy_LDADD = \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/extensions/libemp-extensions.la \
$(LIBNOTIFY_LIBS) \
+ $(UNIQUE_LIBS) \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]