[atomix] Modernize autotools configuration

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

commit 6a506df69fa3d9e50914e9feb4e1eeec7081a106
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Apr 1 00:44:12 2010 +0200

    Modernize autotools configuration
    
    New requirements:
    autoconf >= 2.63
    automake >= 1.10
    intltool >= 0.40.0

 Makefile.am                  |    2 ++
 autogen.sh                   |    8 ++++----
 configure.in => configure.ac |   23 +++++++++++------------
 3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 36c03fa..8e5d11f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = po src level themes
 
 logodir = $(pkgdatadir)
diff --git a/autogen.sh b/autogen.sh
index 3e6ca01..fd83618 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Atomix"
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -f $srcdir/ChangeLog \
   && test -f $srcdir/src/level.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -14,9 +14,9 @@ PKG_NAME="Atomix"
     exit 1
 }
 
-
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME SVN"
+    echo "You need to install gnome-common package"
     exit 1
 }
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.ac
similarity index 76%
rename from configure.in
rename to configure.ac
index 2173306..9a1f01c 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,20 +1,19 @@
-AC_PREREQ(2.52)
+AC_PREREQ([2.63])
 
-AC_INIT(atomix, 2.14.0, http://bugzilla.gnome.org/enter_bug.cgi?product=atomix)
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+AC_INIT([atomix],[2.14.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_CONFIG_SRCDIR(src/board.c)
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/board.c])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.10 foreign no-dist-gzip dist-bzip2])
 
-AC_ISC_POSIX
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+# Check for programs
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
 AC_PROG_RANLIB
 
-GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
@@ -35,9 +34,9 @@ AC_SUBST(ATOMIX_LIBS)
 
 dnl *******************************
 dnl Internationalization
-dnl ******************************* 
+dnl *******************************
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 GETTEXT_PACKAGE=atomix
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])