more tcl/tk fixes

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index b6d99b1ea511c6c6e8cf12baaa4e005b16529b40..9c8de9d2df0dc41a6e16f70733a993dccc0e4317 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.36 1998/03/23 04:07:59 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.37 1998/03/23 06:01:47 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -160,9 +160,7 @@ endif
 USE_TCL= @USE_TCL@
 # customize these to your site's needs
 #
-TCL_INCDIR= @TCL_INCDIR@
 TCL_LIB= @TCL_LIB@
-TK_INCDIR= @TK_INCDIR@
 TK_LIB= @TK_LIB@
 
 USE_PERL= @USE_PERL@

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 76cc6f85094e78a0c3ed5e932ef050b1a23425f6..2adc6f5310ba1c5af26ea58218c499da5b9fdd3a 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,14 +7,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.12 1998/03/23 04:08:05 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.13 1998/03/23 06:02:39 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
 
-CFLAGS+=  $(X_CFLAGS) -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
+CFLAGS+=  $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
 
 ifdef KRBVERS
 LDFLAGS+= $(KRBLIBS)

diff --git a/src/configure.in b/src/configure.in
index bc0020b14900827ad164156a50138d6c8c86e78a..bf47c4df01cf019fef51baa474e88023dbe1b13a 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -563,12 +563,11 @@ dnl Check for tcl.h
 if test "$USE_TCL" = "true"
 then
 TCL_INCDIR=no
-AC_CHECK_HEADER(tcl.h, TCL_INCDIR=)
+AC_CHECK_HEADER(tcl.h, TCL_INCDIR=yes)
 if test "$TCL_INCDIR" = "no"; then
 AC_MSG_WARN(tcl support disabled; tcl.h missing)
 USE_TCL=
 fi
-AC_SUBST(TCL_INCDIR)
 fi
 
 dnl Check for Tcl archive
@@ -600,12 +599,11 @@ ice_save_LDFLAGS="$LDFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
 TK_INCDIR=no
-AC_CHECK_HEADER(tk.h, TK_INCDIR=)
+AC_CHECK_HEADER(tk.h, TK_INCDIR=yes)
 if test "$TK_INCDIR" = "no"; then
 AC_MSG_WARN(tcl support disabled; tk.h missing)
 USE_TCL=
 fi
-AC_SUBST(TK_INCDIR)
 
 LIBS="$ice_save_LIBS"
 CFLAGS="$ice_save_CFLAGS"

diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 92852a597042d70931983fbe6f1660cf01842607..ccfdc8d97d4210a632fde7083be01587364f1df9 100644 (file)
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.4 1998/03/15 08:02:55 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.5 1998/03/23 06:03:04 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,8 +17,7 @@ include $(SRCDIR)/Makefile.global
 INCLUDE_OPT= \
              -I$(SRCDIR)/backend \
              -I$(SRCDIR)/include \
-             -I$(LIBPQDIR) \
-             -I$(TCL_INCDIR)
+             -I$(LIBPQDIR)
 
 PORTNAME=@PORTNAME@