[gmime] Silenced automake warnings by adding m4 dir

[Jeffrey Stedfast <fejj src gnome org>]

commit e2683648f2b988418a370614dd033a3d0f566798
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Mon Nov 29 22:38:53 2010 -0500

    Silenced automake warnings by adding m4 dir

 Makefile.am    |    4 +++-
 configure.ac   |   19 +++++++++----------
 m4/Makefile.am |    1 +
 3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6062cd4..40672a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = build util gmime src 
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = m4 build util gmime src 
 
 if ENABLE_MONO
 SUBDIRS += mono
diff --git a/configure.ac b/configure.ac
index d6265ce..5ff8b75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,15 +42,19 @@ m4_define([gmime_debug_default],
 AC_INIT(gmime, [gmime_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gmime])
 
-AC_CONFIG_SRCDIR([gmime/gmime.h])
+AC_CONFIG_SRCDIR([README])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([no-define])
-
-# Specify a configuration file
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"])
+dnl m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
 
 
 GMIME_MAJOR_VERSION=gmime_major_version
@@ -84,12 +88,6 @@ AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-AC_CANONICAL_HOST
-
 dnl Check for win32 platforms
 AC_MSG_CHECKING([if building for Win32])
 LIB_EXE_MACHINE_FLAG=X86
@@ -599,6 +597,7 @@ AC_SUBST(GMIME_LIBS)
 
 AC_OUTPUT(
 Makefile
+m4/Makefile
 build/Makefile
 build/vs2008/Makefile
 build/vs2008/config-win32.h
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..af864e3
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.m4)