[gnome-disk-utility] Update autotools configuration

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

commit d2536a74d133813ce5de4ec595604cefd85ca51d
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Jul 8 16:30:45 2011 +0100

    Update autotools configuration
    
    Do not use deprecated autoconf macros
    Use new libtool syntax
    Use maintainer mode by default

 Makefile.am      |    2 ++
 configure.ac     |   17 ++++++++++-------
 help/Makefile.am |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3cb31c3..4fd5718 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = src data doc help po
 
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 4303c29..64f66f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,14 @@
 AC_INIT([GNOME Disk Utility],[3.0.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility],[gnome-disk-utility])
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
-
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
-AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # libtool versioning - this applies to all libraries in this package
 #
@@ -18,12 +21,13 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+# Check for programs
 AC_PROG_CC
-AC_ISC_POSIX
 AC_HEADER_STDC
-AC_PROG_LIBTOOL
 
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
 
 #### gcc warning flags
 
@@ -106,7 +110,6 @@ fi
 # GNOME
 # *****
 
-GNOME_COMMON_INIT
 GNOME_DOC_INIT
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
diff --git a/help/Makefile.am b/help/Makefile.am
index 1837b38..eddc6d5 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = palimpsest