xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 configure.ac                     |    2 +-
 hw/xfree86/doc/devel/Makefile.am |    2 --
 shave.in                         |   10 ++++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit e6e83d81ee7366779d600cbb128034e248815339
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 4 14:51:08 2009 +1000

    xserver 1.6.99.900
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 181a861..2215d2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 RELEASE_DATE="(unreleased)"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
commit bc0841b6e87cdd752b44b17ccb021c831a3e02a5
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 4 15:58:36 2009 +1000

    shave: hack around the configure ld check for make distcheck.
    
    configure calls $(CC) -print-prog-name=ld to get the binary for the linker.
    The shave script prints " CC \nld" which can't be parsed by configure,
    resulting in a fatal error.
    
    This patch special-cases -print-prog-name and passes it though directly
    without any additional output.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/shave.in b/shave.in
index 174641e..809d606 100644
--- a/shave.in
+++ b/shave.in
@@ -33,6 +33,13 @@ while test "$#" -gt 0; do
         lt_output="$1"
         preserved_args="$preserved_args $opt"
 	;;
+    # hack for configure. configure calls $CC -print-prog-name=ld to get
+    # the linker. Without this bit here, the output can't be parsed and
+    # configure thinks there's no valid linker installed.
+    -print-prog-name=*)
+        mode="find-ld"
+        preserved_args="$preserved_args $opt"
+        ;;
     *)
         preserved_args="$preserved_args $opt"
         ;;
@@ -44,6 +51,9 @@ case "$mode,$tool" in
 link,*)
     pass_through=1
     ;;
+find-ld,*)
+    pass_through=1
+    ;;
 *,cxx)
     Q="  CXX   "
     ;;
commit 58d9a4c6356c98c32be2826410df027ece70d44d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 4 15:06:45 2009 +1000

    xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/doc/devel/Makefile.am b/hw/xfree86/doc/devel/Makefile.am
index eb8b1cb..c9eca5e 100644
--- a/hw/xfree86/doc/devel/Makefile.am
+++ b/hw/xfree86/doc/devel/Makefile.am
@@ -2,8 +2,6 @@
 # not installed on the system for end-users
 
 EXTRA_DIST = \
-	Domain.note \
-	RAC.Notes \
 	Registry \
 	exa-driver.txt \
 	README.DRIcomp