mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-18 18:44:06 +08:00
Clean up after pygresql removal: adjust/remove documentation and remove
unneeded configure work.
This commit is contained in:
Peter Eisentraut
parent
65c2d427fb
commit
f10a9033bf
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Autoconf macros for configuring the build of Python extension modules
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/config/python.m4,v 1.6 2003/09/01 23:01:48 petere Exp $
|
||||
#
|
||||
|
||||
# PGAC_PATH_PYTHON
|
||||
@ -26,19 +26,14 @@ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
|
||||
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
|
||||
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
|
||||
python_configdir="${python_execprefix}/lib/python${python_version}/config"
|
||||
python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
|
||||
python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
|
||||
python_includespec="-I${python_prefix}/include/python${python_version}"
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
|
||||
fi
|
||||
|
||||
AC_SUBST(python_version)[]dnl
|
||||
AC_SUBST(python_prefix)[]dnl
|
||||
AC_SUBST(python_execprefix)[]dnl
|
||||
AC_SUBST(python_configdir)[]dnl
|
||||
AC_SUBST(python_moduledir)[]dnl
|
||||
AC_SUBST(python_moduleexecdir)[]dnl
|
||||
AC_SUBST(python_includespec)[]dnl
|
||||
# This should be enough of a message.
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
@ -49,19 +44,6 @@ fi
|
||||
])# _PGAC_CHECK_PYTHON_DIRS
|
||||
|
||||
|
||||
# PGAC_CHECK_PYTHON_MODULE_SETUP
|
||||
# ------------------------------
|
||||
# Finds things required to build a Python extension module.
|
||||
# This used to do more, that's why it's separate.
|
||||
#
|
||||
# It would be nice if we could check whether the current setup allows
|
||||
# the build of the shared module. Future project.
|
||||
AC_DEFUN([PGAC_CHECK_PYTHON_MODULE_SETUP],
|
||||
[
|
||||
AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
|
||||
])# PGAC_CHECK_PYTHON_MODULE_SETUP
|
||||
|
||||
|
||||
# PGAC_CHECK_PYTHON_EMBED_SETUP
|
||||
# -----------------------------
|
||||
# Courtesy of the INN 2.3.1 package...
|
||||
|
||||
12
configure
vendored
12
configure
vendored
@ -860,7 +860,7 @@ Optional Packages:
|
||||
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR
|
||||
--with-tkconfig=DIR tkConfig.sh is in DIR
|
||||
--with-perl build Perl modules (PL/Perl)
|
||||
--with-python build Python interface module
|
||||
--with-python build Python modules (PL/Python)
|
||||
--with-java build JDBC interface and Java tools
|
||||
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]
|
||||
--with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]
|
||||
@ -2981,7 +2981,7 @@ echo "${ECHO_T}$with_perl" >&6
|
||||
|
||||
|
||||
#
|
||||
# Optionally build Python interface module
|
||||
# Optionally build Python modules (PL/Python)
|
||||
#
|
||||
echo "$as_me:$LINENO: checking whether to build Python modules" >&5
|
||||
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]"`
|
||||
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
|
||||
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
|
||||
python_configdir="${python_execprefix}/lib/python${python_version}/config"
|
||||
python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
|
||||
python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
|
||||
python_includespec="-I${python_prefix}/include/python${python_version}"
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
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
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
|
||||
echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
|
||||
|
||||
@ -18285,12 +18280,9 @@ s,@perl_privlibexp@,$perl_privlibexp,;t t
|
||||
s,@perl_useshrplib@,$perl_useshrplib,;t t
|
||||
s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
|
||||
s,@PYTHON@,$PYTHON,;t t
|
||||
s,@python_version@,$python_version,;t t
|
||||
s,@python_prefix@,$python_prefix,;t t
|
||||
s,@python_execprefix@,$python_execprefix,;t t
|
||||
s,@python_configdir@,$python_configdir,;t t
|
||||
s,@python_moduledir@,$python_moduledir,;t t
|
||||
s,@python_moduleexecdir@,$python_moduleexecdir,;t t
|
||||
s,@python_includespec@,$python_includespec,;t t
|
||||
s,@python_libspec@,$python_libspec,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.282 2003/08/27 02:35:38 pgsql Exp $
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.283 2003/09/01 23:01:49 petere Exp $
|
||||
dnl
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
@ -362,10 +362,10 @@ AC_MSG_RESULT([$with_perl])
|
||||
AC_SUBST(with_perl)
|
||||
|
||||
#
|
||||
# Optionally build Python interface module
|
||||
# Optionally build Python modules (PL/Python)
|
||||
#
|
||||
AC_MSG_CHECKING([whether to build Python modules])
|
||||
PGAC_ARG_BOOL(with, python, no, [ --with-python build Python interface module])
|
||||
PGAC_ARG_BOOL(with, python, no, [ --with-python build Python modules (PL/Python)])
|
||||
AC_MSG_RESULT([$with_python])
|
||||
AC_SUBST(with_python)
|
||||
|
||||
@ -608,7 +608,6 @@ fi
|
||||
|
||||
if test "$with_python" = yes; then
|
||||
PGAC_PATH_PYTHON
|
||||
PGAC_CHECK_PYTHON_MODULE_SETUP
|
||||
PGAC_CHECK_PYTHON_EMBED_SETUP
|
||||
fi
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.29 2003/05/18 20:55:56 petere Exp $ -->
|
||||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.30 2003/09/01 23:01:49 petere Exp $ -->
|
||||
|
||||
<!entity history SYSTEM "history.sgml">
|
||||
<!entity info SYSTEM "info.sgml">
|
||||
@ -68,7 +68,6 @@
|
||||
<!entity libpgeasy SYSTEM "libpgeasy.sgml">
|
||||
<!entity libpq SYSTEM "libpq.sgml">
|
||||
<!entity libpgtcl SYSTEM "libpgtcl.sgml">
|
||||
<!entity pygresql SYSTEM "pygresql.sgml">
|
||||
<!entity lobj SYSTEM "lobj.sgml">
|
||||
<!entity odbc SYSTEM "odbc.sgml">
|
||||
<!entity rules SYSTEM "rules.sgml">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.139 2003/08/31 17:32:19 petere Exp $ -->
|
||||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.140 2003/09/01 23:01:49 petere Exp $ -->
|
||||
|
||||
<chapter id="installation">
|
||||
<title><![%standalone-include[<productname>PostgreSQL</>]]>
|
||||
@ -169,10 +169,9 @@ su - postgres
|
||||
|
||||
<listitem>
|
||||
<para>
|
||||
To build the Python interface module or the PL/Python server
|
||||
programming language, you need a Python installation, including
|
||||
the header files.
|
||||
Since PL/Python will be a shared library, the
|
||||
To build the PL/Python server programming language, you need a
|
||||
Python installation, including the header files. Since
|
||||
PL/Python 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
|
||||
@ -751,10 +750,7 @@ JAVACMD=$JAVA_HOME/bin/java
|
||||
<term><option>--with-python</option></term>
|
||||
<listitem>
|
||||
<para>
|
||||
Build the Python interface module and the PL/Python
|
||||
server-side language. You need to have root access to be able
|
||||
to install the Python module at its default place
|
||||
(<filename>/usr/lib/python<replaceable>x</>.<replaceable>y</></>).
|
||||
Build the PL/Python server-side language.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
@ -1079,20 +1075,6 @@ All of PostgreSQL is successfully made. Ready to install.
|
||||
possibly can, you will have to do manual work.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
If you built the Python interfaces and you were not the
|
||||
root user when you executed the above command then that part of
|
||||
the installation probably failed. In that case you should become
|
||||
the root user and then do
|
||||
<screen>
|
||||
<userinput>gmake -C src/interfaces/python install</userinput>
|
||||
</screen>
|
||||
If you do not have root access you are on your own:
|
||||
you can still take the required files and place them in
|
||||
other directories where Python can find them, but how to
|
||||
do that is left as an exercise.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
The standard installation provides only the header files needed for client
|
||||
application development. If you plan to do any server-side program
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.53 2003/06/22 16:16:44 tgl Exp $
|
||||
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.54 2003/09/01 23:01:49 petere Exp $
|
||||
-->
|
||||
|
||||
<!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
|
||||
&libpgtcl;
|
||||
&ecpg;
|
||||
&jdbc;
|
||||
&pygresql;
|
||||
&infoschema;
|
||||
|
||||
</part>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
# -*-makefile-*-
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.166 2003/08/08 04:52:20 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.167 2003/09/01 23:01:49 petere Exp $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||
@ -132,10 +132,7 @@ enable_rpath = @enable_rpath@
|
||||
enable_nls = @enable_nls@
|
||||
enable_debug = @enable_debug@
|
||||
|
||||
python_version = @python_version@
|
||||
python_includespec = @python_includespec@
|
||||
python_moduledir = @python_moduledir@
|
||||
python_moduleexecdir = @python_moduleexecdir@
|
||||
python_libspec = @python_libspec@
|
||||
python_configdir = @python_configdir@
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user