[unique] build: Update the build environment

[Emmanuele Bassi <ebassi src gnome org>]

commit f75ca2d7aad7d27686acca6090c1c569a79d7e63
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat May 8 12:17:21 2010 +0100

    build: Update the build environment
    
    Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave.
    
    Also bump up the requirement for gobject-introspection to 0.6.7.

 build/autotools/Makefile.am        |    3 -
 build/autotools/Makefile.am.silent |    6 ---
 build/autotools/introspection.m4   |    6 +++
 build/autotools/shave-libtool.in   |   69 -------------------------------
 build/autotools/shave.in           |   79 ------------------------------------
 build/autotools/shave.m4           |   77 -----------------------------------
 configure.ac                       |   59 +++++++++------------------
 7 files changed, 25 insertions(+), 274 deletions(-)
---
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index 5f35b85..b78428f 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -1,7 +1,4 @@
 EXTRA_DIST = \
-	shave-libtool.in 	\
-	shave.in 		\
-	shave.m4 		\
 	as-compiler-flag.m4	\
 	introspection.m4	\
 	Makefile.am.enums	\
diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent
index 249f6af..8576846 100644
--- a/build/autotools/Makefile.am.silent
+++ b/build/autotools/Makefile.am.silent
@@ -1,10 +1,5 @@
 # custom rules for quiet builds
 
-if USE_SHAVE
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-QUIET_LN  = $(Q:@= echo '  LN    '$@;)
-QUIET_RM  = $(Q:@= echo '  RM    '$@;)
-else
 QUIET_GEN = $(AM_V_GEN)
 
 QUIET_LN   = $(QUIET_LN_$(V))
@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo '  LN     '$@;
 QUIET_RM   = $(QUIET_RM_$(V))
 QUIET_RM_  = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
 QUIET_RM_0 = @echo '  RM     '$@;
-endif # USE_SHAVE
diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4
index f9ce49c..589721c 100644
--- a/build/autotools/introspection.m4
+++ b/build/autotools/introspection.m4
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
     AC_SUBST(INTROSPECTION_SCANNER)
     AC_SUBST(INTROSPECTION_COMPILER)
     AC_SUBST(INTROSPECTION_GENERATE)
     AC_SUBST(INTROSPECTION_GIRDIR)
     AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
 
     AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])
diff --git a/configure.ac b/configure.ac
index a3ed3ee..bc3163a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0])
 # This is the X.Y used in the protocol negotiation
 m4_define([unique_protocol_version], [1.0])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.63])
 
 AC_INIT([unique], [unique_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique],
@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version],
 AC_CONFIG_SRCDIR([unique/unique.h])
 AC_CONFIG_MACRO_DIR([build/autotools])
 
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2])
 AM_CONFIG_HEADER([config.h])
 
+AM_SILENT_RULES([yes])
+
+AC_PROG_CC_C_O
+
+AM_PATH_GLIB_2_0
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 # version symbols
 UNIQUE_MAJOR_VERSION=unique_major_version
 UNIQUE_MINOR_VERSION=unique_minor_version
@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
 AC_SUBST(UNIQUE_LT_VERSION_INFO)
 AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE)
 
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_C_CONST
-AC_PROG_LIBTOOL
-AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums])
-AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal])
-
-AM_SANITY_CHECK
-AM_PROG_CC_STDC
-
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
 m4_define([glib_required], [2.12.0])
 m4_define([gtk_required],  [2.11.0])
 m4_define([dbus_required], [0.70])
@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"])
 dnl Bacon backend
 dnl This is the fallback backend, so we *need* these headers and functions
 dnl even if we end up using D-Bus
-dnl D-Bus backend dependencies
 m4_define([have_bacon_default], [yes])
 AC_ARG_ENABLE([bacon],
               [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@],
@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags],
 AS_IF([test "x$enable_maintainer_flags" = "xyes" &&  test "x$GCC" = "xyes"],
       [
         AS_COMPILER_FLAGS([MAINTAINER_CFLAGS],
-                          ["-Werror -Wall -Wshadow -Wcast-align
-                            -Wno-uninitialized -Wempty-body -Wformat-security
-                            -Winit-self"])
+                          ["-Wall -Wshadow -Wcast-align
+                            -Wno-uninitialized -Wempty-body
+                            -Wformat-security -Winit-self"])
       ]
 )
 
@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
 AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR)
 
 # introspection
-GOBJECT_INTROSPECTION_CHECK([0.6.3])
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 # gtk-doc
-GTK_DOC_CHECK([1.11])
-
-# nice builds
-m4_ifdef([AM_SILENT_RULES],
-         [
-           AM_SILENT_RULES([yes])
-           use_shave=no
-         ],
-         [
-           SHAVE_INIT([build/autotools], [enable])
-           AC_CONFIG_FILES([
-                build/autotools/shave-libtool
-                build/autotools/shave
-           ])
-           use_shave=yes
-         ])
-
-AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"])
+GTK_DOC_CHECK([1.13])
 
 AC_CONFIG_FILES([
         Makefile