[devhelp] Update autotools configuration

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

commit 763fab7ab6aaf0e7c542051d0fe9026ab08fe8b8
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Sep 20 01:06:46 2010 +0200

    Update autotools configuration
    
    New requirements:
    autoconf >= 2.64
    automake >= 1.10
    libtool >= 2.26

 Makefile.am  |    2 ++
 autogen.sh   |    4 +---
 configure.ac |   27 +++++++++++++++++++--------
 3 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 781dc84..7807d9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = po src data misc contrib
 
 EXTRA_DIST =			\
diff --git a/autogen.sh b/autogen.sh
index 8bb2ad0..dc0b430 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-test -e $srcdir/ChangeLog || touch $srcdir/ChangeLog
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.9 REQUIRED_MACROS=python.m4 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index dd65e58..2f9a30a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,9 @@
-AC_PREREQ(2.60)
-AC_INIT([Devhelp],[2.90.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp],[devhelp])
+AC_PREREQ([2.64])
+AC_INIT([Devhelp],
+        [2.90.6],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp],
+        [devhelp],
+        [http://live.gnome.org/devhelp])
 
 # LT Version numbers, remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
@@ -16,24 +20,28 @@ AC_SUBST(LIBDEVHELP_REVISION)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/dh-main.c)
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define -Wall])
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+
+AM_INIT_AUTOMAKE([1.11 foreign no-define -Wall])
 
 # 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])
 
+# Check for programs
 AC_PROG_CC
 AC_PROG_CPP
 AM_PROG_CC_C_O
 
-IT_PROG_INTLTOOL([0.40.0])
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
 
 PKG_PROG_PKG_CONFIG
 AM_GCONF_SOURCE_2
-GNOME_COMPILE_WARNINGS
+
+GNOME_COMPILE_WARNINGS([maximum])
 
 dnl -----------------------------------------------------------
 dnl Platform (GTK+ X11 or GTK OS X)
@@ -98,6 +106,9 @@ AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LDFLAGS)
 AC_SUBST(ZLIB_LIBS)
 
+# i18n stuff
+IT_PROG_INTLTOOL([0.40.0])
+
 GETTEXT_PACKAGE=devhelp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name for gettext])