[glib-controller] Update autotools configuration a bit

[Emmanuele Bassi <ebassi src gnome org>]

commit 3e41c155dd25f981df4b0332e1bbf378970c6ef9
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Apr 29 17:42:51 2010 +0200

    Update autotools configuration a bit
    
    New requirements:
    autoconf >= 2.63
    libtool >= 2.2.6

 Makefile.am  |    2 ++
 autogen.sh   |    4 ++--
 configure.ac |   31 +++++++++++--------------------
 3 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eec7867..8943a73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+
 # preamble
 NULL =
 
diff --git a/autogen.sh b/autogen.sh
index 8e8c504..19df2c2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,9 +13,9 @@ test ${TEST_TYPE} ${FILE} || {
 }
 
 which gnome-autogen.sh || {
-        echo "*** You need to install gnome-common from GNOME SVN:"
+        echo "*** You need to install gnome-common from GNOME Git:"
         echo "***  git clone git://git.gnome.org/gnome-common"
         exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index a6f9fe7..3081987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,26 +22,30 @@ m4_define([lt_age], [m4_eval(controller_binary_age - controller_interface_age)])
 
 m4_define([glib_req_version], [2.20])
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.63])
 
 AC_INIT([glib-controller],
         [controller_version],
         [],
         [glib-controller])
 
+AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([glib-controller/glib-controller.h])
 AC_CONFIG_MACRO_DIR([build])
 
 AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2 foreign])
-AM_CONFIG_HEADER([config.h])
 
-AM_DISABLE_STATIC
+AM_SILENT_RULES([yes])
+
+# Check for programs
+AC_PROG_CC_C_O
+
 AM_PATH_GLIB_2_0
-AM_PROG_CC_C_O
-AM_PROG_LIBTOOL
 
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
 
 GCONTROLLER_MAJOR_VERSION=controller_major_version
 GCONTROLLER_MINOR_VERSION=controller_minor_version
@@ -62,12 +66,6 @@ GCONTROLLER_LT_VERSION="$GCONTROLLER_LT_CURRENT:$GCONTROLLER_LT_REVISION:$GCONTR
 GCONTROLLER_LDFLAGS="-version-info $GCONTROLLER_LT_VERSION"
 AC_SUBST(GCONTROLLER_LDFLAGS)
 
-AC_HEADER_STDC
-AC_CHECK_HEADERS([unistd.h])
-AC_C_CONST
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix gobject-2.0`"
 AC_SUBST(GLIB_PREFIX)
 
@@ -154,12 +152,6 @@ GTK_DOC_CHECK([1.13])
 
 GOBJECT_INTROSPECTION_CHECK([0.6.5])
 
-m4_ifdef([AM_SILENT_RULES],
-         [
-           AM_SILENT_RULES([yes])
-           use_shave=no
-         ])
-
 AC_CONFIG_FILES([
         Makefile
         glib-controller.pc
@@ -180,7 +172,6 @@ echo " â?¢ Prefix: ${prefix}"
 echo ""
 echo " â?¢ Debug level: ${enable_debug}"
 echo " â?¢ Compiler flags: ${MAINTAINER_CFLAGS}"
-echo " â?¢ Use shave: ${use_shave}"
 echo ""
 echo " â?¢ API reference: ${enable_gtk_doc}"
 echo ""