[dconf] Modernise autotools config a bit

[Ryan Lortie <ryanl src gnome org>]

commit 669ffcd4ae088adba682faa199890ee33640b8ce
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 21 05:53:40 2010 +0200

    Modernise autotools config a bit
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=622257

 Makefile.am   |    2 ++
 configure.ac  |   34 ++++++++++++++++++++++++++--------
 m4/.gitignore |    6 ++++++
 3 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1677ded..2a56d9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = gvdb service gsettings tests client bin engine common docs editor
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index f4633a4..f9432fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,29 @@
-AC_INIT(dconf, 0.4.1)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES(yes)
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
-AC_PROG_LIBTOOL
-AM_PROG_VALAC
-GTK_DOC_CHECK
+AC_INIT([dconf],
+        [0.4.1],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=dconf],
+        [dconf])
+
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11 -Wno-portability])
+AM_SILENT_RULES([yes])
+
+# Check for programs
 AC_PROG_CC
+AM_PROG_VALAC([0.8])
+
+# Initialise libtool
+LT_PREREQ([2.2.6])
+LT_INIT
+
+# Introspection
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+# Gtk-doc support
+GTK_DOC_CHECK([1.14])
 
+# Dependencies
 PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.7)
 PKG_CHECK_MODULES(gtk, gtk+-2.0)
 PKG_CHECK_MODULES(gee, gee-1.0)
@@ -25,7 +42,7 @@ AC_SUBST(dconfincludedir, ${includedir}/dconf)
 
 AC_PATH_PROG(gio_QUERYMODULES, gio-querymodules, no)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
   common/Makefile
   gvdb/Makefile
   engine/Makefile
@@ -39,3 +56,4 @@ AC_OUTPUT([
   docs/Makefile
   Makefile
 ])
+AC_OUTPUT
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..2f6fdcf
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,6 @@
+gtk-doc.m4
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4