xserver: Branch 'server-1.9-branch' - 2 commits

[Jeremy Huddleston]

 configure.ac     |    4 ++--
 test/Makefile.am |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8ab87dc7ff48d4db8e5f95a74df627dac9c53c0a
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Oct 1 13:37:49 2010 -0700

    Bump version to 1.9.0.901 (1.9.1 rc1)
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index 95f7a76..407a058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-08-20"
+AC_INIT([xorg-server], 1.9.0.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-10-01"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 5fb1780d6a44c7fca5143e5f456259499ddb0852
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Oct 1 14:05:03 2010 -0700

    test: Fix make distcheck when not building unit tests
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index 7c44671..456221e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -33,10 +33,9 @@ libxservertest_la_LIBADD = \
             $(top_builddir)/mi/libmi.la \
             $(top_builddir)/os/libos.la \
             @XORG_LIBS@
+endif
 
 CLEANFILES=libxservertest.c
 
 libxservertest.c:
 	touch $@
-
-endif