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

Commit2e1f2c3

Browse files
committed
Make use of TCL_INCLUDE_SPEC if available (it's new in Tcl 8.4, too bad
it took 'em this long to realize it's needed...)
1 parent33f0108 commit2e1f2c3

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

‎configure‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15417,6 +15417,12 @@ eval TCL_LIBS=\"$TCL_LIBS\"
1541715417
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
1541815418
eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
1541915419
15420+
# TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later
15421+
iftest"${TCL_INCLUDE_SPEC+set}" =set;then
15422+
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
15423+
else
15424+
TCL_INCLUDE_SPEC=''
15425+
fi
1542015426
fi
1542115427
1542215428
# Check for Tk configuration script tkConfig.sh
@@ -16435,6 +16441,7 @@ s,@TCL_LIBS@,$TCL_LIBS,;t t
1643516441
s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
1643616442
s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t
1643716443
s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
16444+
s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
1643816445
s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t
1643916446
s,@TK_LIBS@,$TK_LIBS,;t t
1644016447
s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t

‎configure.in‎

Lines changed: 8 additions & 1 deletion
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.223 2002/12/29 03:56:35 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.224 2002/12/30 17:19:49 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1135,6 +1135,13 @@ if test "$with_tcl" = yes; then
11351135
PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
11361136
[TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
11371137
AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
1138+
# TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later
1139+
if test "${TCL_INCLUDE_SPEC+set}" = set; then
1140+
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
1141+
else
1142+
TCL_INCLUDE_SPEC=''
1143+
fi
1144+
AC_SUBST(TCL_INCLUDE_SPEC)dnl
11381145
fi
11391146

11401147
# Check for Tk configuration script tkConfig.sh

‎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.156 2002/11/10 00:37:28 momjian Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.157 2002/12/30 17:19:50 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -144,6 +144,7 @@ TCLSH= @TCLSH@
144144
TCL_LIB_FILE= @TCL_LIB_FILE@
145145
TCL_LIBS= @TCL_LIBS@
146146
TCL_LIB_SPEC= @TCL_LIB_SPEC@
147+
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
147148
TCL_SHARED_BUILD= @TCL_SHARED_BUILD@
148149
TCL_SHLIB_LD_LIBS= @TCL_SHLIB_LD_LIBS@
149150

‎src/bin/pgtclsh/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
77
# Portions Copyright (c) 1994, Regents of the University of California
88
#
9-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.39 2002/06/20 20:29:42 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.40 2002/12/30 17:19:51 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -19,7 +19,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
1919
libpgtcl_builddir =$(top_builddir)/src/interfaces/libpgtcl
2020
libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
2121

22-
overrideCPPFLAGS := -I$(libpgtcl_srcdir)$(CPPFLAGS)$(TK_XINCLUDES)
22+
overrideCPPFLAGS := -I$(libpgtcl_srcdir)$(CPPFLAGS)$(TK_XINCLUDES)$(TCL_INCLUDE_SPEC)
2323

2424

2525
# If we are here then Tcl is available

‎src/interfaces/libpgtcl/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.29 2002/12/11 04:07:39 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.30 2002/12/30 17:19:52 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,7 +16,7 @@ NAME= pgtcl
1616
SO_MAJOR_VERSION= 2
1717
SO_MINOR_VERSION= 4
1818

19-
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)
19+
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)$(TCL_INCLUDE_SPEC)
2020

2121
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
2222

‎src/pl/tcl/Makefile‎

Lines changed: 4 additions & 1 deletion
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.38 2002/05/24 18:10:17 petere Exp $
5+
# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.39 2002/12/30 17:19:54 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -11,6 +11,9 @@ top_builddir = ../../..
1111
include$(top_builddir)/src/Makefile.global
1212

1313

14+
overrideCPPFLAGS :=$(CPPFLAGS)$(TCL_INCLUDE_SPEC)
15+
16+
1417
# Find out whether Tcl was built as a shared library --- if not, we
1518
# can't link a shared library that depends on it, and have to forget
1619
# about building pltcl. In Tcl 8, tclConfig.sh sets TCL_SHARED_BUILD

0 commit comments

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