4 files changed, 11 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
index 550cca2..945ac0c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,6 +14,7 @@ elisp-comp
 install-sh
 libtool
 ltmain.sh
+m4
 missing
 mkinstalldirs
 stamp-h1
diff --git a/ChangeLog b/ChangeLog
index 7936fce..ae8bc09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-21  Vincent Untz  <vuntz@gnome.org>
+
+	* configure.in: use AM_SILENT_RULES if available for a quiet build
+	* configure.in:
+	* Makefile.am: use the m4 directory as macro dir
+
 2009-01-10  Vincent Untz  <vuntz@gnome.org>
 
 	* src/validate.c: (desktop_file_fixup): add "warning" to the error
diff --git a/Makefile.am b/Makefile.am
index d30dffc..695e0fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = src misc
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index 5de73be..e700809 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,8 @@ AC_INIT([desktop-file-utils], [0.16],
 AC_CONFIG_SRCDIR(src/validate.h)
 
 AM_INIT_AUTOMAKE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(config.h)
 
 # Honor aclocal flags