summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bicha <jbicha@ubuntu.com>2012-09-25 02:04:48 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-25 02:14:50 +0200
commitcc77d303b3f3053d844ade5a9576d0a2ab0f8b62 (patch)
treeb57dee02b75d6e2a53deb6e8f82a7d073d6ee594
parentb70b8f7b7faf51ba9ff178c253385486cb75e327 (diff)
Add missing link for libx11 (needed to build gnome-games from trunk)
-rw-r--r--configure.ac4
-rw-r--r--libcanberra-gtk.pc.in4
-rw-r--r--libcanberra-gtk3.pc.in4
-rw-r--r--src/canberra-gtk.h1
4 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index a9ccd15..c074d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AC_ARG_ENABLE([gtk],
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
if test "x${gtk}" != xno ; then
- PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 glib-2.0 >= 2.32 x11 ],
+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 glib-2.0 >= 2.32 gdk-2.0 x11 ],
[
HAVE_GTK=1
AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
@@ -473,7 +473,7 @@ AC_ARG_ENABLE([gtk3],
[gtk3=auto])
if test "x${gtk3}" != xno ; then
- PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 glib-2.0 >= 2.32 x11 ],
+ PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 glib-2.0 >= 2.32 gdk-3.0 x11 ],
[
HAVE_GTK3=1
AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
diff --git a/libcanberra-gtk.pc.in b/libcanberra-gtk.pc.in
index 37f26b3..958cea1 100644
--- a/libcanberra-gtk.pc.in
+++ b/libcanberra-gtk.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libcanberra-gtk
Description: Gtk Event Sound API
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lcanberra-gtk @PTHREAD_LIBS@
+Libs: -L${libdir} -lcanberra-gtk -lX11 @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir}
-Requires: libcanberra gtk+-2.0
+Requires: libcanberra gdk-2.0 gtk+-2.0
diff --git a/libcanberra-gtk3.pc.in b/libcanberra-gtk3.pc.in
index 352c626..fe89d3a 100644
--- a/libcanberra-gtk3.pc.in
+++ b/libcanberra-gtk3.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libcanberra-gtk3
Description: Gtk3 Event Sound API
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lcanberra-gtk3 @PTHREAD_LIBS@
+Libs: -L${libdir} -lcanberra-gtk3 -lX11 @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir}
-Requires: libcanberra gtk+-3.0
+Requires: libcanberra gdk-3.0 gtk+-3.0
diff --git a/src/canberra-gtk.h b/src/canberra-gtk.h
index ec451c5..f2afe69 100644
--- a/src/canberra-gtk.h
+++ b/src/canberra-gtk.h
@@ -24,6 +24,7 @@
***/
#include <canberra.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS