[gnome-hello] Modernize autotools configuration

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

commit b91c441dbd89bcd552d890ed5c268e2dcd1f06fa
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Feb 8 15:50:43 2010 +0100

    Modernize autotools configuration
    
    New requirements:
    autoconf >= 2.62
    automake >= 1.10
    libtool >= 2.2.6
    intltool >= 0.40.0

 Makefile.am  |    2 ++
 autogen.sh   |    5 ++---
 configure.ac |   30 ++++++++++++++----------------
 3 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 468aae9..b6da5dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = src pixmaps po help
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 NULL =
 
 desktopdir = $(datadir)/applications
diff --git a/autogen.sh b/autogen.sh
index b8a45cb..750a9ab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,12 +13,11 @@ PKG_NAME="gnome-hello"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME SVN repository"
+    echo "You need to install gnome-common module and make"
+    echo "sure the gnome-autogen.sh script is in your \$PATH."
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_INTLTOOL_VERSION=0.40.0
 USE_COMMON_DOC_BUILD=yes
 
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index ee1cfa4..6704887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,25 @@
+AC_PREREQ(2.61)
 AC_INIT([GNOME Hello],[2.0.3],[mailto:desktop-devel-list gnome org],[gnome-hello])
 
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
-
-if test -z "$enable_maintainer_mode"; then
-  enable_maintainer_mode=yes
-fi
-AM_MAINTAINER_MODE([enable])
+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+# Check for programs
 AC_PROG_CC
-AC_ISC_POSIX
-AC_HEADER_STDC
-AC_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT
 
 # *****
 # GNOME
 # *****
 
-GNOME_COMMON_INIT
 GNOME_DOC_INIT([0.17.3])
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
@@ -54,12 +52,12 @@ fi
 # Internationalisation
 # ********************
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
-GETTEXT_PACKAGE=gnome-hello-2.0
-AC_SUBST([GETTEXT_PACKAGE])
+AC_SUBST([GETTEXT_PACKAGE], [gnome-hello])
+AM_GNU_GETTEXT_VERSION([0.17])
 AM_GLIB_GNU_GETTEXT
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
 
 # *************************************
 # *************************************