xserver: Branch 'glucose-2'
Alan Hourihane
alanh at kemper.freedesktop.org
Tue Mar 27 14:52:19 EEST 2007
configure.ac | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
New commits:
diff-tree 2e5271f75999911a5c077e38915589413f1e34ba (from d5aacae5b6cf72c2bdec031907de39392505ce1f)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Tue Mar 27 12:52:18 2007 +0100
Build glucose when glitz is detected
diff --git a/configure.ac b/configure.ac
index 14c4ccb..d4f1b74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -646,6 +646,14 @@ else
XVMC=no
fi
+PKG_CHECK_MODULES([GLUCOSE], [glitz >= 0.5.4], [GLUCOSE=yes], [GLUCOSE=no])
+AC_SUBST(GLUCOSE_CFLAGS)
+AC_SUBST(GLUCOSE_LIBS)
+AM_CONDITIONAL(GLUCOSE, [test "x$GLUCOSE" = xyes])
+if test "x$GLUCOSE" = xyes; then
+ AC_DEFINE(GLUCOSE, 1, [Build glucose acceleration module])
+fi
+
AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
if test "x$XVMC" = xyes; then
AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
@@ -700,10 +708,13 @@ if test "x$GLX" = xyes && ! test "x$MESA
test -d GL || mkdir GL
case $host_os in
solaris*)
- SYMLINK_MESA="/usr/bin/bash $srcdir/GL/symlink-mesa.sh" ;;
- *) SYMLINK_MESA=$srcdir/GL/symlink-mesa.sh ;;
+ SYMLINK_MESA="/usr/bin/bash $srcdir/GL/symlink-mesa.sh"
+ SYMLINK_GLUCOSE="/usr/bin/bash $srcdir/glucose/symlink-xgl.sh" ;;
+ *) SYMLINK_MESA=$srcdir/GL/symlink-mesa.sh
+ SYMLINK_GLUCOSE=$srcdir/glucose/symlink-xgl.sh ;;
esac
$SYMLINK_MESA $MESA_SOURCE GL/
+ $SYMLINK_GLUCOSE $srcdir/hw/xgl glucose/
if test $? -ne 0; then
AC_MSG_ERROR([Failed to link Mesa source tree. Please specify a proper path to Mesa sources, or disable GLX.])
fi
@@ -2000,6 +2011,7 @@ Xext/Makefile
Xi/Makefile
xfixes/Makefile
exa/Makefile
+glucose/Makefile
hw/Makefile
hw/xfree86/Makefile
hw/xfree86/common/Makefile
More information about the xorg-commit
mailing list