[banshee] Update to shave from git, patch to support mcs

[Aaron Bockover <abock src gnome org>]

commit 1734fd0765b7a4b9b3c0527397ef8928f5c7fa92
Author: Aaron Bockover <abockover novell com>
Date:   Sun May 17 18:13:30 2009 -0400

    Update to shave from git, patch to support mcs
---
 build/m4/shave/shave-libtool.in |   46 ++++++++++++++++++++++++++++++++++++--
 build/m4/shave/shave.in         |   37 +++++++++++++++++++++++++++++-
 build/m4/shave/shave.m4         |   29 ++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 5 deletions(-)

diff --git a/build/m4/shave/shave-libtool.in b/build/m4/shave/shave-libtool.in
index 1f3a720..54ebd69 100644
--- a/build/m4/shave/shave-libtool.in
+++ b/build/m4/shave/shave-libtool.in
@@ -1,4 +1,27 @@
 #!/bin/sh
+#
+# Copyright (c) 2009, Damien Lespiau <damien lespiau gmail com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 
 # we need sed
 SED= SED@
@@ -20,6 +43,10 @@ pass_though=0
 
 # scan the arguments, keep the right ones for libtool, and discover the mode
 preserved_args=
+
+# have we seen the --tag option of libtool in the command line ?
+tag_seen=0
+
 while test "$#" -gt 0; do
     opt="$1"
     shift
@@ -33,6 +60,10 @@ while test "$#" -gt 0; do
         lt_output="$1"
         preserved_args="$preserved_args $opt"
 	;;
+    --tag=*)
+        tag_seen=1
+        preserved_args="$preserved_args $opt"
+	;;
     *)
         preserved_args="$preserved_args $opt"
         ;;
@@ -58,12 +89,21 @@ esac
 lt_unmangle "$lt_output"
 output=$last_result
 
+# automake does not add a --tag switch to its libtool invocation when
+# assembling a .s file and rely on libtool to infer the right action based
+# on the compiler name. As shave is using CC to hook a wrapper, libtool gets
+# confused. Let's detect these cases and add a --tag=CC option.
+tag=""
+if test $tag_seen -eq 0 -a x"$mode" = xcompile; then
+    tag="--tag=CC"
+fi
+
 if test -z $V; then
     if test $pass_though -eq 0; then
         echo "$Q$output"
     fi
-    $LIBTOOL --silent $preserved_args
+    $LIBTOOL --silent $tag $preserved_args
 else
-    echo $LIBTOOL $preserved_args
-    $LIBTOOL $preserved_args
+    echo $LIBTOOL $tag $preserved_args
+    $LIBTOOL $tag $preserved_args
 fi
diff --git a/build/m4/shave/shave.in b/build/m4/shave/shave.in
index 174641e..0f07e21 100644
--- a/build/m4/shave/shave.in
+++ b/build/m4/shave/shave.in
@@ -1,4 +1,27 @@
 #!/bin/sh
+#
+# Copyright (c) 2009, Damien Lespiau <damien lespiau gmail com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 
 # we need sed
 SED= SED@
@@ -28,11 +51,15 @@ while test "$#" -gt 0; do
     case $opt in
     --shave-mode=*)
         mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-	;;
+        ;;
     -o)
         lt_output="$1"
         preserved_args="$preserved_args $opt"
-	;;
+        ;;
+    -out:*|/out:*)
+        lt_output="${opt:6}"
+        preserved_args="$preserved_args $opt"
+        ;;
     *)
         preserved_args="$preserved_args $opt"
         ;;
@@ -56,6 +83,12 @@ link,*)
 *,f77)
     Q="  F77   "
     ;;
+*,objc)
+    Q="  OBJC   "
+    ;;
+*,mcs)
+    Q="  MCS   "
+    ;;
 *,*)
     # should not happen
     Q="  CC    "
diff --git a/build/m4/shave/shave.m4 b/build/m4/shave/shave.m4
index 0c2c9f5..40e47f4 100644
--- a/build/m4/shave/shave.m4
+++ b/build/m4/shave/shave.m4
@@ -1,5 +1,28 @@
 dnl Make automake/libtool output more friendly to humans
 dnl
+dnl Copyright (c) 2009, Damien Lespiau <damien lespiau gmail com>
+dnl
+dnl Permission is hereby granted, free of charge, to any person
+dnl obtaining a copy of this software and associated documentation
+dnl files (the "Software"), to deal in the Software without
+dnl restriction, including without limitation the rights to use,
+dnl copy, modify, merge, publish, distribute, sublicense, and/or sell
+dnl copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following
+dnl conditions:
+dnl
+dnl The above copyright notice and this permission notice shall be
+dnl included in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+dnl EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+dnl OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+dnl HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
 dnl SHAVE_INIT([shavedir],[default_mode])
 dnl
 dnl shavedir: the directory where the shave scripts are, it defaults to
@@ -53,14 +76,20 @@ AC_DEFUN([SHAVE_INIT],
     SHAVE_SAVED_CXX=$CXX
     SHAVE_SAVED_FC=$FC
     SHAVE_SAVED_F77=$F77
+    SHAVE_SAVED_OBJC=$OBJC
+    SHAVE_SAVED_MCS=$MCS
     CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
     CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
     FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
     F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+    MCS="${SHELL} ${shavedir}/shave mcs ${SHAVE_SAVED_MCS}"
     AC_SUBST(CC)
     AC_SUBST(CXX)
     AC_SUBST(FC)
     AC_SUBST(F77)
+    AC_SUBST(OBJC)
+    AC_SUBST(MCS)
 
     V=@
   else