diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-08 16:01:01 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-08 17:40:31 +0800 |
| commit | ce007d41e6854b9434efe29621e98efe95ff0d3b (patch) | |
| tree | 009045480d340c602078f50424ca2ddb6d3575b0 | |
| parent | c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08 (diff) | |
| download | gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar.gz gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar.bz2 gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar.lz gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar.xz gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.tar.zst gsoc2013-empathy-ce007d41e6854b9434efe29621e98efe95ff0d3b.zip | |
link on unique-3 when using GTK3
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1ebc23a85..b99ae2549 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 dc199c2f6..8209d92a6 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) \ |