Remove more traces of libpgtcl from the source tree. Also, make some

semi-related SGML cleanup. Original patch from ljb220@mindspring.com, additional cleanup by Neil Conway.
postgres-x2 · Oct 1, 2004 · 3738510 · 3738510
1 parent d2af5f8
commit 3738510
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 149 deletions.
diff --git a/README b/README
@@ -7,12 +7,11 @@ database management system.
 PostgreSQL is an advanced object-relational database management system
 that supports an extended subset of the SQL standard, including
 transactions, foreign keys, subqueries, triggers, user-defined types
-and functions.  This distribution also contains several language
-bindings, including C and Tcl.
+and functions.  This distribution also contains C language bindings.
 
-The JDBC, ODBC, C++, and Python interfaces have been moved to the PostgreSQL
-Projects Web Site at http://gborg.postgresql.org for separate maintenance.
-A Perl DBI/DBD driver is available from CPAN.
+The JDBC, ODBC, C++, Python, and Tcl interfaces have been moved to the
+PostgreSQL Projects Web Site at http://gborg.postgresql.org for separate
+maintenance.  A Perl DBI/DBD driver is available from CPAN.
 
 See the file INSTALL for instructions on how to build and install
 PostgreSQL.  That file also lists supported operating systems and

diff --git a/configure b/configure
@@ -859,7 +859,7 @@ Optional Packages:
   --with-libraries=DIRS   look for additional libraries in DIRS
   --with-libs=DIRS        alternative spelling of --with-libraries
   --with-pgport=PORTNUM   change default port number 5432
-  --with-tcl              build Tcl and Tk interfaces
+  --with-tcl              build Tcl modules (PL/Tcl)
   --with-tclconfig=DIR    tclConfig.sh is in DIR
   --with-perl             build Perl modules (PL/Perl)
   --with-python           build Python modules (PL/Python)
@@ -2995,7 +2995,7 @@ echo "${ECHO_T}$enable_thread_safety" >&6
 
 
 #
-# Tcl/Tk
+# Optionally build Tcl modules (PL/Tcl)
 #
 echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
 echo $ECHO_N "checking whether to build with Tcl... $ECHO_C" >&6

diff --git a/configure.in b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.378 2004/09/27 02:17:14 pgsql Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.379 2004/10/01 02:00:41 neilc Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -371,10 +371,10 @@ AC_MSG_RESULT([$enable_thread_safety])
 AC_SUBST(enable_thread_safety)
 
 #
-# Tcl/Tk
+# Optionally build Tcl modules (PL/Tcl)
 #
 AC_MSG_CHECKING([whether to build with Tcl])
-PGAC_ARG_BOOL(with, tcl, no, [  --with-tcl              build Tcl and Tk interfaces])
+PGAC_ARG_BOOL(with, tcl, no, [  --with-tcl              build Tcl modules (PL/Tcl)])
 AC_MSG_RESULT([$with_tcl])
 AC_SUBST([with_tcl])
 

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.204 2004/09/23 00:30:13 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.205 2004/10/01 02:00:43 neilc Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -137,11 +137,12 @@ su - postgres
    <itemizedlist>
     <listitem>
      <para>
-      To build the server programming language PL/Perl you need a full
+      To build the server programming language
+      <application>PL/Perl</application> you need a full
       <productname>Perl</productname> installation, including the
       <filename>libperl</filename> library and the header files.
-      Since PL/Perl will be a shared library, the
-      <indexterm><primary>libperl</primary></indexterm>
+      Since <application>PL/Perl</application> will be a shared
+      library, the <indexterm><primary>libperl</primary></indexterm>
       <filename>libperl</filename> library must be a shared library
       also on most platforms.  This appears to be the default in
       recent <productname>Perl</productname> versions, but it was not
@@ -158,28 +159,30 @@ su - postgres
 *** the documentation for details.
 </screen>
       (If you don't follow the on-screen output you will merely notice
-      that the PL/Perl library object, <filename>plperl.so</filename>
-      or similar, will not be installed.)  If you see this, you will
-      have to rebuild and install <productname>Perl</productname>
-      manually to be able to build PL/Perl.  During the configuration
-      process for <productname>Perl</productname>, request a shared
-      library.
+      that the <application>PL/Perl</application> library object,
+      <filename>plperl.so</filename> or similar, will not be
+      installed.)  If you see this, you will have to rebuild and
+      install <productname>Perl</productname> manually to be able to
+      build <application>PL/Perl</application>.  During the
+      configuration process for <productname>Perl</productname>,
+      request a shared library.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      To build the PL/Python server programming language, you need a
-      <productname>Python</productname> installation with the header
-      files and the distutils module.  The distutils module is
-      included by default with <productname>Python</productname> 1.6
-      and later; users of earlier versions of
-      <productname>Python</productname> will need to install it.
+      To build the <application>PL/Python</> server programming
+      language, you need a <productname>Python</productname>
+      installation with the header files and the distutils module.
+      The distutils module is included by default with
+      <productname>Python</productname> 1.6 and later; users of
+      earlier versions of <productname>Python</productname> will need
+      to install it.
      </para>
 
      <para>
-      Since PL/Python will be a shared library, the
-      <indexterm><primary>libpython</primary></indexterm>
+      Since <application>PL/Python</application> will be a shared
+      library, the <indexterm><primary>libpython</primary></indexterm>
       <filename>libpython</filename> library must be a shared library
       also on most platforms.  This is not the case in a default
       <productname>Python</productname> installation.  If after
@@ -209,8 +212,8 @@ su - postgres
 
     <listitem>
      <para>
-      If you want to build Tcl or Tk components (clients and the
-      PL/Tcl language) you of course need a Tcl installation.
+      If you want to build the <application>PL/Tcl</application>
+      procedural language, you of course need a Tcl installation.
      </para>
     </listitem>
 
@@ -723,7 +726,7 @@ su - postgres
        <term><option>--with-perl</option></term>
        <listitem>
         <para>
-         Build the PL/Perl server-side language.
+         Build the <application>PL/Perl</> server-side language.
         </para>
        </listitem>
       </varlistentry>
@@ -732,7 +735,7 @@ su - postgres
        <term><option>--with-python</option></term>
        <listitem>
         <para>
-         Build the PL/Python server-side language.
+         Build the <application>PL/Python</> server-side language.
         </para>
        </listitem>
       </varlistentry>
@@ -741,36 +744,21 @@ su - postgres
        <term><option>--with-tcl</option></term>
        <listitem>
         <para>
-         Build <application>PL/Tcl</>, which requires Tcl/Tk
-         <option>--without-tk</>.
-        </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>--without-tk</option></term>
-       <listitem>
-        <para>
-         If you specify <option>--with-tcl</> and this option, then
-         the program that requires <productname>Tk</>
-         (<application>pgtksh</>) will be
-         excluded.
+         Build the <application>PL/Tcl</> server-side language.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
        <term><option>--with-tclconfig=<replaceable>DIRECTORY</replaceable></option></term>
-       <term><option>--with-tkconfig=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
-         Tcl/Tk installs the files <filename>tclConfig.sh</filename> and
-         <filename>tkConfig.sh</filename>, which contain
-         configuration information needed to build modules
-         interfacing to Tcl or Tk. These files are normally found
-         automatically at their well-known locations, but if you want to
-         use a different version of Tcl or Tk you can specify the
-         directory in which to find them.
+         Tcl installs the file <filename>tclConfig.sh</filename>, which
+         contains configuration information needed to build modules
+         interfacing to Tcl. This file is normally found automatically
+         at a well-known location, but if you want to use a different
+         version of Tcl you can specify the directory in which to look
+         for it.
         </para>
        </listitem>
       </varlistentry>

diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.61 2004/09/20 22:48:29 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.62 2004/10/01 02:00:44 neilc Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
@@ -402,7 +402,8 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
   </para>
 
   <para>
-   Increment an integer, making use of an argument name, in PL/PgSQL:
+   Increment an integer, making use of an argument name, in
+   <application>PL/pgSQL</application>:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION increment(i integer) RETURNS integer AS '

diff --git a/doc/src/sgml/ref/pgtclsh.sgml b/doc/src/sgml/ref/pgtclsh.sgml
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.298 2004/10/01 02:00:43 neilc Exp $
 -->
 
 <appendix id="release">
@@ -1501,7 +1501,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
 
     <listitem>
      <para>
-      Allow PL/PgSQL parameter names to be referenced in the function (Dennis Bjorklund)
+      Allow PL/pgSQL parameter names to be referenced in the function (Dennis Bjorklund)
      </para>
      <para>
       This basically creates an automatic alias for each named parameter.
@@ -1510,7 +1510,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
 
     <listitem>
      <para>
-      Do minimal syntax checking of PL/PgSQL functions at creation time (Tom)
+      Do minimal syntax checking of PL/pgSQL functions at creation time (Tom)
      </para>
      <para>
       This allows us to catch simple syntax errors sooner.
@@ -1519,7 +1519,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
 
     <listitem>
      <para>
-      More support for composite types (row and record variables) in PL/PgSQL
+      More support for composite types (row and record variables) in PL/pgSQL
      </para>
      <para>
       For example, it now works to pass a rowtype variable to another function
@@ -1529,14 +1529,14 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
 
     <listitem>
      <para>
-      Default values for PL/PgSQL variables can now reference previously
+      Default values for PL/pgSQL variables can now reference previously
       declared variables
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve parsing of PL/PgSQL FOR loops (Tom)
+      Improve parsing of PL/pgSQL FOR loops (Tom)
      </para>
      <para>
       Parsing is now driven by presence of ".." rather than datatype of FOR