[rhythmbox/wip/autogen: 3/4] Use a more standard m4 dir for macros

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 2229dbf2a2b42356199606d4ef25963a43037b99
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Apr 15 22:49:14 2013 +0200

    Use a more standard m4 dir for macros

 Makefile.am         |   4 +-
 configure.ac        |   4 +-
 macros/Makefile.am  |   1 -
 macros/acinclude.m4 |   0
 macros/check.m4     | 133 ----------------------------------------------------
 macros/gsettings.m4 |  83 --------------------------------
 6 files changed, 3 insertions(+), 222 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7be3970..320eaa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
-AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable-scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-SUBDIRS = macros lib metadata rhythmdb widgets sources podcast \
+SUBDIRS = lib metadata rhythmdb widgets sources podcast \
        backends shell bindings sample-plugins plugins remote data po help tests doc
 
 INCLUDES = rhythmbox.h
diff --git a/configure.ac b/configure.ac
index 41b132d..5087673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,10 @@ AC_INIT([rhythmbox],
        [2.99.1],
        [https://bugzilla.gnome.org/enter_bug.cgi?product=rhythmbox])
 AC_CONFIG_SRCDIR(rhythmbox.pc.in)
-AC_CONFIG_MACRO_DIR(macros)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability])
 
-AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")
-
 AM_MAINTAINER_MODE([enable])
 GNOME_MAINTAINER_MODE_DEFINES