From e5331136db1fa1fe60b29f320abe6f470e384a3c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 5 Jan 2011 05:01:27 +0100
Subject: [PATCH] Update autotools configuration

Update deprecated autoconf macros and use new libtool syntax
---
 Makefile.am  |  2 +-
 configure.ac | 43 ++++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a2db1de..ee3adb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Process this file with automake to create Makefile.in.
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS=atk tests docs po
 
diff --git a/configure.ac b/configure.ac
index ffbd37b..d94640f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.62)
+AC_PREREQ([2.63])
 
 dnl ==========================================================================
 dnl                              Versioning              
@@ -37,16 +37,16 @@ m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)])
 m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
 m4_define([lt_current_minus_age], [m4_eval(lt_current - lt_age)])
 
+AC_INIT([atk],
+        [atk_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=atk],
+        [atk])
 
-AC_INIT(atk, [atk_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=atk])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([ChangeLog])
-
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE([-Wno-portability])
+AM_INIT_AUTOMAKE([1.10 -Wno-portability])
 
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
@@ -84,15 +84,14 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
 
 dnl ==========================================================================
 
-GETTEXT_PACKAGE=atk10
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
-  [Define the gettext package to be used])
-
+# Check for programs
 AC_PROG_CC
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static win32-dll])
+
+AC_CHECK_FUNCS(bind_textdomain_codeset)
 
 AC_MSG_CHECKING([for some Win32 platform])
 case "$host" in
@@ -145,7 +144,7 @@ AC_CACHE_CHECK([for aclocal flags], ac_cv_atk_aclocal_flags,[
 ACLOCAL="$ACLOCAL $ac_cv_atk_aclocal_flags"
 
 AC_ARG_ENABLE(rebuilds,
-              [AC_HELP_STRING([--disable-rebuilds],
+              [AS_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 
@@ -185,14 +184,20 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
+# i18n stuff
+GETTEXT_PACKAGE=atk10
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
+  [Define the gettext package to be used])
+
 ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT
 
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-
+# Introspection support
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
-GTK_DOC_CHECK([1.0])
+# Documentation support
+GTK_DOC_CHECK([1.13])
 
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
-- 
2.7.4