From ec66ac7412cb3dcf48bb0c9a41e3341f65536ee5 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 23 May 2009 09:20:07 +0000
Subject: Upgrade to Automake-1.11. Fixes #2400.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8896 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 4 ----
 chapter03/patches.xml   | 8 --------
 chapter06/automake.xml  | 4 ----
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d7207bb9a..7d13af58e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2009-05-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Automake-1.11.  Fixes
+          <ulink url="&lfs-ticket-root;2400">#2400</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add GDBM as a pre-requisite for Man-DB.  Fixes
           <ulink url="&lfs-ticket-root;2298">#2298</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 38e848a77..c3db51635 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -211,10 +211,6 @@
   <itemizedlist>
     <title>Added:</title>
 
-    <listitem>
-      <para>&automake-test-patch;</para>
-    </listitem>
-
     <listitem>
       <para>&coreutils-i18n-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 78e9bc5b1..99b026d81 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,14 +18,6 @@
 
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Automake Test Fix Patch - <token>&automake-test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
-        <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Berkeley DB Upstream Fixes Patch - <token>&db-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 8147bc6c6..4d50b9637 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
-    <para>Fix a bug in the testsuite that can lead to a spurious failure:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen>
-
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 3506eda48..0c0262fea 100644
--- a/packages.ent
+++ b/packages.ent
@@ -15,10 +15,10 @@
 <!ENTITY autoconf-ch6-du "14.3 MB testsuite included">
 <!ENTITY autoconf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY automake-version "1.10.2">
-<!ENTITY automake-size "914 KB">
+<!ENTITY automake-version "1.11">
+<!ENTITY automake-size "1,034 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
-<!ENTITY automake-md5 "1498208ab1c8393dcbd9afb7d06df6d5">
+<!ENTITY automake-md5 "4db4efe027e26b33930a7e151de19d0f">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "7.9 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 4e65dad1a..677f85480 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,11 +2,6 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
-<!ENTITY automake-test-patch-md5 "58f56fad6fbbcbc3b193761487d8e573">
-<!ENTITY automake-test-patch-size "1.2 KB">
-
-
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-2.patch">
 <!ENTITY bash-fixes-patch-md5 "f6f17b7a3d637d14e238da58a5379b42">
 <!ENTITY bash-fixes-patch-size "34 KB">
-- 
cgit v1.2.3-54-g00ecf