Skip to content

Commit f10a903

Browse files
peterepetere
committed
Clean up after pygresql removal: adjust/remove documentation and remove
unneeded configure work.
1 parent 65c2d42 commit f10a903

File tree

8 files changed

+14
-4514
lines changed

8 files changed

+14
-4514
lines changed

‎config/python.m4

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Autoconf macros for configuring the build of Python extension modules
33
#
4-
# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
4+
# $Header: /cvsroot/pgsql/config/python.m4,v 1.6 2003/09/01 23:01:48 petere Exp $
55
#
66

77
# PGAC_PATH_PYTHON
@@ -26,19 +26,14 @@ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
2626
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
2727
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
2828
python_configdir="${python_execprefix}/lib/python${python_version}/config"
29-
python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
30-
python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
3129
python_includespec="-I${python_prefix}/include/python${python_version}"
3230
if test "$python_prefix" != "$python_execprefix"; then
3331
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
3432
fi
3533
36-
AC_SUBST(python_version)[]dnl
3734
AC_SUBST(python_prefix)[]dnl
3835
AC_SUBST(python_execprefix)[]dnl
3936
AC_SUBST(python_configdir)[]dnl
40-
AC_SUBST(python_moduledir)[]dnl
41-
AC_SUBST(python_moduleexecdir)[]dnl
4237
AC_SUBST(python_includespec)[]dnl
4338
# This should be enough of a message.
4439
if test "$python_prefix" != "$python_execprefix"; then
@@ -49,19 +44,6 @@ fi
4944
])# _PGAC_CHECK_PYTHON_DIRS
5045

5146

52-
# PGAC_CHECK_PYTHON_MODULE_SETUP
53-
# ------------------------------
54-
# Finds things required to build a Python extension module.
55-
# This used to do more, that's why it's separate.
56-
#
57-
# It would be nice if we could check whether the current setup allows
58-
# the build of the shared module. Future project.
59-
AC_DEFUN([PGAC_CHECK_PYTHON_MODULE_SETUP],
60-
[
61-
AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
62-
])# PGAC_CHECK_PYTHON_MODULE_SETUP
63-
64-
6547
# PGAC_CHECK_PYTHON_EMBED_SETUP
6648
# -----------------------------
6749
# Courtesy of the INN 2.3.1 package...

‎configure

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ Optional Packages:
860860
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR
861861
--with-tkconfig=DIR tkConfig.sh is in DIR
862862
--with-perl build Perl modules (PL/Perl)
863-
--with-python build Python interface module
863+
--with-python build Python modules (PL/Python)
864864
--with-java build JDBC interface and Java tools
865865
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]
866866
--with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]
@@ -2981,7 +2981,7 @@ echo "${ECHO_T}$with_perl" >&6
29812981

29822982

29832983
#
2984-
# Optionally build Python interface module
2984+
# Optionally build Python modules (PL/Python)
29852985
#
29862986
echo "$as_me:$LINENO: checking whether to build Python modules" >&5
29872987
echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6
@@ -4294,8 +4294,6 @@ python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
42944294
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
42954295
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
42964296
python_configdir="${python_execprefix}/lib/python${python_version}/config"
4297-
python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
4298-
python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
42994297
python_includespec="-I${python_prefix}/include/python${python_version}"
43004298
if test "$python_prefix" != "$python_execprefix"; then
43014299
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
@@ -4311,9 +4309,6 @@ echo "${ECHO_T}$python_prefix/lib/python${python_version}" >&6
43114309
fi
43124310

43134311

4314-
4315-
4316-
43174312
echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
43184313
echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
43194314

@@ -18285,12 +18280,9 @@ s,@perl_privlibexp@,$perl_privlibexp,;t t
1828518280
s,@perl_useshrplib@,$perl_useshrplib,;t t
1828618281
s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
1828718282
s,@PYTHON@,$PYTHON,;t t
18288-
s,@python_version@,$python_version,;t t
1828918283
s,@python_prefix@,$python_prefix,;t t
1829018284
s,@python_execprefix@,$python_execprefix,;t t
1829118285
s,@python_configdir@,$python_configdir,;t t
18292-
s,@python_moduledir@,$python_moduledir,;t t
18293-
s,@python_moduleexecdir@,$python_moduleexecdir,;t t
1829418286
s,@python_includespec@,$python_includespec,;t t
1829518287
s,@python_libspec@,$python_libspec,;t t
1829618288
s,@LIBOBJS@,$LIBOBJS,;t t

‎configure.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.282 2003/08/27 02:35:38 pgsql Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.283 2003/09/01 23:01:49 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -362,10 +362,10 @@ AC_MSG_RESULT([$with_perl])
362362
AC_SUBST(with_perl)
363363

364364
#
365-
# Optionally build Python interface module
365+
# Optionally build Python modules (PL/Python)
366366
#
367367
AC_MSG_CHECKING([whether to build Python modules])
368-
PGAC_ARG_BOOL(with, python, no, [ --with-python build Python interface module])
368+
PGAC_ARG_BOOL(with, python, no, [ --with-python build Python modules (PL/Python)])
369369
AC_MSG_RESULT([$with_python])
370370
AC_SUBST(with_python)
371371

@@ -608,7 +608,6 @@ fi
608608

609609
if test "$with_python" = yes; then
610610
PGAC_PATH_PYTHON
611-
PGAC_CHECK_PYTHON_MODULE_SETUP
612611
PGAC_CHECK_PYTHON_EMBED_SETUP
613612
fi
614613

‎doc/src/sgml/filelist.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.29 2003/05/18 20:55:56 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.30 2003/09/01 23:01:49 petere Exp $ -->
22

33
<!entity history SYSTEM "history.sgml">
44
<!entity info SYSTEM "info.sgml">
@@ -68,7 +68,6 @@
6868
<!entity libpgeasy SYSTEM "libpgeasy.sgml">
6969
<!entity libpq SYSTEM "libpq.sgml">
7070
<!entity libpgtcl SYSTEM "libpgtcl.sgml">
71-
<!entity pygresql SYSTEM "pygresql.sgml">
7271
<!entity lobj SYSTEM "lobj.sgml">
7372
<!entity odbc SYSTEM "odbc.sgml">
7473
<!entity rules SYSTEM "rules.sgml">

‎doc/src/sgml/installation.sgml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.139 2003/08/31 17:32:19 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.140 2003/09/01 23:01:49 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -169,10 +169,9 @@ su - postgres
169169

170170
<listitem>
171171
<para>
172-
To build the Python interface module or the PL/Python server
173-
programming language, you need a Python installation, including
174-
the header files.
175-
Since PL/Python will be a shared library, the
172+
To build the PL/Python server programming language, you need a
173+
Python installation, including the header files. Since
174+
PL/Python will be a shared library, the
176175
<indexterm><primary>libpython</primary></indexterm>
177176
<filename>libpython</filename> library must be a shared library
178177
also on most platforms. This is not the case in a default
@@ -751,10 +750,7 @@ JAVACMD=$JAVA_HOME/bin/java
751750
<term><option>--with-python</option></term>
752751
<listitem>
753752
<para>
754-
Build the Python interface module and the PL/Python
755-
server-side language. You need to have root access to be able
756-
to install the Python module at its default place
757-
(<filename>/usr/lib/python<replaceable>x</>.<replaceable>y</></>).
753+
Build the PL/Python server-side language.
758754
</para>
759755
</listitem>
760756
</varlistentry>
@@ -1079,20 +1075,6 @@ All of PostgreSQL is successfully made. Ready to install.
10791075
possibly can, you will have to do manual work.
10801076
</para>
10811077

1082-
<para>
1083-
If you built the Python interfaces and you were not the
1084-
root user when you executed the above command then that part of
1085-
the installation probably failed. In that case you should become
1086-
the root user and then do
1087-
<screen>
1088-
<userinput>gmake -C src/interfaces/python install</userinput>
1089-
</screen>
1090-
If you do not have root access you are on your own:
1091-
you can still take the required files and place them in
1092-
other directories where Python can find them, but how to
1093-
do that is left as an exercise.
1094-
</para>
1095-
10961078
<para>
10971079
The standard installation provides only the header files needed for client
10981080
application development. If you plan to do any server-side program

‎doc/src/sgml/postgres.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.53 2003/06/22 16:16:44 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.54 2003/09/01 23:01:49 petere Exp $
33
-->
44

55
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
@@ -188,7 +188,6 @@ $Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.53 2003/06/22 16:16:44 tg
188188
&libpgtcl;
189189
&ecpg;
190190
&jdbc;
191-
&pygresql;
192191
&infoschema;
193192

194193
</part>

0 commit comments

Comments
 (0)