[xchat-gnome] build: Update autotools configuration

[Javier Jardón <jjardon src gnome org>]

commit 375ac38f70f5ec95b4dd80a48352de14a6818963
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Mar 26 15:36:25 2011 +0000

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

 Makefile.am  |    2 +-
 autogen.sh   |    3 ---
 configure.ac |   21 +++++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0da21bc..1e2cfbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = data help plugins po src
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST =			\
 	autogen.sh		\
diff --git a/autogen.sh b/autogen.sh
index 33a2c75..b9eccc5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,7 +17,4 @@ which gnome-autogen.sh || {
 	exit 1
 }
 
-REQUIRED_AUTOCONF_VERSION=2.60 
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_INTLTOOL_VERSION=0.40.0
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 7f6e74b..71e4f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,9 @@ AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip subdir-objects])
+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip subdir-objects])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 if test "$enable_maintainer_mode" = "yes"; then
@@ -19,8 +20,6 @@ if test -z "$enable_maintainer_mode"; then
 fi
 AM_MAINTAINER_MODE([enable])
 
-IT_PROG_INTLTOOL([0.35.0])
-
 GLIB_REQUIRED=2.18.0
 GTK_REQUIRED=2.14.0
 LIBGLADE_REQUIRED=2.3.2
@@ -32,23 +31,27 @@ LIBNOTIFY_REQUIRED=0.3.2
 LIBCANBERRAGTK_REQUIRED=0.3
 SM_REQUIRED=1.0.0
 
+# Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_PROG_CPP
 AM_PROG_AS
-AC_PROG_LIBTOOL
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
+#Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
+# Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
-AC_EXEEXT
-AC_HEADER_STDC
 
+# Checks for library functions.
 AC_CHECK_FUNCS(snprintf vsnprintf)
 AC_CHECK_FUNCS(memrchr strtoull atoll)
 
-GNOME_COMMON_INIT
+AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+
 GNOME_MAINTAINER_MODE_DEFINES
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
@@ -302,6 +305,8 @@ fi
 AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
 
 # i18n
+IT_PROG_INTLTOOL([0.40.0])
+
 GETTEXT_PACKAGE=xchat-gnome
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])