diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-02-12 06:07:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-02-12 06:07:55 +0000 |
| commit | 6a8792e440e4c9f598e2549eed0d8ee2f93071a7 (patch) | |
| tree | 1c80c476ee1620cbc7632d26dfce0a5c84f73956 | |
| parent | b7fa1995e76f323ce233fc2d3d43aa74038ad17f (diff) | |
| download | metacity-6a8792e440e4c9f598e2549eed0d8ee2f93071a7.tar.gz | |
Revert compositor checks to what HEAD has ... what was here wasn't really
2005-02-12 Owen Taylor <otaylor@redhat.com>
* configure.in: Revert compositor checks to what HEAD
has ... what was here wasn't really functional.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 11 insertions, 14 deletions
@@ -1,3 +1,8 @@ +2005-02-12 Owen Taylor <otaylor@redhat.com> + + * configure.in: Revert compositor checks to what HEAD + has ... what was here wasn't really functional. + Tue Feb 1 16:21:40 2005 Søren Sandmann <sandmann@redhat.com> * src/snow.[ch]: new files diff --git a/configure.in b/configure.in index 02e6e3fe..593ee5fc 100644 --- a/configure.in +++ b/configure.in @@ -198,21 +198,13 @@ fi ## or the render-specific check later have_xrender=no -XCOMPOSITE_VERSION=1.0 - -XCOMPOSITE_LIBS= -found_xcomposite=no -AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, - [AC_CHECK_HEADER(X11/extensions/composite.h, - found_xcomposite=yes,, - [#include <X11/Xlib.h>])], - , $ALL_X_LIBS) - -if test x$enable_xcompositor = xno; then - found_xcomposite=no -fi - +XCOMPOSITE_VERSION=0.2 AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION]) +if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then + have_xcomposite=yes +else + have_xcomposite=no +fi AC_MSG_RESULT($have_xcomposite) if test x$enable_compositor = xyes; then |