Billy's libtool conversion.

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

7 files changed, 58 insertions, 16 deletions

diff --git a/appendixa/libtool-dep.xml b/appendixa/libtool-dep.xml
index 9b1decbab..a6716ebf2 100644
--- a/appendixa/libtool-dep.xml
+++ b/appendixa/libtool-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Libtool Installation Dependencies</title>
 
diff --git a/appendixa/libtool-desc.xml b/appendixa/libtool-desc.xml
index a64ef9c15..ec8bca3bf 100644
--- a/appendixa/libtool-desc.xml
+++ b/appendixa/libtool-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Libtool</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &libtool-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>libtool and libtoolize</para></sect3>
+<para>Last checked against version &libtool-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>libtool</title>
 <para>libtool provides generalized library-building
@@ -17,11 +16,7 @@ package.</para></sect4>
 
 </sect3>
 
-<sect3><title>Library Files</title>
-<para>libltdl.a, libltdl.so (link to libltdl.so.3.1.0), libltdl.so.3
-(link to libltdl.so.3.1.0) and libltdl.so.3.1.0</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
 
 <sect4><title>libltdl, libltdl.so.3, libltdl.so.3.1.0</title>
 <para>A small library that aims at hiding, from programmers,
diff --git a/appendixa/libtool-shortdesc.xml b/appendixa/libtool-shortdesc.xml
new file mode 100644
index 000000000..64e57c823
--- /dev/null
+++ b/appendixa/libtool-shortdesc.xml
@@ -0,0 +1,19 @@
+<sect2><title>Contents of Libtool</title>
+
+<para>Last checked against version &libtool-contversion;.</para>
+
+<para>GNU libtool is a generic library support script. Libtool hides
+  the complexity of using shared libraries behind a consistent,
+  portable interface.</para>
+
+<para>Libtool installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>libtool and libtoolize</para></sect3>
+
+<sect3><title>Library Files</title>
+<para>libltdl.a, libltdl.so (link to libltdl.so.3.1.0), libltdl.so.3
+(link to libltdl.so.3.1.0) and libltdl.so.3.1.0</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/libtool.xml b/appendixa/libtool.xml
index 633f79f59..434d24433 100644
--- a/appendixa/libtool.xml
+++ b/appendixa/libtool.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="libtool.html" dir="appendixa"?>
 
 &aa-libtool-down;
+&aa-libtool-shortdesc;
 &aa-libtool-desc;
 &aa-libtool-dep;
 
diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml
index 8e5774a28..ec3476566 100644
--- a/chapter06/libtool-inst.xml
+++ b/chapter06/libtool-inst.xml
@@ -1,11 +1,35 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Libtool</title>
 
-<para>Install Libtool by running the following commands:</para>
+<para>This package requires its patch to be applied before you can
+  install it. Issue the following command to apply the patch:</para>
+
+<para><screen><userinput>
+patch -Np1 -i ../libtool-&libtool-patch-version;.patch &amp;&amp;      
+</userinput></screen></para>
+
+<para>Prepare Libtool to be compiled:</para>
+
+<para><screen><userinput>
+./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../libtool-&libtool-patch-version;.patch</userinput>: 
+This patch fixes an incompatibility between Autoconf 2.53 and Libtool 1.4.x.
+Specifically, the deprecated m4 macro AC_PROVIDE_AC_LIBTOOL is replaced by
+AC_PROVIDE_ELSEIF.</para>
+</sect2>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 92dcd7f0e..a7dfbbf50 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &libtool-time;
 Estimated required disk space:  &libtool-compsize;</screen>
 
-&c6-libtool-inst;
-&aa-libtool-desc;
+&aa-libtool-shortdesc;
 &aa-libtool-dep;
+&c6-libtool-inst;
 
 </sect1>
diff --git a/entities/libtool.ent b/entities/libtool.ent
index f26db57f1..0d9de764d 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -5,6 +5,7 @@
 <!ENTITY c6-libtool-exp SYSTEM "../chapter06/libtool-exp.xml">
 
 <!ENTITY aa-libtool SYSTEM "../appendixa/libtool.xml">
+<!ENTITY aa-libtool-shortdesc SYSTEM "../appendixa/libtool-shortdesc.xml">
 <!ENTITY aa-libtool-desc SYSTEM "../appendixa/libtool-desc.xml">
 <!ENTITY aa-libtool-dep SYSTEM "../appendixa/libtool-dep.xml">
 <!ENTITY aa-libtool-down SYSTEM "../appendixa/libtool-down.xml">