Skip to content

Commit 41fa9e9

Browse files
author
PostgreSQL Daemon
committed
Remove all of the libpgtcl and pgtclsh files, including all references to them within the various makefiles with_tcl is still required for the src/pl/tcl language
1 parent d1b3915 commit 41fa9e9

22 files changed

+8
-4186
lines changed

‎GNUmakefile.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.37 2004/01/19 21:20:04 tgl Exp $
4+
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.38 2004/04/20 00:33:44 pgsql Exp $
55
#
66

77
subdir =
@@ -71,8 +71,6 @@ $(distdir).tar: distdir
7171

7272
opt_files := \
7373
src/tools src/corba src/tutorial \
74-
src/bin/pgtclsh \
75-
$(addprefix src/interfaces/, libpgtcl) \
7674
$(addprefix src/pl/, plperl plpython tcl)
7775

7876
docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail

‎configure

Lines changed: 1 addition & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -859,9 +859,7 @@ Optional Packages:
859859
--with-libs=DIRS alternative spelling of --with-libraries
860860
--with-pgport=PORTNUM change default port number 5432
861861
--with-tcl build Tcl and Tk interfaces
862-
--without-tk do not build Tk interfaces if Tcl is enabled
863-
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR
864-
--with-tkconfig=DIR tkConfig.sh is in DIR
862+
--with-tclconfig=DIR tclConfig.sh is in DIR
865863
--with-perl build Perl modules (PL/Perl)
866864
--with-python build Python modules (PL/Python)
867865
--with-krb4 build with Kerberos 4 support
@@ -2999,44 +2997,6 @@ echo "$as_me:$LINENO: result: $with_tcl" >&5
29992997
echo "${ECHO_T}$with_tcl" >&6
30002998

30012999

3002-
# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
3003-
echo "$as_me:$LINENO: checking whether to build with Tk" >&5
3004-
echo $ECHO_N "checking whether to build with Tk... $ECHO_C" >&6
3005-
if test "$with_tcl" = yes; then
3006-
3007-
3008-
3009-
# Check whether --with-tk or --without-tk was given.
3010-
if test "${with_tk+set}" = set; then
3011-
withval="$with_tk"
3012-
3013-
case $withval in
3014-
yes)
3015-
:
3016-
;;
3017-
no)
3018-
:
3019-
;;
3020-
*)
3021-
{ { echo "$as_me:$LINENO: error: no argument expected for --with-tk option" >&5
3022-
echo "$as_me: error: no argument expected for --with-tk option" >&2;}
3023-
{ (exit 1); exit 1; }; }
3024-
;;
3025-
esac
3026-
3027-
else
3028-
with_tk=yes
3029-
3030-
fi;
3031-
3032-
else
3033-
with_tk=no
3034-
fi
3035-
echo "$as_me:$LINENO: result: $with_tk" >&5
3036-
echo "${ECHO_T}$with_tk" >&6
3037-
3038-
3039-
30403000
# We see if the path to the Tcl/Tk configuration scripts is specified.
30413001
# This will override the use of tclsh to find the paths to search.
30423002

@@ -3066,35 +3026,6 @@ echo "$as_me: error: argument required for --with-tclconfig option" >&2;}
30663026
fi;
30673027

30683028

3069-
# We see if the path to the Tk configuration scripts is specified.
3070-
# This will override the use of tclsh to find the paths to search.
3071-
3072-
3073-
3074-
3075-
# Check whether --with-tkconfig or --without-tkconfig was given.
3076-
if test "${with_tkconfig+set}" = set; then
3077-
withval="$with_tkconfig"
3078-
3079-
case $withval in
3080-
yes)
3081-
{ { echo "$as_me:$LINENO: error: argument required for --with-tkconfig option" >&5
3082-
echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
3083-
{ (exit 1); exit 1; }; }
3084-
;;
3085-
no)
3086-
{ { echo "$as_me:$LINENO: error: argument required for --with-tkconfig option" >&5
3087-
echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
3088-
{ (exit 1); exit 1; }; }
3089-
;;
3090-
*)
3091-
3092-
;;
3093-
esac
3094-
3095-
fi;
3096-
3097-
30983029
#
30993030
# Optionally build Perl modules (PL/Perl)
31003031
#
@@ -17233,51 +17164,6 @@ eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
1723317164

1723417165
fi
1723517166

17236-
# Check for Tk configuration script tkConfig.sh
17237-
if test "$with_tk" = yes; then
17238-
echo "$as_me:$LINENO: checking for tkConfig.sh" >&5
17239-
echo $ECHO_N "checking for tkConfig.sh... $ECHO_C" >&6
17240-
# Let user override test
17241-
if test -z "$TK_CONFIG_SH"; then
17242-
pgac_test_dirs="$with_tkconfig $with_tclconfig"
17243-
17244-
set X $pgac_test_dirs; shift
17245-
if test $# -eq 0; then
17246-
test -z "$TCLSH" && { { echo "$as_me:$LINENO: error: unable to locate tkConfig.sh because no Tcl shell was found" >&5
17247-
echo "$as_me: error: unable to locate tkConfig.sh because no Tcl shell was found" >&2;}
17248-
{ (exit 1); exit 1; }; }
17249-
set X `echo 'puts $auto_path' | $TCLSH`; shift
17250-
fi
17251-
17252-
for pgac_dir do
17253-
if test -r "$pgac_dir/tkConfig.sh"; then
17254-
TK_CONFIG_SH=$pgac_dir/tkConfig.sh
17255-
break
17256-
fi
17257-
done
17258-
fi
17259-
17260-
if test -z "$TK_CONFIG_SH"; then
17261-
echo "$as_me:$LINENO: result: no" >&5
17262-
echo "${ECHO_T}no" >&6
17263-
{ { echo "$as_me:$LINENO: error: file 'tkConfig.sh' is required for Tk" >&5
17264-
echo "$as_me: error: file 'tkConfig.sh' is required for Tk" >&2;}
17265-
{ (exit 1); exit 1; }; }
17266-
else
17267-
echo "$as_me:$LINENO: result: $TK_CONFIG_SH" >&5
17268-
echo "${ECHO_T}$TK_CONFIG_SH" >&6
17269-
fi
17270-
17271-
17272-
17273-
. "$TK_CONFIG_SH"
17274-
eval TK_LIBS=\"$TK_LIBS\"
17275-
eval TK_LIB_SPEC=\"$TK_LIB_SPEC\"
17276-
eval TK_XINCLUDES=\"$TK_XINCLUDES\"
17277-
17278-
fi
17279-
17280-
1728117167
#
1728217168
# Check for DocBook and tools
1728317169
#
@@ -18197,7 +18083,6 @@ s,@autodepend@,$autodepend,;t t
1819718083
s,@INCLUDES@,$INCLUDES,;t t
1819818084
s,@enable_thread_safety@,$enable_thread_safety,;t t
1819918085
s,@with_tcl@,$with_tcl,;t t
18200-
s,@with_tk@,$with_tk,;t t
1820118086
s,@with_perl@,$with_perl,;t t
1820218087
s,@with_python@,$with_python,;t t
1820318088
s,@with_krb4@,$with_krb4,;t t
@@ -18253,10 +18138,6 @@ s,@TCL_LIBS@,$TCL_LIBS,;t t
1825318138
s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
1825418139
s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t
1825518140
s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
18256-
s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t
18257-
s,@TK_LIBS@,$TK_LIBS,;t t
18258-
s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
18259-
s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
1826018141
s,@NSGMLS@,$NSGMLS,;t t
1826118142
s,@JADE@,$JADE,;t t
1826218143
s,@have_docbook@,$have_docbook,;t t

‎configure.in

Lines changed: 2 additions & 25 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 $PostgreSQL: pgsql/configure.in,v 1.322 2004/03/24 03:54:16 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.323 2004/04/20 00:33:45 pgsql Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -372,26 +372,10 @@ PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl and Tk interfa
372372
AC_MSG_RESULT([$with_tcl])
373373
AC_SUBST([with_tcl])
374374

375-
# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
376-
AC_MSG_CHECKING([whether to build with Tk])
377-
if test "$with_tcl" = yes; then
378-
PGAC_ARG_BOOL(with, tk, yes, [ --without-tk do not build Tk interfaces if Tcl is enabled])
379-
else
380-
with_tk=no
381-
fi
382-
AC_MSG_RESULT([$with_tk])
383-
AC_SUBST([with_tk])
384-
385-
386375
# We see if the path to the Tcl/Tk configuration scripts is specified.
387376
# This will override the use of tclsh to find the paths to search.
388377

389-
PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR])
390-
391-
# We see if the path to the Tk configuration scripts is specified.
392-
# This will override the use of tclsh to find the paths to search.
393-
394-
PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR])
378+
PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh is in DIR])
395379

396380
#
397381
# Optionally build Perl modules (PL/Perl)
@@ -1189,13 +1173,6 @@ if test "$with_tcl" = yes; then
11891173
AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
11901174
fi
11911175

1192-
# Check for Tk configuration script tkConfig.sh
1193-
if test "$with_tk" = yes; then
1194-
PGAC_PATH_TKCONFIGSH([$with_tkconfig $with_tclconfig])
1195-
PGAC_EVAL_TCLCONFIGSH([$TK_CONFIG_SH], [TK_LIBS,TK_LIB_SPEC,TK_XINCLUDES])
1196-
fi
1197-
1198-
11991176
#
12001177
# Check for DocBook and tools
12011178
#

‎src/Makefile.global.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.176 2004/03/10 21:12:46 momjian Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.177 2004/04/20 00:33:46 pgsql Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -123,7 +123,6 @@ localedir := @localedir@
123123
with_perl = @with_perl@
124124
with_python = @with_python@
125125
with_tcl = @with_tcl@
126-
with_tk = @with_tk@
127126
enable_shared = @enable_shared@
128127
enable_rpath = @enable_rpath@
129128
enable_nls = @enable_nls@

‎src/bin/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/Makefile,v 1.41 2003/12/17 18:44:08 petere Exp $
8+
# $PostgreSQL: pgsql/src/bin/Makefile,v 1.42 2004/04/20 00:33:47 pgsql Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -17,10 +17,6 @@ DIRS := initdb initlocation ipcclean pg_ctl pg_dump \
1717
psql scripts pg_config pg_controldata pg_resetxlog \
1818
pg_encoding
1919

20-
ifeq ($(with_tcl), yes)
21-
DIRS += pgtclsh
22-
endif
23-
2420
all install installdirs uninstall depend distprep:
2521
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
2622

‎src/bin/pgtclsh/Makefile

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/bin/pgtclsh/README

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)