Move the fix for the Autoconf underquoting bug from Pkg-config to Autoconf.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9392 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -39,6 +39,11 @@
     <listitem>
       <para>2010-09-22</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Following r9370, fix the Autoconf underquoting bug in
+          Autoconf itself, rather than just the one affected LFS package,
+          Pkg-config.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Linux-2.6.35.5. Fixes
           <ulink url="&lfs-ticket-root;2761">#2761</ulink>.</para>

chapter06/autoconf.xml

@@ -41,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
 
+    <para>Fix an underquoting bug in Autoconf that causes the regeneration of
+    configuration scripts of some packages outside of LFS to fail:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/])m4_defun/[]&amp;/' lib/m4sugar/m4sugar.m4</userinput></screen>
+
     <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

chapter06/pkg-config.xml

@@ -42,12 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Pkg-config</title>
 
-    <para>First fix a problem with underquoting that shows up in later versions of 
-    <command>autoconf</command>:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/XT])dnl/XT])[]dnl/' \
-       -e 's/\.])dnl/\.])[]dnl/' pkg.m4</userinput></screen>
-
     <para>Prepare Pkg-config for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>