[gnome-js-common] Modernize autotools configuration

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

commit aa40e5b0bdb845a99ea51864d0537f76faa3d450
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Apr 1 02:51:23 2010 +0200

    Modernize autotools configuration
    
    New requirements:
    automake >= 1.10
    libtool >= 2.2

 Makefile.am  |    2 ++
 autogen.sh   |    4 +---
 configure.ac |   28 +++++++++++++++-------------
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bb25f7e..5c27c30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = po modules tests
 
 gnome_js_commondocdir = ${prefix}/share/doc/gnome_js_common
diff --git a/autogen.sh b/autogen.sh
index 01d227d..3ade9c4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,11 +13,9 @@ PKG_NAME="gnome-js-common"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME SVN and make"
+    echo "You need to install gnome-common 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.4
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 4cb0a25..fbb574b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,19 @@
-AC_INIT(gnome-js-common, 0.1.1)
+AC_INIT([gnome-js-common],[0.1.1])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
+AC_CONFIG_MACRO_DIR([m4])
 
-AC_ISC_POSIX
+AM_INIT_AUTOMAKE([1.10])
+AM_MAINTAINER_MODE([enable])
+
+# Check for programs
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
 AM_PROG_CC_C_O
 
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
 dnl ***************************************************************************
 dnl Internationalization
 dnl ***************************************************************************
@@ -18,13 +22,11 @@ GETTEXT_PACKAGE=gnome_js_common
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.4])
 
-AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(seed,
-	AC_HELP_STRING([--enable-seed],
-	[enable building and testing of Seed. [default=yes]]),
+	AS_HELP_STRING([--enable-seed],[enable building and testing of Seed. [default=yes]]),
 	[want_seed=$enableval],[want_seed="yes"])
 
 if test x"$want_seed" == x"yes" ; then
@@ -40,8 +42,7 @@ else
 fi
 
 AC_ARG_ENABLE(gjs,
-	AC_HELP_STRING([--enable-gjs],
-	[enable building and testing of gjs. [default=yes]]),
+	AS_HELP_STRING([--enable-gjs],[enable building and testing of gjs. [default=yes]]),
 	[want_gjs=$enableval],[want_gjs="yes"])
 
 if test x"$want_gjs" == x"yes" ; then
@@ -62,7 +63,7 @@ AM_CONDITIONAL(HAVE_GJS, test "x$have_gjs" = "xyes")
 AC_SUBST(HAVE_SEED)
 AC_SUBST(HAVE_GJS)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 modules/Makefile
@@ -70,6 +71,7 @@ modules/tweener/Makefile
 tests/Makefile
 gnome-js-common.pc
 ])
+AC_OUTPUT
 
 echo "
 Tests: