xserver: Branch 'master' - 2 commits

[Ben Byer]

 configure.ac |    1 +
 1 file changed, 1 insertion(+)

New commits:
diff-tree e332335241af28ef0ab66b102d0cbc4e5c73ac68 (from parents)
Merge: 7381e9149e3cbb7e672070781a16e3f096202be9 accd71bda6f958ea6892ad3a10879232d345774c
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 15:51:23 2007 -0700

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver

diff-tree 7381e9149e3cbb7e672070781a16e3f096202be9 (from 8b77dc7e808f61f1ed10fe05cf898bb47459a76d)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 15:51:11 2007 -0700

    added an exclusion for setting XORG on darwin

diff --git a/configure.ac b/configure.ac
index cba9d31..9c3ee99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1220,6 +1220,7 @@ if test "x$XORG" = xauto; then
 	XORG="yes"
 	case $host_os in
 		cygwin*) XORG="no" ;;
+		darwin*) XORG="no" ;;
 	esac
 fi
 AC_MSG_RESULT([$XORG])