[gnome-utils] build: Remove shave

[Emmanuele Bassi <ebassi src gnome org>]

commit abdb90a600e91215bf26daa8ca28fdf2ba6048da
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Sep 28 00:17:06 2010 +0100

    build: Remove shave
    
    Use Automake 1.11 and its silent rules.

 .gitignore          |    1 +
 autogen.sh          |   11 +------
 configure.ac        |   19 ++++++------
 m4/Makefile.am      |    9 +----
 m4/shave-libtool.in |   69 --------------------------------------------
 m4/shave.in         |   79 ---------------------------------------------------
 m4/shave.m4         |   77 -------------------------------------------------
 7 files changed, 14 insertions(+), 251 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 103aae3..3cf2687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ aclocal.m4
 config.guess
 config.h
 config.h.in
+config.h.in~
 config.log
 config.status
 config.sub
diff --git a/autogen.sh b/autogen.sh
index dcd1d79..5422287 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.11
 PKG_NAME="GNOME Utilities"
 
 (test -f $srcdir/configure.ac \
@@ -22,12 +22,3 @@ which gnome-autogen.sh || {
 }
 
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
-
-# we need to patch gtk-doc.make to support pretty output with
-# libtool 1.x.  Should be fixed in the next version of gtk-doc.
-# To be more resilient with the various versions of gtk-doc one
-# can find, just sed gkt-doc.make rather than patch it.
-sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make > gtk-doc.temp \
-                && mv gtk-doc.temp gtk-doc.make
-sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make > gtk-doc.temp \
-                && mv gtk-doc.temp gtk-doc.make
diff --git a/configure.ac b/configure.ac
index 20fb880..20e1f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,14 +4,19 @@ m4_define([gnome_utils_micro], [0])
 
 m4_define([gnome_utils_version], [gnome_utils_major.gnome_utils_minor.gnome_utils_micro])
 
+AC_PREREQ([2.63])
+
 AC_INIT([gnome-utils],
         [gnome_utils_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-utils])
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-utils],
+        [gnome-utils],
+        [http://live.gnome.org/GnomeUtils])
 
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 -Wno-portability dist-bzip2])
+AM_SILENT_RULES([yes])
 
 GNOME_COMMON_INIT
 
@@ -25,8 +30,6 @@ AC_STDC_HEADERS
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
 AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal])
 AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums])
 
@@ -46,7 +49,6 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([getpgid])
 
-
 # Before making a release, the LT_VERSION string should be modified.
 # The string is of the form C:R:A.
 # - If interfaces have been changed or added, but binary compatibility has
@@ -55,6 +57,9 @@ AC_CHECK_FUNCS([getpgid])
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+AC_LIBTOOL_WIN32_DLL
 LIBGDICT_LT_VERSION=6:7:0
 AC_SUBST(LIBGDICT_LT_VERSION)
 
@@ -353,14 +358,10 @@ GTK_DOC_CHECK([1.10])
 dnl gnome-doc-utils stuff
 GNOME_DOC_INIT
 
-SHAVE_INIT([m4], [enable])
-
 AC_CONFIG_FILES([
         Makefile
 
         m4/Makefile
-        m4/shave-libtool
-        m4/shave
 
         po/Makefile.in
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index fc4900b..88c1bec 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,8 +1,3 @@
-EXTRA_DIST = \
-	shave-libtool.in 	\
-	shave.in		\
-	shave.m4
+EXTRA_DIST =
 
-DISTCLEANFILES = \
-	shave-libtool		\
-	shave
+DISTCLEANFILES =