Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf7659a9

Browse files
committed
This patch adds a new configure option --with-pltcl-unknown which
enables pltcl unknown support.Also it adds substituting of tclsh with tclsh that was by configure inpltcl_*mod scripts. For example, On freebsd, tclsh can be calledtclsh8.2 ortclsh8.3 depending on installed version of Tcl.After patching files src/pl/tcl/modules/pltcl_listmod src/pl/tcl/modules/pltcl_loadmod src/pl/tcl/modules/pltcl_delmodmust be renamed(copied,repocopied) to src/pl/tcl/modules/pltcl_listmod.in src/pl/tcl/modules/pltcl_loadmod.in src/pl/tcl/modules/pltcl_delmod.inseva@sevasoft.kiev.ua
1 parentd8eade3 commitf7659a9

File tree

7 files changed

+43
-9
lines changed

7 files changed

+43
-9
lines changed

‎configure.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,16 @@ PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl and Tk interfa
359359
AC_MSG_RESULT([$with_tcl])
360360
AC_SUBST([with_tcl])
361361

362+
# If Tcl is enabled (above) then check for pltcl_unknown_support
363+
AC_MSG_CHECKING([whether to build with pl/tcl unknown support])
364+
if test "$with_tcl" = yes; then
365+
PGAC_ARG_BOOL(with, pltcl_unknown, no, [ --with-pltcl-unknown build pl/tcl unknown support if Tcl is enabled])
366+
else
367+
with_pltcl_unknown=no
368+
fi
369+
AC_MSG_RESULT([$with_pltcl_unknown])
370+
AC_SUBST([with_pltcl_unknown])
371+
362372
# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
363373
AC_MSG_CHECKING([whether to build with Tk])
364374
if test "$with_tcl" = yes; then
@@ -1165,6 +1175,9 @@ AC_OUTPUT(
11651175
src/GNUmakefile
11661176
src/Makefile.global
11671177
src/backend/port/Makefile
1178+
src/pl/tcl/modules/pltcl_listmod
1179+
src/pl/tcl/modules/pltcl_loadmod
1180+
src/pl/tcl/modules/pltcl_delmod
11681181
],
11691182
[
11701183
# Update timestamp for config.h (see Makefile.global)

‎doc/src/sgml/installation.sgml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.45 2001/04/06 15:52:41 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.46 2001/05/09 19:19:00 momjian Exp $ -->
22

33
<chapter id="installation">
44
<title><![%flattext-install-include[<productname>PostgreSQL</>]]>
@@ -587,6 +587,15 @@ su - postgres
587587
</listitem>
588588
</varlistentry>
589589

590+
<varlistentry>
591+
<term>--with-pltcl-unknown</term>
592+
<listitem>
593+
<para>
594+
Enables enables PL/Tcl unknown support.
595+
</para>
596+
</listitem>
597+
</varlistentry>
598+
590599
<varlistentry>
591600
<term>--enable-odbc</term>
592601
<listitem>

‎src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.123 2001/03/10 10:38:59 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.124 2001/05/09 19:19:00 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -111,6 +111,7 @@ with_java= @with_java@
111111
with_perl= @with_perl@
112112
with_python= @with_python@
113113
with_tcl= @with_tcl@
114+
with_pltcl_unknown= @with_pltcl_unknown@
114115
with_tk= @with_tk@
115116
enable_odbc= @enable_odbc@
116117
MULTIBYTE= @MULTIBYTE@

‎src/pl/tcl/Makefile

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the pltcl shared object
44
#
5-
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.26 2000/12/15 18:50:35 petere Exp $
5+
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.27 2001/05/09 19:19:00 momjian Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -70,8 +70,9 @@ override CFLAGS = $(TCL_CFLAGS_OPTIMIZE) $(TCL_SHLIB_CFLAGS)
7070
# first of all calls to the call handler. See the doc in the modules
7171
# directory about details.
7272

73-
#override CPPFLAGS+= -DPLTCL_UNKNOWN_SUPPORT
74-
73+
ifeq ($(with_pltcl_unknown), yes)
74+
overrideCPPFLAGS+= -DPLTCL_UNKNOWN_SUPPORT
75+
endif
7576

7677
#
7778
# DLOBJS is the dynamically-loaded object file.
@@ -98,6 +99,16 @@ pltcl$(DLSUFFIX): pltcl.o
9899

99100
install: all installdirs
100101
$(INSTALL_SHLIB)$(DLOBJS)$(DESTDIR)$(libdir)/$(DLOBJS)
102+
ifeq ($(with_pltcl_unknown), yes)
103+
$(INSTALL_SCRIPT) modules/pltcl_loadmod \
104+
$(DESTDIR)$(bindir)/pltcl_loadmod
105+
$(INSTALL_SCRIPT) modules/pltcl_delmod \
106+
$(DESTDIR)$(bindir)/pltcl_delmod
107+
$(INSTALL_SCRIPT) modules/pltcl_listmod \
108+
$(DESTDIR)$(bindir)/pltcl_listmod
109+
$(INSTALL_DATA) modules/unknown.pltcl \
110+
$(DESTDIR)$(datadir)/unknown.pltcl
111+
endif
101112

102113
installdirs:
103114
$(mkinstalldirs)$(DESTDIR)$(libdir)
@@ -117,4 +128,4 @@ Makefile.tcldefs: mkMakefile.tcldefs.sh
117128
$(SHELL)$<'$(TCL_CONFIG_SH)''$@'
118129

119130
cleandistcleanmaintainer-clean:
120-
rm -f$(INFILES) pltcl.o Makefile.tcldefs
131+
rm -f$(INFILES) pltcl.o Makefile.tcldefs modules/pltcl_listmod modules/pltcl_loadmod modules/pltcl_delmod

‎src/pl/tcl/modules/pltcl_delmodrenamed to ‎src/pl/tcl/modules/pltcl_delmod.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
# Start tclsh \
3-
exectclsh "$0" $@
3+
exec@TCLSH@"$0"$@
44

55
#
66
# Code still has to be documented

‎src/pl/tcl/modules/pltcl_listmodrenamed to ‎src/pl/tcl/modules/pltcl_listmod.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
# Start tclsh \
3-
exectclsh "$0" $@
3+
exec@TCLSH@"$0"$@
44

55
#
66
# Code still has to be documented

‎src/pl/tcl/modules/pltcl_loadmodrenamed to ‎src/pl/tcl/modules/pltcl_loadmod.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
# Start tclsh \
3-
exectclsh "$0" $@
3+
exec@TCLSH@"$0"$@
44

55
#
66
# Code still has to be documented

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp