xserver: Branch 'master'

[Julien Cristau]

 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit dc10f0a0e243b7ba38d02a4e2c43027563aead7c
Author: Julien Cristau <jcristau at debian.org>
Date:   Thu Apr 17 11:13:47 2008 +0200

    Fix composite on !darwin
    
    2ffdb0eb641ab6949783b4eb574f77e7486ac929 changes the default value of
    COMPOSITE to 'auto', but doesn't set it back to 'yes' as appropriate.

diff --git a/configure.ac b/configure.ac
index 1670c69..56303e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,6 +789,9 @@ if test "x$COMPOSITE" = xauto; then
 		darwin*)
 			[ "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto ] && COMPOSITE=no
 			;;
+		*)
+			COMPOSITE=yes
+			;;
 	esac
 fi