Error "shave-libtool[61]: test: argument" when building xserver

I think it is better to add quotation marks into shave.in and shave-libtool.in

$ diff -u shave-libtool.in shave-libtool.in_mod
--- shave-libtool.in    Mon Sep 21 14:58:39 2009
+++ shave-libtool.in_mod        Mon Sep 21 15:25:08 2009
@@ -58,7 +58,7 @@
 lt_unmangle "$lt_output"
 output=$last_result

-if test -z $V; then
+if test -z "$V"; then
     if test $pass_though -eq 0; then
         echo "$Q$output"
     fi


$ diff -u shave.in shave.in_mod
--- shave.in    Mon Sep 21 14:58:39 2009
+++ shave.in_mod        Mon Sep 21 15:25:22 2009
@@ -75,7 +75,7 @@
 lt_unmangle "$lt_output"
 output=$last_result

-if test -z $V; then
+if test -z "$V"; then
     if test $pass_through -eq 0; then
         echo "$Q$output"
     fi


Or add #!/bin/bash instead of #!/bin/sh at the begining of the files