xserver: Branch 'xorg-server-1.6-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac                     |    2 ++
 hw/xquartz/bundle/Info.plist.cpp |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a1d35cee5907a76977ee43c49cb55c8f411c9794
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jan 10 01:39:08 2009 -0800

    Apple: Don't use DRI2

diff --git a/configure.ac b/configure.ac
index c222c95..cd53288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,6 +631,8 @@ AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
 dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to handle this early on
 case $host_os in
 	darwin*)
+		DRI2=no
+
 		if test x$XQUARTZ = xauto; then
 			AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[
 		 		save_LDFLAGS=$LDFLAGS
commit f5f3803835e8531cf36cf694ddfd4444c13c4823
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jan 6 15:32:44 2009 -0800

    XQuartz: Bundle version 2.4.0
    (cherry picked from commit 3a3ccf5354e4275abe9d01f41a92602df5d690dc)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 47018fd..1f9b3ae 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.3.2</string>
+		<string>2.4.0</string>
 	<key>CFBundleVersion</key>
-		<string>2.3.2</string>
+		<string>2.4.0</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>