]> git.0d.be Git - empathy.git/commitdiff
link on unique-3 when using GTK3
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 8 Jul 2010 08:01:01 +0000 (10:01 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 8 Jul 2010 09:40:31 +0000 (11:40 +0200)
configure.ac
src/Makefile.am

index 1ebc23a85c9582ebf4a2ab1c890209c5a9d316cc..b99ae25498bcc09a7e2a3c274f8d527c6ab45794 100644 (file)
@@ -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
index dc199c2f66a5a1a3000b854a5e1c057075ddfef2..8209d92a67ea3691ad4dec7b79aa792b24c38a0a 100644 (file)
@@ -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)                                                 \