[gmime] Bumped version to 2.5.4

[Jeffrey Stedfast <fejj src gnome org>]

commit 4f6368ce0a5ef63046891e6d301e440c60992441
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Sun Dec 5 12:33:23 2010 -0500

    Bumped version to 2.5.4
    
    2010-12-05  Jeffrey Stedfast  <fejj novell com>
    
    	* README: Bumped version
    
    	* configure.ac: Bumped version to 2.5.4

 ChangeLog         |    6 ++++++
 Makefile.am       |   31 ++++---------------------------
 README            |    2 +-
 configure.ac      |    2 +-
 tests/Makefile.am |    3 +++
 5 files changed, 15 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b93b5f..b023925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-05  Jeffrey Stedfast  <fejj novell com>
+
+	* README: Bumped version
+
+	* configure.ac: Bumped version to 2.5.4
+
 2010-11-29  Jeffrey Stedfast  <fejj novell com>
 
 	* gmime/internet-address.c (decode_address): Handle edge cases
diff --git a/Makefile.am b/Makefile.am
index 40672a1..f1a658f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,10 @@ endif
 
 SUBDIRS += tools .
 
-DISTCLEANFILES = iconv-detect.h gmime-$(GMIME_API_VERSION).pc
+# build documentation when doing distcheck
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+DISTCLEANFILES = iconv-detect.h gmime-$(GMIME_API_VERSION).pc config.lt doltcompile doltlibtool
 
 EXTRA_DIST = 				\
 	PORTING				\
@@ -42,29 +45,3 @@ dist-hook: $(BUILD_EXTRA_DIST)
 
 gmime-$(GMIME_API_VERSION).pc: gmime.pc
 	-cp gmime.pc gmime-$(GMIME_API_VERSION).pc
-
-# This is a version of the automake-1.7 distcheck rule modified to
-# pass --enable-gtk-doc to ./configure and to not chmod distdir to
-# 0444 so that the gtk-docs can actually build.
-#
-mydistcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
diff --git a/README b/README
index 1589ab6..cc1b7ff 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                            GMime, version 2.5.3
+                            GMime, version 2.5.4
                    by Jeffrey Stedfast <fejj gnome org>
 
 
diff --git a/configure.ac b/configure.ac
index 5ff8b75..678653e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_PREREQ(2.54)
 #
 m4_define([gmime_major_version], [2])
 m4_define([gmime_minor_version], [5])
-m4_define([gmime_micro_version], [3])
+m4_define([gmime_micro_version], [4])
 m4_define([gmime_interface_age], [0])
 m4_define([gmime_binary_age],
           [m4_eval(100 * gmime_minor_version + gmime_micro_version)])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 40341cf..34e81d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -141,3 +141,6 @@ check-local: $(AUTOMATED_TESTS)
 	if [ $${failed} -ne 0 ]; then \
 		echo -e "Failed tests: $${failed_tests}"; \
 	fi
+
+distclean-local: 
+	rm -rf tmp data/streams/input data/streams/output