sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Require xcomposite

Browse source 
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.
This commit is contained in:
Emmanuele Bassi 2010-03-18 20:27:18 +00:00
parent a8595aec13
commit 7e700be7b8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -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"
]
)