[nautilus/rendering-cleanup: 1/15] [build] Set automake flags

[Christian Persch <chpe src gnome org>]

commit 724620599b6152d9f71004b3a59a7ef606fb6461
Author: Christian Persch <chpe gnome org>
Date:   Thu Apr 23 15:11:04 2009 +0200

    [build] Set automake flags
    
    Need to set ACLOCAL_AMFLAGS in toplevel Makefile.am when using
    AC_CONFIG_MACRO_DIR.

 Makefile.am  |    2 ++
 configure.in |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0ccb518..daf73b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,8 @@ DISTCLEANFILES = \
   intltool-merge \
   intltool-update
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index 3703ce4..261c0f1 100644
--- a/configure.in
+++ b/configure.in
@@ -27,10 +27,9 @@ AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
-AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
 
 AC_SUBST(GLIB_REQUIRED, [glib_minver])
 AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
@@ -53,7 +52,8 @@ AC_PROG_MAKE_SET
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+PKG_PROG_PKG_CONFIG
 
 AC_CHECK_LIB(m, floor)