From 7e700be7b8589e71255b9df601fcdc5bb35337a7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 18 Mar 2010 20:27:18 +0000 Subject: [PATCH] build: Require xcomposite The X11TexturePixmap actor uses XComposite API directly, without guards. It has been doing so for a while, against the fact that we do check for the XComposite extension - but we don't depend on it. As soon as you try building Clutter on X11 without the XComposite extension available all hell breaks loose. The obvious fix is to make Clutter depend on XComposite - basically ratifying what's the current state of things. --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 68244ee82..c2abb19a9 100644 --- a/configure.ac +++ b/configure.ac @@ -502,7 +502,7 @@ AS_IF([test "x$CLUTTER_WINSYS" = "xglx" || test "x$CLUTTER_WINSYS" = "xeglx"], AC_MSG_RESULT([found]) ], - [AC_MSG_RESULT([not found])] + [AC_MSG_ERROR([not found])] ) # XINPUT (optional) @@ -530,9 +530,7 @@ AS_IF([test "x$CLUTTER_WINSYS" = "xglx" || test "x$CLUTTER_WINSYS" = "xeglx"], [], ) - # X11-specific tests are enabled conditionally - AS_IF([test "x$have_xcomposite" = "xyes"], [x11_tests=yes], [x11_tests=no]) - + x11_tests=yes BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES" ] )