Make the seek and colorkey examples depend on gtk+-x11 as they use

Original commit message from CVS:
* configure.ac:
* tests/examples/seek/Makefile.am:
* tests/icles/Makefile.am:
Make the seek and colorkey examples depend on gtk+-x11 as they use
GDK_WINDOW_XID.
Fixes the build with gtk+-quartz.

diff --git a/ChangeLog b/ChangeLog
index 010cfc3..3b2b4ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-02  Alessandro Decina  <alessandro.d@gmail.com>
+
+       * configure.ac:
+       * tests/examples/seek/Makefile.am:
+       * tests/icles/Makefile.am:
+       Make the seek and colorkey examples depend on gtk+-x11 as they use
+       GDK_WINDOW_XID.
+       Fixes the build with gtk+-quartz.
+
 2008-12-31  Jan Schmidt  <jan.schmidt@sun.com>
 
        * win32/common/libgstaudio.def:

diff --git a/configure.ac b/configure.ac
index d924b44..6af3370 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -266,6 +266,11 @@ dnl GTK is optional and only used in examples
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0, HAVE_GTK=yes, HAVE_GTK=no)
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
+dnl some examples need gtk+-x11
+PKG_CHECK_MODULES(GTK_X11, gtk+-x11-2.0 >= 2.12.0,
+    HAVE_GTK_X11=yes, HAVE_GTK_X11=no)
+AM_CONDITIONAL(HAVE_GTK_X11, test "x$HAVE_GTK_X11" = "xyes")
+
 dnl *** set variables based on configure arguments ***
 
 dnl set license and copyright notice

diff --git a/tests/examples/seek/Makefile.am b/tests/examples/seek/Makefile.am
index d60046d..5ee2ad1 100644 (file)
--- a/tests/examples/seek/Makefile.am
+++ b/tests/examples/seek/Makefile.am
@@ -1,4 +1,4 @@
-if HAVE_GTK
+if HAVE_GTK_X11
 GTK_EXAMPLES=seek scrubby
 endif
 

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index b06e967..f0fed9b 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -6,7 +6,7 @@ stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 
-if HAVE_GTK
+if HAVE_GTK_X11
 X_TESTS += test-colorkey
 
 test_colorkey_SOURCES = test-colorkey.c