From 29ce02b1d290e57852230367778ea9e89b1e92b7 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 22 Feb 2011 19:34:52 +0100 Subject: [PATCH] Add explicit x11 dependencies Since Ubuntu patches clutter-1.0.pc to remove x11 from the requires, we have to list it explicitly for places we use X11 functions, like ST and the shell recorder. https://bugzilla.gnome.org/show_bug.cgi?id=643003 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 78debf20a..c3dc6397e 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)]) if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then AC_MSG_RESULT(yes) build_recorder=true - recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes" + recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes x11" PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0) else AC_MSG_RESULT(no) @@ -102,7 +102,7 @@ AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id) CFLAGS=$saved_CFLAGS LIBS=$saved_LIBS -PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0) +PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0 x11) PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0) PKG_CHECK_MODULES(TRAY, gtk+-3.0) PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)