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

Commitecf145f

Browse files
committed
Remove TCL_LIB,TCL_INCDIR,TK_LIB,TK_INCDIR.
1 parent97f5547 commitecf145f

File tree

4 files changed

+4
-114
lines changed

4 files changed

+4
-114
lines changed

‎src/Makefile.global.in

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.48 1998/10/12 15:01:40 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.49 1998/10/13 16:30:45 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -136,15 +136,7 @@ KRBLIBS+= -lkrb5 -lcrypto -lcom_err -lisode
136136
endif
137137
endif
138138

139-
#
140-
# location of Tcl/Tk headers and libraries
141-
#
142-
# Uncomment this to build the tcl utilities.
143139
USE_TCL= @USE_TCL@
144-
# customize these to your site's needs
145-
#
146-
#TCL_LIB= @TCL_LIB@
147-
#TK_LIB= @TK_LIB@
148140

149141
USE_PERL= @USE_PERL@
150142

‎src/bin/pgtclsh/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.20 1998/10/12 04:32:22 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.21 1998/10/13 16:30:48 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -42,7 +42,7 @@ pgtclsh: pgtclAppInit.o
4242
pgtksh: pgtkAppInit.o
4343
$(CC)$(CFLAGS)$(TK_DEFS) -o$@ pgtkAppInit.o\
4444
$(LIBPGTCL)$(LIBPQ)$(X_LIBS)$(TK_LIB_SPEC)$(TK_LIBS)\
45-
$(TCL_LIB_SPEC)$(TCL_LIB)$(X11_LIBS)$(LDFLAGS)
45+
$(TCL_LIB_SPEC)$(X11_LIBS)$(LDFLAGS)
4646

4747
install: pgtclsh pgtksh
4848
$(INSTALL)$(INSTL_EXE_OPTS) pgtclsh$(BINDIR)/pgtclsh

‎src/configure.in

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -772,39 +772,6 @@ if test "$USE_X" = true; then
772772
LDFLAGS="$ice_save_LDFLAGS"
773773
fi
774774

775-
dnl Check for location of Tcl support
776-
dnl Disable Tcl support if not found
777-
778-
dnl Check for tcl.h
779-
if test "$USE_TCL" = "true"
780-
then
781-
TCL_INCDIR=no
782-
AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)
783-
if test "$TCL_INCDIR" = "no"; then
784-
AC_MSG_WARN(tcl support disabled; tcl.h missing)
785-
USE_TCL=
786-
fi
787-
AC_SUBST(TCL_INCDIR)
788-
fi
789-
790-
dnl Check for Tcl archive
791-
if test "$USE_TCL" = "true"; then
792-
TCL_LIB=
793-
tcl_libs="tcl8.0 tcl80 tcl7.6 tcl76 tcl"
794-
for tcl_lib in $tcl_libs; do
795-
if test -z "$TCL_LIB"; then
796-
AC_CHECK_LIB($tcl_lib, main, TCL_LIB=$tcl_lib)
797-
fi
798-
done
799-
if test -z "$TCL_LIB"; then
800-
AC_MSG_WARN(tcl support disabled; Tcl library missing)
801-
USE_TCL=
802-
else
803-
TCL_LIB=-l$TCL_LIB
804-
AC_SUBST(TCL_LIB)
805-
fi
806-
fi
807-
808775
dnl Check for Tcl configuration script tclConfig.sh
809776
if test "$USE_TCL"; then
810777
AC_MSG_CHECKING(for tclConfig.sh)
@@ -834,66 +801,6 @@ if test "$USE_TCL"; then
834801
fi
835802
fi
836803

837-
dnl Check for location of Tk support (only if Tcl used)
838-
dnl Disable Tcl support if Tk not found
839-
840-
dnl Check for tk.h
841-
if test "$USE_TCL" = "true"
842-
then
843-
ice_save_LIBS="$LIBS"
844-
ice_save_CFLAGS="$CFLAGS"
845-
ice_save_CPPFLAGS="$CPPFLAGS"
846-
ice_save_LDFLAGS="$LDFLAGS"
847-
848-
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
849-
850-
TK_INCDIR=no
851-
AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)
852-
if test "$TK_INCDIR" = "no"; then
853-
AC_MSG_WARN(tcl support disabled; tk.h missing)
854-
USE_TCL=
855-
fi
856-
857-
LIBS="$ice_save_LIBS"
858-
CFLAGS="$ice_save_CFLAGS"
859-
CPPFLAGS="$ice_save_CPPFLAGS"
860-
LDFLAGS="$ice_save_LDFLAGS"
861-
fi
862-
863-
dnl Check for Tk archive
864-
if test "$USE_TCL" = "true"
865-
then
866-
ice_save_LIBS="$LIBS"
867-
ice_save_CFLAGS="$CFLAGS"
868-
ice_save_CPPFLAGS="$CPPFLAGS"
869-
ice_save_LDFLAGS="$LDFLAGS"
870-
871-
LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS"
872-
CFLAGS="$CFLAGS $X_CFLAGS"
873-
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
874-
LDFLAGS="$LDFLAGS $X_LIBS"
875-
876-
TK_LIB=
877-
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
878-
for tk_lib in $tk_libs; do
879-
if test -z "$TK_LIB"; then
880-
AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
881-
fi
882-
done
883-
if test -z "$TK_LIB"; then
884-
AC_MSG_WARN(tk support disabled; Tk library missing)
885-
USE_TCL=
886-
else
887-
TK_LIB=-l$TK_LIB
888-
AC_SUBST(TK_LIB)
889-
fi
890-
891-
LIBS="$ice_save_LIBS"
892-
CFLAGS="$ice_save_CFLAGS"
893-
CPPFLAGS="$ice_save_CPPFLAGS"
894-
LDFLAGS="$ice_save_LDFLAGS"
895-
fi
896-
897804
dnl Check for Tk configuration script tkConfig.sh
898805
if test "$USE_TCL"; then
899806
AC_MSG_CHECKING(for tkConfig.sh)

‎src/pl/tcl/Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the pltcl shared object
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.6 1998/10/08 23:45:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.7 1998/10/13 16:30:49 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,15 +20,6 @@ include $(SRCDIR)/Makefile.global
2020
#
2121
include Makefile.tcldefs
2222

23-
24-
#
25-
# Uncomment the following to force a specific version of the
26-
# Tcl shared library to be used.
27-
#
28-
#TCL_LIB_SPEC=-L/usr/lib -ltcl8.0
29-
30-
31-
#
3223
# Change following to how shared library that contain
3324
# correct references to libtcl must get built on your system.
3425
# Since these definitions come from the tclConfig.sh script,

0 commit comments

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