build: shut up automake warnings

I'm tired of seeing screenfuls of messages like these when using
automake 1.13 (Fedora 19):

configure.ac:2121: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
configure.ac:2121: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
configure.ac:2121: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
daemon/Makefile.am:19: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

seeing as how we MUST use those constructs for the benefit of
automake 1.9 (RHEL 5).  Conversely, RHEL 5 automake complained:

aclocal:configure.ac:36: warning: macro `AM_SILENT_RULES' not found in library

Obviously, I tested this patch on both Fedora 19 and RHEL 5.

* configure.ac (AM_INIT_AUTOMAKE): Avoid obsoletion warnings.
(AM_SILENT_RULES): Avoid unknown macro warning.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/configure.ac b/configure.ac
index 63075559d296746e33a839403a89ca580def97c7..a639f5936a71b0bc3f00aa93f1608b04d894105c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,9 @@ AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-dnl Make automake keep quiet about wildcards & other GNUmake-isms
-AM_INIT_AUTOMAKE([-Wno-portability tar-ustar])
+dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep
+dnl quiet about the fact that we intentionally cater to automake 1.9
+AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar])
 AM_MAINTAINER_MODE([enable])
 
 # Maintainer note - comment this line out if you plan to rerun
@@ -30,9 +31,11 @@ AM_MAINTAINER_MODE([enable])
 # Leave it uncommented for normal releases, for faster ./configure.
 gl_ASSERT_NO_GNULIB_POSIXCHECK
 
-# Use the silent-rules feature when possible.
-m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
-AM_SILENT_RULES([yes])
+# Default to using the silent-rules feature when possible.  Formatting
+# chosen to bypass 'grep' checks that cause older automake to warn.
+# Users (include rpm) can still change the default at configure time.
+m4_ifndef([AM_SILENT_RULES],
+ [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes])
 
 AC_CANONICAL_HOST