From 80fee739e29faf7e85d4fba50bb95f0f40d2163a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 15 Oct 2010 12:09:10 +0000
Subject: [PATCH] GNU Automake: Default to 1.11.x.

svn path=/nixpkgs/trunk/; revision=24299
---
 pkgs/top-level/all-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08f65171d914..dc959e8e7b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2260,7 +2260,7 @@ let
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
 
-  automake = automake110x;
+  automake = automake111x;
 
   automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { };
 
@@ -4262,7 +4262,11 @@ let
     inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa
       xkeyboard_config dbus hal libuuid openssl gperf m4
-      automake autoconf libtool xmlto asciidoc udev;
+      autoconf libtool xmlto asciidoc udev;
+
+    # XXX: Update to newer Automake on the next big rebuild; better yet:
+    # remove the dependency on Automake.
+    automake = automake110x;
 
     # !!! pythonBase is used instead of python because this causes an
     # infinite recursion when the flag python.full is set to true.