From b71ae8ce6b97f5bda7ea54f3cfbdef95aa4b79f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 2 Jul 2008 15:27:07 +0000
Subject: [PATCH] GNU Automake 1.10.1, with test suite.

svn path=/nixpkgs/trunk/; revision=12241
---
 .../tools/misc/automake/automake-1.10.x.nix   | 28 ++++++++++++++++---
 .../misc/automake/test-broken-make.patch      | 16 +++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/misc/automake/test-broken-make.patch

diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
index f254d68e2ffd..accc587a4801 100644
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
@@ -1,12 +1,32 @@
 {stdenv, fetchurl, perl, autoconf}:
 
-stdenv.mkDerivation {
-  name = "automake-1.10";
+stdenv.mkDerivation rec {
+  name = "automake-1.10.1";
+
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
+
   src = fetchurl {
-    url = mirror://gnu/automake/automake-1.10.tar.bz2;
-    md5 = "0e2e0f757f9e1e89b66033905860fded";
+    url = "mirror://gnu/automake/${name}.tar.bz2";
+    sha256 = "1v155av3vdsgj9fil66cw2g4vrqanvgn33kwv35xs3ibcyck8smj";
   };
+
+  patches = [ ./test-broken-make.patch ];
+
   buildInputs = [perl autoconf];
+
+  doCheck = true;
+
+  meta = {
+    homepage = http://www.gnu.org/software/automake/;
+    description = "GNU Automake, a GNU standard-compliant makefile generator";
+
+    longDescription = ''
+      GNU Automake is a tool for automatically generating
+      `Makefile.in' files compliant with the GNU Coding
+      Standards.  Automake requires the use of Autoconf.
+    '';
+
+    license = "GPLv2+";
+  };
 }
diff --git a/pkgs/development/tools/misc/automake/test-broken-make.patch b/pkgs/development/tools/misc/automake/test-broken-make.patch
new file mode 100644
index 000000000000..b10754fe0d2b
--- /dev/null
+++ b/pkgs/development/tools/misc/automake/test-broken-make.patch
@@ -0,0 +1,16 @@
+The version of GNU Make in Nixpkgs is "broken" in the sense that it
+produces additional output, making `AM_MAKE_INCLUDE' (tested by `make.test')
+fail.  Thus, we just disable `make.test' for now.
+
+See http://article.gmane.org/gmane.comp.sysutils.automake.bugs/4234 .
+
+--- automake-1.10/tests/Makefile.in	2006-10-15 19:25:25.000000000 +0200
++++ automake-1.10/tests/Makefile.in	2008-07-02 16:40:35.000000000 +0200
+@@ -482,7 +482,6 @@ ltdeps.test \
+ ltlibobjs.test \
+ ltlibsrc.test \
+ maintclean.test \
+-make.test \
+ makej.test \
+ makevars.test \
+ man.test \