Commit953ca76

committed

more tcl/tk fixes

1 parent97e461b commit953ca76Copy full SHA for 953ca76

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.36 1998/03/2304:07:59 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.37 1998/03/2306:01:47 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# Essentially all Postgres make files include this file and use the`
`@@ -160,9 +160,7 @@ endif`
`160`	`160`	`USE_TCL= @USE_TCL@`
`161`	`161`	`# customize these to your site's needs`
`162`	`162`	`#`
`163`		`-TCL_INCDIR= @TCL_INCDIR@`
`164`	`163`	`TCL_LIB= @TCL_LIB@`
`165`		`-TK_INCDIR= @TK_INCDIR@`
`166`	`164`	`TK_LIB= @TK_LIB@`
`167`	`165`
`168`	`166`	`USE_PERL= @USE_PERL@`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.12 1998/03/2304:08:05 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.13 1998/03/2306:02:39 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`SRCDIR= ../..`
`15`	`15`	`include ../../Makefile.global`
`16`	`16`
`17`		`-CFLAGS+=$(X_CFLAGS) -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl`
	`17`	`+CFLAGS+=$(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl`
`18`	`18`
`19`	`19`	`ifdefKRBVERS`
`20`	`20`	`LDFLAGS+=$(KRBLIBS)`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -563,12 +563,11 @@ dnl Check for tcl.h`
`563`	`563`	`if test "$USE_TCL" = "true"`
`564`	`564`	`then`
`565`	`565`	`TCL_INCDIR=no`
`566`		`-AC_CHECK_HEADER(tcl.h, TCL_INCDIR=)`
	`566`	`+AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)`
`567`	`567`	`if test "$TCL_INCDIR" = "no"; then`
`568`	`568`	`AC_MSG_WARN(tcl support disabled; tcl.h missing)`
`569`	`569`	`USE_TCL=`
`570`	`570`	`fi`
`571`		`-AC_SUBST(TCL_INCDIR)`
`572`	`571`	`fi`
`573`	`572`
`574`	`573`	`dnl Check for Tcl archive`
`@@ -600,12 +599,11 @@ ice_save_LDFLAGS="$LDFLAGS"`
`600`	`599`	`CPPFLAGS="$CPPFLAGS $X_CFLAGS"`
`601`	`600`
`602`	`601`	`TK_INCDIR=no`
`603`		`-AC_CHECK_HEADER(tk.h, TK_INCDIR=)`
	`602`	`+AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)`
`604`	`603`	`if test "$TK_INCDIR" = "no"; then`
`605`	`604`	`AC_MSG_WARN(tcl support disabled; tk.h missing)`
`606`	`605`	`USE_TCL=`
`607`	`606`	`fi`
`608`		`-AC_SUBST(TK_INCDIR)`
`609`	`607`
`610`	`608`	`LIBS="$ice_save_LIBS"`
`611`	`609`	`CFLAGS="$ice_save_CFLAGS"`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.4 1998/03/15 08:02:55 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.5 1998/03/23 06:03:04 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -17,8 +17,7 @@ include $(SRCDIR)/Makefile.global`
`17`	`17`	`INCLUDE_OPT=\`
`18`	`18`	`-I$(SRCDIR)/backend\`
`19`	`19`	`-I$(SRCDIR)/include\`
`20`		`- -I$(LIBPQDIR)\`
`21`		`- -I$(TCL_INCDIR)`
	`20`	`+ -I$(LIBPQDIR)`
`22`	`21`
`23`	`22`	`PORTNAME=@PORTNAME@`
`24`	`23`

Comments

(0)