* unix/configure.in: Added missing stub related definitions.

* unix/Makefile.in: Install tkDecls.h in addition to tk.h.

* generic/tkStubLib.c: Added flags to ensure we are using Tcl
stub macros.

4 files changed, 39 insertions, 6 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index d681a6e..20be677 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.2.2.2 1999/03/12 03:12:44 stanton Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.2.2.3 1999/03/14 19:26:02 stanton Exp $
 
 library tk
 
@@ -1413,6 +1413,11 @@ declare 80 win {
 	    int dest_x, int dest_y, unsigned int width, \
 	    unsigned int height)
 }
+# This slot is reserved for use by the clipping rectangle patch:
+#  declare 81 win {
+#      XSetClipRectangles(Display *display, GC gc, int clip_x_origin, \
+#  	    int clip_y_origin, XRectangle rectangles[], int n, int ordering)
+#  }
 
 # X functions for Mac
 
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 0c9a02d..5bcf81b 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.2.2.1 1999/03/10 07:13:46 stanton Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.2.2.2 1999/03/14 19:26:03 stanton Exp $
  */
 
 /*
@@ -21,6 +21,11 @@
  */
 
 
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
+
 #ifndef USE_TK_STUBS
 #define USE_TK_STUBS
 #endif
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d5f415c..e32e01e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.1.4.8 1999/03/13 18:28:41 welch Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.1.4.9 1999/03/14 19:26:03 stanton Exp $
 
 # Current Tk version;  used in various names.
 
@@ -461,8 +461,11 @@ install-libraries:
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing tk.h"
-	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
+	    do \
+	    echo "Installing $$i"; \
+	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+	    done;
 	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
 	    do \
 	    echo "Installing $$i"; \
diff --git a/unix/configure.in b/unix/configure.in
index f0540cb..48d2c27 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.1.4.11 1999/03/11 00:48:54 redman Exp $
+# RCS: @(#) $Id: configure.in,v 1.1.4.12 1999/03/14 19:26:03 stanton Exp $
 
 TK_VERSION=8.1
 TK_MAJOR_VERSION=8
@@ -501,6 +501,26 @@ else
     TCL_STUB_FLAGS=""
 fi
 
+# Replace ${VERSION} with contents of ${TK_VERSION}
+eval "STUB_LIB_FILE=libtkstub${TCL_UNSHARED_LIB_SUFFIX}"
+# Replace DBGX with TCL_DBGX
+eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
+
+MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
+
+TK_STUB_LIB_FILE=${STUB_LIB_FILE}
+
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
+else
+    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}"
+fi
+
+TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"
+TK_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TK_STUB_LIB_FLAG}"
+TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
+TK_STUB_LIB_PATH="${exec_prefix}/lib/${TK_STUB_LIB_FILE}"
+
 AC_SUBST(STUB_LIB_FILE)
 
 AC_SUBST(TK_STUB_LIB_FILE)