[gconf] build: Update to modern m4/ usage

[Colin Walters <walters src gnome org>]

commit d4bd9137469d2f86cf801cbd741c9418d59f58a0
Author: Magdalen Berns <thisMagpie live com>
Date:   Sat Nov 2 19:48:04 2013 +0000

    build: Update to modern m4/ usage
    
    This fixes jhbuild.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711306

 Makefile.am  |    2 ++
 configure.ac |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f85c11..c4b4373 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,8 @@ DISTCLEANFILES =          \
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --enable-defaults-service 
--enable-gsettings-backend --disable-orbit
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 install-data-local:
        -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
        -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
diff --git a/configure.ac b/configure.ac
index 69a57e6..df757bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_PREREQ(2.60)
+AC_CONFIG_MACRO_DIR([m4])
 AC_INIT([GConf],
   [3.2.6],
   [http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],