[geocode-glib] Update autotools configuration

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

commit 564af9cc8050801bf75ec6abd9536db80cd123ef
Author: Javier Jardón <jjardon gnome org>
Date:   Fri May 20 18:15:51 2011 +0100

    Update autotools configuration

 Makefile.am  |    2 ++
 configure.ac |   30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1fbf4ab..55e711b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = geocode-glib po docs
 
 EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in gtk-doc.make
diff --git a/configure.ac b/configure.ac
index b8697be..9ac7876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.52)
+AC_PREREQ([2.63])
 
 m4_define(gclib_version_major, 0)
 m4_define(gclib_version_minor, 99)
@@ -6,12 +6,14 @@ m4_define(gclib_version_micro, 0)
 
 AC_INIT([geocode-glib],
         [gclib_version_major.gclib_version_minor.gclib_version_micro],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=geocode-glib])
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=geocode-glib],
+        [geocode-glib])
 
 AC_CONFIG_SRCDIR([geocode-glib/test-gcglib.c])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip check-news])
+AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip check-news])
 
 # Before making a release, the GCLIB_LT_VERSION string should be modified.
 # The string is of the form C:R:A.
@@ -23,20 +25,21 @@ AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip check-news])
 GCLIB_LT_VERSION=0:0:0
 AC_SUBST(GCLIB_LT_VERSION)
 
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
 # to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
-AC_LANG_C
+# Check for programs
 AC_PROG_CC
 AC_PROG_INSTALL
+AC_LANG([C])
 
 dnl Initialize libtool
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
 
 GETTEXT_PACKAGE=geocode-glib
 AC_SUBST(GETTEXT_PACKAGE)
@@ -47,7 +50,7 @@ AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
 dnl gtk-doc checks
-GTK_DOC_CHECK(1.9)
+GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
 
 AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale", [Directory for the localization files])
 
@@ -62,7 +65,6 @@ AC_SUBST(GLIB_GENMARSHAL)
 
 GOBJECT_INTROSPECTION_CHECK([0.6.3])
 
-GNOME_COMMON_INIT
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS
@@ -78,13 +80,15 @@ if test "$GCC" = "yes" ; then
 	$CFLAGS"
 fi
 
-GNOME_DOC_INIT
+GNOME_DOC_INIT([2.20])
 
-AC_OUTPUT(Makefile
+AC_CONFIG_FILES([
+          Makefile
 	  geocode-glib.pc
 	  docs/Makefile
 	  docs/version.xml
 	  geocode-glib/Makefile
 	  po/Makefile.in
-)
+])
+AC_OUTPUT