diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-30 17:19:54 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-30 17:19:54 +0000 |
| commit | 2e1f2c3109b43138ef32dbdba09abef7c9c51d5a (patch) | |
| tree | bdd14e25b92cdaa092cdd0b22c682db39dcc3531 /src | |
| parent | 33f0108df8a79cdb6dbf91f7eb4329143c0730d8 (diff) | |
| download | postgresql-2e1f2c3109b43138ef32dbdba09abef7c9c51d5a.tar.gz postgresql-2e1f2c3109b43138ef32dbdba09abef7c9c51d5a.zip | |
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...)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/bin/pgtclsh/Makefile | 4 | ||||
| -rw-r--r-- | src/interfaces/libpgtcl/Makefile | 4 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index fb4592ec985..fda7cddb852 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.156 2002/11/10 00:37:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.157 2002/12/30 17:19:50 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -144,6 +144,7 @@ TCLSH = @TCLSH@ TCL_LIB_FILE = @TCL_LIB_FILE@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ +TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@ TCL_SHARED_BUILD = @TCL_SHARED_BUILD@ TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@ diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 8847146d7f4..3a379fc20b4 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.39 2002/06/20 20:29:42 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.40 2002/12/30 17:19:51 tgl Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl libpgtcl = -L$(libpgtcl_builddir) -lpgtcl -override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) +override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC) # If we are here then Tcl is available diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile index 6a227cf5eff..63fffeabe26 100644 --- a/src/interfaces/libpgtcl/Makefile +++ b/src/interfaces/libpgtcl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.29 2002/12/11 04:07:39 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.30 2002/12/30 17:19:52 tgl Exp $ # #------------------------------------------------------------------------- @@ -16,7 +16,7 @@ NAME= pgtcl SO_MAJOR_VERSION= 2 SO_MINOR_VERSION= 4 -override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) +override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(TCL_INCLUDE_SPEC) OBJS= pgtcl.o pgtclCmds.o pgtclId.o diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 43f420c7e1f..c48671b0b32 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.38 2002/05/24 18:10:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.39 2002/12/30 17:19:54 tgl Exp $ # #------------------------------------------------------------------------- @@ -11,6 +11,9 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global +override CPPFLAGS := $(CPPFLAGS) $(TCL_INCLUDE_SPEC) + + # Find out whether Tcl was built as a shared library --- if not, we # can't link a shared library that depends on it, and have to forget # about building pltcl. In Tcl 8, tclConfig.sh sets TCL_SHARED_BUILD |