[f-spot] replaced shave scripts with silent-rules from automake

[Stephen Shaw <sshaw src gnome org>]

commit 08ba2cf0013cdf1629601524e8deab0968877b42
Author: Arun Persaud <arun nubati net>
Date:   Sun Oct 7 22:36:27 2012 -0700

    replaced shave scripts with silent-rules from automake

 .gitignore                      |    2 -
 autogen.sh                      |    2 +-
 build/m4/Makefile.am            |    4 +-
 build/m4/shave/shave-libtool.in |  109 ---------------------------------------
 build/m4/shave/shave.in         |  109 ---------------------------------------
 build/m4/shave/shave.m4         |  102 ------------------------------------
 configure.ac                    |    6 +--
 7 files changed, 4 insertions(+), 330 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c96ed3..947a73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,8 +42,6 @@ config.sub
 /mkinstalldirs
 /stamp-h1
 /doxygen
-build/m4/shave/shave
-build/m4/shave/shave-libtool
 build/m4/*.m4
 build/pkg-config/f-spot.pc
 data/desktop-files/*.desktop
diff --git a/autogen.sh b/autogen.sh
index 8caa159..b8881d9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -74,7 +74,7 @@ fi
 
 run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
-run aclocal -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
+run aclocal -I build/m4/f-spot -I build/m4/shamrock $ACLOCAL_FLAGS
 run autoconf
 run autoheader
 test -f config.h.in && touch config.h.in
diff --git a/build/m4/Makefile.am b/build/m4/Makefile.am
index ede9722..c42f76a 100644
--- a/build/m4/Makefile.am
+++ b/build/m4/Makefile.am
@@ -1,7 +1,5 @@
 EXTRA_DIST = \
 	$(srcdir)/f-spot/*.m4 \
-	$(srcdir)/shamrock/*.m4 \
-	$(srcdir)/shave/*.m4 \
-	$(srcdir)/shave/*.in
+	$(srcdir)/shamrock/*.m4
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/configure.ac b/configure.ac
index d537d9a..0769a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([build/m4])
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/f-spot -I build/m4/shave \${ACLOCAL_FLAGS}"])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/f-spot \${ACLOCAL_FLAGS}"])
 
 IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_LIBTOOL
@@ -284,7 +284,7 @@ AC_SUBST(BUILD_HOST_OS)
 AC_SUBST(BUILD_HOST_CPU)
 AC_SUBST(BUILD_TIME)
 
-SHAVE_INIT([build/m4/shave], [enable])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl generated files
 AC_OUTPUT([
@@ -292,8 +292,6 @@ Makefile
 
 build/Makefile
 build/m4/Makefile
-build/m4/shave/shave
-build/m4/shave/shave-libtool
 build/pkg-config/Makefile
 
 data/Makefile