[seed] [build] Update to more recent shave

[Tim Horton <hortont src gnome org>]

commit 84c119ae565650740358b08dc8fe7d2c8faca837
Author: Tim Horton <hortont svn gnome org>
Date:   Fri Jun 19 22:55:51 2009 -0400

    [build] Update to more recent shave

 configure.ac             |    2 +-
 m4/shave.m4              |  118 +++++++++++++++++++++++++++++++++++-----------
 scripts/shave-libtool.in |   46 +++++++++++++++++-
 scripts/shave.in         |   37 ++++++++++++++-
 4 files changed, 169 insertions(+), 34 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 153ffe6..3ef2b69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,7 +349,7 @@ dnl =============================gtk-doc=======================================
 GTK_DOC_CHECK(1.9)
 
 dnl =============================Output========================================
-SHAVE_INIT([scripts])
+SHAVE_INIT([scripts],[enable])
 AC_CONFIG_FILES([
 seed.pc
 Makefile
diff --git a/m4/shave.m4 b/m4/shave.m4
index 5b1f675..40e47f4 100644
--- a/m4/shave.m4
+++ b/m4/shave.m4
@@ -1,40 +1,102 @@
 dnl Make automake/libtool output more friendly to humans
 dnl
-dnl SHAVE_INIT([shavedir])
+dnl Copyright (c) 2009, Damien Lespiau <damien lespiau gmail com>
 dnl
-dnl shavedir: the directory where the shave script is, it defaults to
+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
 dnl           $(top_builddir)
+dnl default_mode: (enable|disable) default shave mode.  This parameter
+dnl               controls shave's behaviour when no option has been
+dnl               given to configure.  It defaults to disable.
 dnl
 dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
-dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrite CC and
+dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
 dnl   LIBTOOL, you don't want the configure tests to have these variables
 dnl   re-defined.
 dnl * This macro requires GNU make's -s option.
 
-AC_DEFUN([SHAVE_INIT], [
-dnl where can we find the shave scripts?
-m4_if([$1],,
-  [shavedir='$(top_builddir)'],
-  [shavedir='$(top_builddir)'/$1])
-AC_SUBST(shavedir)
-dnl make is now quiet
-AC_SUBST([MAKEFLAGS], [-s])
-AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
-dnl we need sed
-AC_CHECK_PROG(SED,sed,sed,false)
-dnl substitute libtool
-SHAVE_SAVED_LIBTOOL=$LIBTOOL
-AC_SUBST(SHAVE_SAVED_LIBTOOL)
-LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'"
-AC_SUBST(LIBTOOL)
-dnl substitute cc
-SHAVE_SAVED_CC=$CC
-SHAVE_SAVED_CXX=$CXX
-AC_SUBST(SHAVE_SAVED_CC)
-AC_SUBST(SHAVE_SAVED_CXX)
-CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'"
-CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'"
-AC_SUBST(CC)
-AC_SUBST(CXX)
+AC_DEFUN([_SHAVE_ARG_ENABLE],
+[
+  AC_ARG_ENABLE([shave],
+    AS_HELP_STRING(
+      [--enable-shave],
+      [use shave to make the build pretty [[default=$1]]]),,
+      [enable_shave=$1]
+    )
+])
+
+AC_DEFUN([SHAVE_INIT],
+[
+  dnl you can tweak the default value of enable_shave
+  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+
+  if test x"$enable_shave" = xyes; then
+    dnl where can we find the shave scripts?
+    m4_if([$1],,
+      [shavedir="$ac_pwd"],
+      [shavedir="$ac_pwd/$1"])
+    AC_SUBST(shavedir)
+
+    dnl make is now quiet
+    AC_SUBST([MAKEFLAGS], [-s])
+    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
+
+    dnl we need sed
+    AC_CHECK_PROG(SED,sed,sed,false)
+
+    dnl substitute libtool
+    SHAVE_SAVED_LIBTOOL=$LIBTOOL
+    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+    AC_SUBST(LIBTOOL)
+
+    dnl substitute cc/cxx
+    SHAVE_SAVED_CC=$CC
+    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
+    V=1
+  fi
+  Q='$(V:1=)'
+  AC_SUBST(V)
+  AC_SUBST(Q)
 ])
 
diff --git a/scripts/shave-libtool.in b/scripts/shave-libtool.in
index 1f3a720..54ebd69 100644
--- a/scripts/shave-libtool.in
+++ b/scripts/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/scripts/shave.in b/scripts/shave.in
index 174641e..47a0b76 100644
--- a/scripts/shave.in
+++ b/scripts/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:5}"
+        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    "