1- <!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.204 2004/09/23 00:30:13 neilc Exp $ -->
1+ <!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.205 2004/10/01 02: 00:43 neilc Exp $ -->
22
33<chapter id="installation">
44 <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -137,11 +137,12 @@ su - postgres
137137 <itemizedlist>
138138 <listitem>
139139 <para>
140- To build the server programming language PL/Perl you need a full
140+ To build the server programming language
141+ <application>PL/Perl</application> you need a full
141142 <productname>Perl</productname> installation, including the
142143 <filename>libperl</filename> library and the header files.
143- Since PL/Perl will be a shared library, the
144- <indexterm><primary>libperl</primary></indexterm>
144+ Since<application> PL/Perl</application> will be a shared
145+ library, the <indexterm><primary>libperl</primary></indexterm>
145146 <filename>libperl</filename> library must be a shared library
146147 also on most platforms. This appears to be the default in
147148 recent <productname>Perl</productname> versions, but it was not
@@ -158,28 +159,30 @@ su - postgres
158159*** the documentation for details.
159160</screen>
160161 (If you don't follow the on-screen output you will merely notice
161- that the PL/Perl library object, <filename>plperl.so</filename>
162- or similar, will not be installed.) If you see this, you will
163- have to rebuild and install <productname>Perl</productname>
164- manually to be able to build PL/Perl. During the configuration
165- process for <productname>Perl</productname>, request a shared
166- library.
162+ that the <application>PL/Perl</application> library object,
163+ <filename>plperl.so</filename> or similar, will not be
164+ installed.) If you see this, you will have to rebuild and
165+ install <productname>Perl</productname> manually to be able to
166+ build <application>PL/Perl</application>. During the
167+ configuration process for <productname>Perl</productname>,
168+ request a shared library.
167169 </para>
168170 </listitem>
169171
170172 <listitem>
171173 <para>
172- To build the PL/Python server programming language, you need a
173- <productname>Python</productname> installation with the header
174- files and the distutils module. The distutils module is
175- included by default with <productname>Python</productname> 1.6
176- and later; users of earlier versions of
177- <productname>Python</productname> will need to install it.
174+ To build the <application>PL/Python</> server programming
175+ language, you need a <productname>Python</productname>
176+ installation with the header files and the distutils module.
177+ The distutils module is included by default with
178+ <productname>Python</productname> 1.6 and later; users of
179+ earlier versions of <productname>Python</productname> will need
180+ to install it.
178181 </para>
179182
180183 <para>
181- Since PL/Python will be a shared library, the
182- <indexterm><primary>libpython</primary></indexterm>
184+ Since<application> PL/Python</application> will be a shared
185+ library, the <indexterm><primary>libpython</primary></indexterm>
183186 <filename>libpython</filename> library must be a shared library
184187 also on most platforms. This is not the case in a default
185188 <productname>Python</productname> installation. If after
@@ -209,8 +212,8 @@ su - postgres
209212
210213 <listitem>
211214 <para>
212- If you want to buildTcl or Tk components (clients and the
213- PL/Tcl language) you of course need a Tcl installation.
215+ If you want to build the <application>PL/Tcl</application>
216+ procedural language, you of course need a Tcl installation.
214217 </para>
215218 </listitem>
216219
@@ -723,7 +726,7 @@ su - postgres
723726 <term><option>--with-perl</option></term>
724727 <listitem>
725728 <para>
726- Build the PL/Perl server-side language.
729+ Build the<application> PL/Perl</> server-side language.
727730 </para>
728731 </listitem>
729732 </varlistentry>
@@ -732,7 +735,7 @@ su - postgres
732735 <term><option>--with-python</option></term>
733736 <listitem>
734737 <para>
735- Build the PL/Python server-side language.
738+ Build the<application> PL/Python</> server-side language.
736739 </para>
737740 </listitem>
738741 </varlistentry>
@@ -741,36 +744,21 @@ su - postgres
741744 <term><option>--with-tcl</option></term>
742745 <listitem>
743746 <para>
744- Build <application>PL/Tcl</>, which requires Tcl/Tk
745- <option>--without-tk</>.
746- </para>
747- </listitem>
748- </varlistentry>
749-
750- <varlistentry>
751- <term><option>--without-tk</option></term>
752- <listitem>
753- <para>
754- If you specify <option>--with-tcl</> and this option, then
755- the program that requires <productname>Tk</>
756- (<application>pgtksh</>) will be
757- excluded.
747+ Build the <application>PL/Tcl</> server-side language.
758748 </para>
759749 </listitem>
760750 </varlistentry>
761751
762752 <varlistentry>
763753 <term><option>--with-tclconfig=<replaceable>DIRECTORY</replaceable></option></term>
764- <term><option>--with-tkconfig=<replaceable>DIRECTORY</replaceable></option></term>
765754 <listitem>
766755 <para>
767- Tcl/Tk installs the files <filename>tclConfig.sh</filename> and
768- <filename>tkConfig.sh</filename>, which contain
769- configuration information needed to build modules
770- interfacing to Tcl or Tk. These files are normally found
771- automatically at their well-known locations, but if you want to
772- use a different version of Tcl or Tk you can specify the
773- directory in which to find them.
756+ Tcl installs the file <filename>tclConfig.sh</filename>, which
757+ contains configuration information needed to build modules
758+ interfacing to Tcl. This file is normally found automatically
759+ at a well-known location, but if you want to use a different
760+ version of Tcl you can specify the directory in which to look
761+ for it.
774762 </para>
775763 </listitem>
776764 </varlistentry>