[gst-cvs] gst-plugins-gl: clutter: Check for xcomposite and disable clutter examples if it isn't found

[Sebastian Dröge]

Module: gst-plugins-gl
Branch: master
Commit: 8c0ddb8eadd2c12ad5714a6e15e2f5e688b12776
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-gl/commit/?id=8c0ddb8eadd2c12ad5714a6e15e2f5e688b12776

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jun 14 14:08:07 2010 +0200

clutter: Check for xcomposite and disable clutter examples if it isn't found

---

 configure.ac                       |    5 +++++
 tests/examples/clutter/Makefile.am |   10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a942971..1602df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,6 +327,11 @@ AC_SUBST(CLUTTER_X11_CFLAGS)
 AC_SUBST(HAVE_CLUTTER_X11)
 AM_CONDITIONAL(HAVE_CLUTTER_X11, test "x$HAVE_CLUTTER_X11" = "xyes")
 
+dnl used in the clutteractor example
+PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, HAVE_XCOMPOSITE=yes, HAVE_XCOMPOSITE=no)
+AC_SUBST(XCOMPOSITE_CFLAGS)
+AC_SUBST(XCOMPOSITE_LIBS)
+AM_CONDITIONAL(HAVE_XCOMPOSITE, test "x$HAVE_XCOMPOSITE" = "xyes")
 
 dnl sdl is optional and used in examples
 HAVE_SDL=NO
diff --git a/tests/examples/clutter/Makefile.am b/tests/examples/clutter/Makefile.am
index ef12af8..d02fb4f 100644
--- a/tests/examples/clutter/Makefile.am
+++ b/tests/examples/clutter/Makefile.am
@@ -17,6 +17,7 @@ endif
 
 if HAVE_CLUTTER_GLX
 if HAVE_CLUTTER_X11
+if HAVE_XCOMPOSITE
 
 noinst_PROGRAMS += clutteractor clutteractortee
 
@@ -25,22 +26,23 @@ clutteractor_SOURCES = clutteractor.c
 clutteractor_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
 	$(GL_CFLAGS) $(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
-	$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS)
+	$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
 clutteractor_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
 	$(GL_LIBS) $(GTK_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
 	$(CLUTTER_LIBS) \
-	$(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS)
+	$(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) $(XCOMPOSITE_LIBS)
 
 clutteractortee_SOURCES = clutteractortee.c
 
 clutteractortee_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
 	$(GL_CFLAGS) $(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
-	$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS)
+	$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
 clutteractortee_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
 	$(GL_LIBS) $(GTK_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
 	$(CLUTTER_LIBS) \
-	$(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS)
+	$(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) $(XCOMPOSITE_LIBS)
 
 endif
 endif
+endif