Update autotools configuration

New requirements:
automake >= 1.11
autoconf >= 2.63
libtool >= 2.2.6
gtk-doc >= 1.13
intltool >= 0.41

2 files changed, 38 insertions, 31 deletions

diff --git a/autogen.sh b/autogen.sh
index 0cc89c3e..7b831d67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,16 +6,13 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME=Yelp
 
-REQUIRED_AUTOMAKE_VERSION=1.9
-export REQUIRED_AUTOMAKE_VERSION
-
 if ! test -f $srcdir/src/yelp.c; then
   echo "**Error**: Directory '$srcdir' does not look like the yelp source directory"
   exit 1
 fi
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from Gnome CVS"
+    echo "You need to install gnome-common package"
     exit 1
 }
 
diff --git a/configure.in b/configure.in
index f7ededd3..b9f5a8d6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,31 +1,52 @@
+AC_PREREQ([2.63])
 AC_INIT([Yelp],[2.31.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
 
 AC_CONFIG_SRCDIR([src/yelp.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
-AC_PROG_LN_S
+AM_SILENT_RULES([yes])
+
+# Check for programs
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_ISC_POSIX
-AC_HEADER_STDC
-AM_PROG_LIBTOOL
+AC_PROG_CC_C_O
+AC_PROG_LN_S
+
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT
+
+AC_PATH_PROGS(SED, gsed sed)
+
 AM_PATH_GLIB_2_0
-AM_PROG_CC_C_O
+GLIB_GSETTINGS
 
-IT_PROG_INTLTOOL([0.35.0])
+# Library dependecies
+PKG_CHECK_MODULES(YELP,
+[
+	gio-2.0 >= 2.25.3
+	gio-unix-2.0
+	gtk+-unix-print-2.0
+	gtk+-2.0 >= 2.16.0
+	libxml-2.0 >= 2.6.5
+	libxslt >= 1.1.4
+	libexslt >= 0.8.1
+	dbus-glib-1
+	webkit-1.0 >= 1.1.15
+	yelp-xsl
+])
+AC_SUBST([YELP_CFLAGS])
+AC_SUBST([YELP_LIBS])
 
-GTK_DOC_CHECK(1.9)
 
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
 MORE_WARN_FLAGS=
-DEPRECATION_FLAGS=
 
 if test "x$enable_debug" = "xyes"; then
 	AC_DEFINE([YELP_DEBUG],[1],[Enable Yelp debugging])
@@ -38,6 +59,9 @@ if test "x$GCC" = "xyes"; then
    AM_CFLAGS="$AM_CFLAGS -Wall -Wno-uninitialized -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare"
 fi
 
+# i18n stuff
+IT_PROG_INTLTOOL([0.41.0])
+
 GETTEXT_PACKAGE=yelp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
@@ -46,19 +70,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
 
-PKG_CHECK_MODULES(YELP,
-[
-	gio-2.0 >= 2.25.3
-	gio-unix-2.0
-	gtk+-unix-print-2.0
-	gtk+-2.0 >= 2.16.0
-	libxml-2.0 >= 2.6.5
-	libxslt >= 1.1.4
-	libexslt >= 0.8.1
-	dbus-glib-1
-	webkit-1.0 >= 1.1.15
-	yelp-xsl
-])
 
 AC_ARG_ENABLE(lzma,
 	AS_HELP_STRING([--enable-lzma],[Enable lzma decoder support [[default=yes]]]),
@@ -109,9 +120,6 @@ DATADIR=`(
 )`
 AC_SUBST([DATADIR])
 
-AC_PATH_PROGS(SED, gsed sed)
-
-GLIB_GSETTINGS
 
 XSL_PATH="`$PKG_CONFIG --variable=xsltdir yelp-xsl`"
 XSL_DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
@@ -207,6 +215,8 @@ AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
+GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
+
 AC_CONFIG_FILES([
 Makefile
 docs/Makefile