mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-05 14:16:06 +00:00
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.
This commit is contained in:
parent
70a71bd9cf
commit
8b0fadc2ff
|
@ -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>
|
2008-12-31 Jan Schmidt <jan.schmidt@sun.com>
|
||||||
|
|
||||||
* win32/common/libgstaudio.def:
|
* win32/common/libgstaudio.def:
|
||||||
|
|
|
@ -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)
|
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")
|
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 variables based on configure arguments ***
|
||||||
|
|
||||||
dnl set license and copyright notice
|
dnl set license and copyright notice
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if HAVE_GTK
|
if HAVE_GTK_X11
|
||||||
GTK_EXAMPLES=seek scrubby
|
GTK_EXAMPLES=seek scrubby
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
|
||||||
stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
|
stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
|
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
|
||||||
|
|
||||||
if HAVE_GTK
|
if HAVE_GTK_X11
|
||||||
X_TESTS += test-colorkey
|
X_TESTS += test-colorkey
|
||||||
|
|
||||||
test_colorkey_SOURCES = test-colorkey.c
|
test_colorkey_SOURCES = test-colorkey.c
|
||||||
|
|
Loading…
Reference in a new issue