[vte] build: Update autotools configuration

[jjardon src gnome org]

commit 2cce4ae4d5599b131b5f53340f636630bf1cf6d9
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Wed Feb 2 13:35:24 2011 +0000

    build: Update autotools configuration
    
    Replace deprecated macros and use the new libtool syntax

 Makefile.am  |    2 ++
 autogen.sh   |    7 +------
 configure.ac |   29 ++++++++++++++++-------------
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1d536b6..f351089 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = src termcaps po doc perf
 
 if HAVE_GTK_2
diff --git a/autogen.sh b/autogen.sh
index 926d0cf..481e4bf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,13 +22,8 @@ which gperf || {
 
 echo "checking for gnome-autogen.sh"
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME SVN"
+    echo "You need to install the gnome-common package"
     exit 1
 }
 
-USE_COMMON_DOC_BUILD=yes
-REQUIRED_AUTOMAKE_VERSION=1.10
-REQUIRED_INTLTOOL_VERSION=0.40.0
-REQUIRED_GTK_DOC_VERSION=0.13
-
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 887e344..c767d89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,12 +5,17 @@ m4_define([version_triplet],version_major.version_minor.version_micro)
 
 m4_define([so_major_adjust],9) dnl Don't change!
 
-AC_PREREQ([2.59])
-AC_INIT(vte, [version_triplet], [http://bugzilla.gnome.org/enter_bug.cgi?product=vte])
+AC_PREREQ([2.63])
+AC_INIT([vte],
+        [version_triplet],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=vte],
+        [vte])
+
 AC_CONFIG_SRCDIR([src/vte.c])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.10 foreign no-dist-gzip dist-bzip2])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -79,22 +84,22 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
 
 ################################################################################
 
-AC_ISC_POSIX
+# Check for programs
 AC_PROG_CC
-AC_STDC_HEADERS
-AM_PROG_CC_STDC
-
+AC_HEADER_STDC
 AM_PROG_CC_C_O
+AC_PROG_SED
 
-AM_PROG_LIBTOOL
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
 
-AC_PROG_SED
 
 ################################################################################
 # i18n
 ################################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 GETTEXT_PACKAGE=vte-$VTE_API_VERSION
 AC_SUBST(GETTEXT_PACKAGE)
@@ -273,8 +278,6 @@ AC_SUBST([VTE_LDFLAGS])
 
 ################################################################################
 
-GNOME_COMMON_INIT
-
 # Disable deprecations and single includes
 # We don't use GNOME_MAINTAINER_MODE_DEFINES here since it's too much and
 # it also defines VTE's own defines.
@@ -469,7 +472,7 @@ if sys.version_info < minver:
 	sys.exit(1)
 sys.exit(0)
 "
-	if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+	if $PYTHON -c "$prog" 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
 	then
 		AC_MSG_RESULT([okay])
 	else