[gtk-doc] Update autotools config a bit

[Stefan Kost <stefkost src gnome org>]

commit 5314a46030a31c35e2a906c9576f973f105f77a5
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Jun 16 18:19:31 2011 +0100

    Update autotools config a bit
    
    Use new libtool syntax
    Use aux directory to store generated files

 autogen.sh              |    2 ++
 configure.ac            |   11 +++++++----
 help/manual/Makefile.am |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 23de3f3..46c2137 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,8 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+mkdir -p build-aux
+
 if gnome-doc-prepare --version < /dev/null > /dev/null 2>&1; then
   echo "* Running gnome-doc-prepare"
   gnome-doc-prepare --copy --force --automake
diff --git a/configure.ac b/configure.ac
index 8cc240e..078d522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.58)
+AC_PREREQ([2.63])
 
 dnl Use a simple 2-digit version number for a while, since our old example
 dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9.
@@ -7,10 +7,11 @@ dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit
 dnl number for the development version
 m4_define(gtk_doc_version, 1.17.1)
 
-AC_INIT([gtk-doc], [gtk_doc_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc])
+AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([gtkdoc-common.pl.in])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([check-news std-options -Wno-portability])
 AM_MAINTAINER_MODE([enable])
@@ -25,9 +26,11 @@ dnl gnome-doc-utils is not found but does not invalidate the build.
 GNOME_DOC_INIT([],[],enable_scrollkeeper=no)
 
 # Check for programs
-AC_ISC_POSIX
 AC_PROG_CC
-AC_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
 
 dnl Make sure we have pkg-config >= 0.19, so installing in $(datadir) is OK.
 PKG_PROG_PKG_CONFIG([0.19])
diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am
index bbe7054..7deb0b5 100644
--- a/help/manual/Makefile.am
+++ b/help/manual/Makefile.am
@@ -1,5 +1,5 @@
 if HAVE_GNOME_DOC_UTILS
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 else
 dist-hook: