diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-07 22:20:54 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-08 17:40:31 +0800 |
| commit | e56070fd87fe3429ee046550623c90d64c98eb83 (patch) | |
| tree | a33dd0b0c474d6fc8f332999041804e438119a1c | |
| parent | fc57cd132b0563feeec4dba0e5a7298c7d904a0a (diff) | |
| download | gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar.gz gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar.bz2 gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar.lz gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar.xz gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.tar.zst gsoc2013-empathy-e56070fd87fe3429ee046550623c90d64c98eb83.zip | |
use libcanberra-gtk3 when building with GTK3
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 03e0620fc..7a1b9b9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,6 @@ PKG_CHECK_MODULES(EMPATHY, gobject-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 - libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 libxml-2.0 telepathy-farsight @@ -176,6 +175,9 @@ AC_ARG_ENABLE(gtk3, if test "x$enable_gtk3" != "xno"; then PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED], enable_gtk3="yes", enable_gtk3="no") + + # GTK3 specific deps + PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) fi # ...if not use GTK+2 @@ -183,6 +185,9 @@ if test "x$enable_gtk3" == "xno"; then enable_gtk3=no PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) + # GTK2 specific deps + PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) + # Enable GSEAL checks if needed if test $USE_MAINTAINER_MODE = yes; then AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 5762f5c9e..6fa8202dd 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ $(EMPATHY_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ + $(CANBERRA_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) \ @@ -133,6 +134,7 @@ libempathy_gtk_la_LIBADD = \ $(EMPATHY_LIBS) \ $(GTK_LIBS) \ $(LIBNOTIFY_LIBS) \ + $(CANBERRA_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(GEOCLUE_LIBS) \ |