Fixed typo in variable name

the Tcl stub library (TCL_STUB_LIB_SPEC was not being substituted in the
Makefile)

Makefile.in

@@ -0,0 +1,460 @@
+# Makefile.in --
+#
+#	This file is a Makefile for Sample TEA Extension.  If it has the name
+#	"Makefile.in" then it is a template for a Makefile;  to generate the
+#	actual Makefile, run "./configure", which is a configuration script
+#	generated by the "autoconf" program (constructs like "@foo@" will get
+#	replaced in the actual Makefile.
+#
+# Copyright (c) 1999 Scriptics Corporation.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: Makefile.in,v 1.9 2000/03/17 22:09:05 wart Exp $
+
+#========================================================================
+# Edit the following few lines when writing a new extension
+#========================================================================
+
+#========================================================================
+# Change the name of the variable "exampleA_LIB_FILE" to match the one
+# used in the configure script.  This is the parameterized name of the
+# library that we are building.
+#========================================================================
+
+lib_BINARIES=$(itk_LIB_FILE) $(itkstub_LIB_FILE)
+BINARIES=$(lib_BINARIES)
+
+#========================================================================
+# Enumerate the names of the source files included in this package.
+# This will be used when a dist target is added to the Makefile.
+#========================================================================
+
+WIN_DIR=$(srcdir)/win
+UNIX_DIR=$(srcdir)/unix
+GENERIC_DIR=$(srcdir)/generic
+PLATFORM_DIR=@PLATFORM_DIR@
+
+WIN_SOURCES=$(PLATFORM_DIR)/tclAppInit.c \
+	$(PLATFORM_DIR)/dllEntryPoint.c
+UNIX_SOURCES=$(PLATFORM_DIR)/tclAppInit.c
+GENERIC_SOURCES = $(GENERIC_DIR)/itk_cmds.c \
+	$(GENERIC_DIR)/itk_option.c \
+	$(GENERIC_DIR)/itk_archetype.c \
+	$(GENERIC_DIR)/itk_util.c \
+	$(GENERIC_DIR)/itkStubInit.c \
+	$(GENERIC_DIR)/itkStubLib.c 
+PLATFORM_SOURCES = @PLATFORM_SOURCES@
+itk_SOURCES = $(PLATFORM_SOURCES) $(GENERIC_SOURCES)
+SOURCES = $(itk_SOURCES)
+
+#========================================================================
+# Enumerate the names of the object files included in this package.
+# These objects are created and linked into the final library.  In
+# most cases these object files will correspond to the source files
+# above.
+#
+#========================================================================
+
+WIN_OBJECTS = dllEntryPoint.$(OBJEXT)
+UNIX_OBJECTS =
+GENERIC_OBJECTS = itk_cmds.$(OBJEXT) \
+	itk_option.$(OBJEXT) \
+	itk_archetype.$(OBJEXT) \
+	itk_util.$(OBJEXT) \
+	itkStubInit.$(OBJEXT) \
+	itkStubLib.$(OBJEXT) 
+PLATFORM_OBJECTS = @PLATFORM_OBJECTS@
+itk_OBJECTS = $(PLATFORM_OBJECTS) $(GENERIC_OBJECTS)
+itkstub_OBJECTS = itkStubLib.$(OBJEXT)
+OBJECTS = $(itk_OBJECTS) $(itkstub_OBJECTS)
+
+#========================================================================
+# The substitution of "exampleA_LIB_FILE" into the variable name below
+# let's us refer to the objects for the library without knowing the name
+# of the library in advance.  It also lets us use the "$@" variable in
+# the rule for building the library, so we can refer to both the list of 
+# objects and the library itself in a platform-independent manner.
+#========================================================================
+
+itk_LIB_FILE = @itk_LIB_FILE@
+$(itk_LIB_FILE)_OBJECTS = $(itk_OBJECTS)
+
+itkstub_LIB_FILE = @itkstub_LIB_FILE@
+$(itkstub_LIB_FILE)_OBJECTS = $(itkstub_OBJECTS)
+
+itclstub_LIB_FILE = @itclstub_LIB_FILE@
+
+tkstub_LIB_SPEC = @tkstub_LIB_SPEC@
+
+#========================================================================
+# This is a list of header files to be installed
+#========================================================================
+
+GENERIC_HDRS= \
+	$(srcdir)/generic/itk.h
+
+#========================================================================
+# Add additional lines to handle any additional AC_SUBST cases that
+# have been added to the configure script.
+#========================================================================
+
+SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
+
+ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
+
+ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@
+ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@
+ITK_WIN_DIR_NATIVE = @ITK_WIN_DIR_NATIVE@
+
+#========================================================================
+# Nothing of the variables below this line need to be changed.  Please
+# check the TARGETS section below to make sure the make targets are
+# correct.
+#========================================================================
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
+pkglibdir = $(libdir)/@PACKAGE@@VERSION@
+pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
+
+top_builddir = .
+
+INSTALL = $(top_srcdir)/../config/install-sh -c
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+CC = @CC@
+CFLAGS_DEBUG = @CFLAGS_DEBUG@
+CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
+CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
+CLEANFILES = @CLEANFILES@
+EXEEXT = @EXEEXT@
+LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
+LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
+MAKE_LIB = @MAKE_LIB@
+MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+OBJEXT = @OBJEXT@
+RANLIB = @RANLIB@
+SHLIB_CFLAGS = @SHLIB_CFLAGS@
+SHLIB_LD = @SHLIB_LD@
+SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+STLIB_LD = @STLIB_LD@
+TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_DEFS = @TCL_DEFS@
+TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@
+TCL_LD_FLAGS = @TCL_LD_FLAGS@
+TCL_LIBS = @TCL_LIBS@
+TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@
+TCL_SRC_DIR = @TCL_SRC_DIR@
+TCL_DBGX = @TCL_DBGX@
+TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
+TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+TCL_TOOL_DIR_NATIVE = @TCL_TOOL_DIR_NATIVE@
+TCL_TOP_DIR_NATIVE = @TCL_TOP_DIR_NATIVE@
+TCL_UNIX_DIR_NATIVE = @TCL_UNIX_DIR_NATIVE@
+TCL_WIN_DIR_NATIVE = @TCL_WIN_DIR_NATIVE@
+INCLUDE_DIR_NATIVE = @INCLUDE_DIR_NATIVE@
+TCL_BMAP_DIR_NATIVE = @TCL_BMAP_DIR_NATIVE@
+TCL_PLATFORM_DIR_NATIVE = @TCL_PLATFORM_DIR_NATIVE@
+TCL_GENERIC_DIR_NATIVE = @TCL_GENERIC_DIR_NATIVE@
+TK_TOP_DIR_NATIVE = $(TK_SRC_DIR)
+TK_SRC_DIR = @TK_SRC_DIR@
+TCLSH_PROG = @TCLSH_PROG@
+TK_XINCLUDES = @TK_XINCLUDES@
+TCL_INCLUDES = @TCL_INCLUDES@
+TK_INCLUDES = @TK_INCLUDES@
+ITCL_INCLUDES = @ITCL_INCLUDES@
+ITK_INCLUDES = @ITCL_INCLUDES@ @ITK_INCLUDES@ @TK_XINCLUDES@
+
+AUTOCONF = autoconf
+
+LDFLAGS = $(LDFLAGS_DEFAULT)
+
+INCLUDES = @TCL_INCLUDES@ @TK_INCLUDES@ $(ITK_INCLUDES)
+
+EXTRA_CFLAGS = $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) $(NO_DEPRECATED_FLAGS) $(TCL_EXTRA_CFLAGS)
+
+DEFS = @DEFS@ $(EXTRA_CFLAGS) -DITK_LIBRARY=\"$(ITK_LIBRARY)\"
+
+ACLOCAL_M4 = $(srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+
+CPPFLAGS = @CPPFLAGS@
+LIBS = @LIBS@
+AR = ar
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+
+#========================================================================
+# Start of user-definable TARGETS section
+#========================================================================
+
+#========================================================================
+# TEA TARGETS.  Please note that the "libraries:" target refers to platform
+# independent files, and the "binaries:" target inclues executable programs and
+# platform-dependent libraries.  Modify these targets so that they install
+# the various pieces of your package.  The make and install rules
+# for the BINARIES that you specified above have already been done.
+#========================================================================
+
+all: binaries libraries doc
+
+#========================================================================
+# The binaries target builds executable programs, Windows .dll's, unix
+# shared/static libraries, and any other platform-dependent files.
+# The list of targets to build for "binaries:" is specified at the top
+# of the Makefile, in the "BINARIES" variable.
+#========================================================================
+
+binaries: $(BINARIES)
+
+libraries:
+
+doc:
+
+install: all install-binaries install-libraries install-doc
+
+install-binaries: binaries install-lib-binaries install-bin-binaries
+
+#========================================================================
+# This rule installs platform-independent files, such as header files.
+#========================================================================
+
+install-libraries: libraries
+	$(mkinstalldirs) $(includedir)
+	@echo "Installing header files in $(includedir)"
+	@for i in $(GENERIC_HDRS) ; do \
+	    echo "Installing $$i" ; \
+	    $(INSTALL_DATA) $$i $(includedir) ; \
+	done;
+	@echo "Installing library files in $(ITK_LIBRARY)"
+	@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
+	    echo "Installing $$i" ; \
+	    $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
+	done;
+
+#========================================================================
+# Install documentation.  Unix manpages should go in the $(mandir)
+# directory.
+#========================================================================
+
+install-doc: doc
+	$(mkinstalldirs) $(mandir)/mann
+	@echo "Installing man pages in $(mandir)"
+	@for i in $(srcdir)/doc/*.n; \
+	    do \
+	    echo "Installing $$i"; \
+	    rm -f $(mandir)/mann/$$i; \
+	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
+	    done
+
+test:
+
+depend:
+
+#========================================================================
+# Enumerate the names of the object files included in this package.
+# These objects are created and linked into the final library.  In
+# most cases these object files will correspond to the source files
+# above.
+#
+# $(exampleA_LIB_FILE) should be listed as part of the BINARIES variable
+# at the top of the Makefile.  That will ensure that this target is built
+# when you run "make binaries".
+#
+# You shouldn't need to modify this target, except to change the package
+# name from "exampleA" to your package's name.
+#========================================================================
+
+$(itk_LIB_FILE): $(itk_OBJECTS)
+	-rm -f $(itk_LIB_FILE)
+	@MAKE_LIB@
+	$(RANLIB) $(itk_LIB_FILE)
+
+$(itkstub_LIB_FILE): $(itkstub_OBJECTS)
+	-rm -f $(itkstub_LIB_FILE)
+	@MAKE_STATIC_LIB@
+	$(RANLIB) $(itkstub_LIB_FILE)
+
+#========================================================================
+# We need to enumerate the list of .c to .o lines here.
+# Unfortunately, there does not seem to be any other way to do this
+# in a Makefile-independent way.  We can't use VPATH because it picks up
+# object files that may be located in the source directory.
+#
+# In the following lines, $(srcdir) refers to the toplevel directory
+# containing your extension.  If your sources are in a subdirectory,
+# you will have to modify the paths to reflect this:
+#
+# exampleA.$(OBJEXT): $(srcdir)/src/win/exampleA.c
+# 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/src/win/exampleA.c` -o $@
+#========================================================================
+
+dllEntryPoint.$(OBJEXT): $(WIN_DIR)/dllEntryPoint.c
+	$(COMPILE) -c `@CYGPATH@ $(WIN_DIR)/dllEntryPoint.c` -o $@
+
+tclAppInit.$(OBJEXT): $(PLATFORM_DIR)/tclAppInit.c
+	$(COMPILE) -c `@CYGPATH@ $(PLATFORM_DIR)/tclAppInit.c` -o $@
+
+itkStubInit.$(OBJEXT): $(GENERIC_DIR)/itkStubInit.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itkStubInit.c` -o $@
+
+itkStubLib.$(OBJEXT): $(GENERIC_DIR)/itkStubLib.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itkStubLib.c` -o $@
+
+itk_cmds.$(OBJEXT): $(GENERIC_DIR)/itk_cmds.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_cmds.c` -o $@
+
+itk_option.$(OBJEXT): $(GENERIC_DIR)/itk_option.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_option.c` -o $@
+
+itk_archetype.$(OBJEXT): $(GENERIC_DIR)/itk_archetype.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_archetype.c` -o $@
+
+itk_util.$(OBJEXT): $(GENERIC_DIR)/itk_util.c
+	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_util.c` -o $@
+
+
+#========================================================================
+# End of user-definable section
+#========================================================================
+
+#========================================================================
+# Don't modify the file to clean here.  Instead, set the "CLEANFILES"
+# variable in configure.in
+#========================================================================
+
+clean:  
+	-test -z "$(BINARIES)" || rm -f $(BINARIES)
+	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean: clean
+	-rm -f *.tab.c
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f config.status
+
+#========================================================================
+# Install binary object libraries.  On Windows this includes both .dll and
+# .lib files.  Because the .lib files are not explicitly listed anywhere,
+# we need to deduce their existence from the .dll file of the same name.
+# Additionally, the .dll files go into the bin directory, but the .lib
+# files go into the lib directory.  On Unix platforms, all library files
+# go into the lib directory.  In addition, this will generate the pkgIndex.tcl
+# file in the install location (assuming it can find a usable tclsh8.2 shell)
+#
+# You should not have to modify this target.
+#========================================================================
+
+install-lib-binaries: installdirs
+	@list='$(lib_BINARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+	    if test "x$$ext" = "xdll"; then \
+	        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
+	        $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
+		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+		if test -f $$lib; then \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+		fi; \
+	    else \
+		echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	        $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+	    fi; \
+	  else :; fi; \
+	done
+	@list='$(lib_BINARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(RANLIB) $(DESTDIR)$(bindir)/$$p"; \
+	    $(RANLIB) $(DESTDIR)$(bindir)/$$p; \
+	  else :; fi; \
+	done
+	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+
+#========================================================================
+# Install binary executables (e.g. .exe files)
+#
+# You should not have to modify this target.
+#========================================================================
+
+install-bin-binaries: installdirs
+	@list='$(bin_BINARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
+	  else :; fi; \
+	done
+
+.SUFFIXES: .c .o .obj
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+#	$(SHELL) ./config.status --recheck
+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+#	cd $(srcdir) && $(AUTOCONF)
+
+
+uninstall-binaries:
+	@$(NORMAL_UNINSTALL)
+	list='$(BINARIES)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
+
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(libdir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+	$(mkinstalldirs)  $(ITK_LIBRARY)
+
+.PHONY: all binaries clean depend distclean doc install installdirs \
+libraries test
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

aclocal.m4

@@ -0,0 +1 @@
+builtin(include,../tcl.m4)

configure.in

@@ -0,0 +1,360 @@
+#--------------------------------------------------------------------
+# Sample configure.in for Tcl Extensions.  The only places you should
+# need to modify this file are marked by the string __CHANGE__
+#--------------------------------------------------------------------
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# This very first macro is used to verify that the configure script can 
+# find the sources.  The argument to AC_INIT should be a unique filename
+# for this package, and can be a relative path, such as:
+#
+# AC_INIT(../generic/tcl.h)
+#--------------------------------------------------------------------
+
+AC_INIT(generic/itk.h)
+AC_CONFIG_AUX_DIR(../config)
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# Set your package name and version numbers here.  The NODOT_VERSION is
+# required for constructing the library name on systems that don't like
+# dots in library names (Windows).  The VERSION variable is used on the
+# other systems.
+#--------------------------------------------------------------------
+
+PACKAGE=itk
+
+MAJOR_VERSION=3
+MINOR_VERSION=1
+PATCHLEVEL=.0
+
+VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
+NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION}
+
+
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
+#--------------------------------------------------------------------
+# We put this here so that you can compile with -DVERSION="1.2" to
+# encode the package version directly into the source files.
+#--------------------------------------------------------------------
+
+eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
+
+#--------------------------------------------------------------------
+# Check whether --enable-gcc or --disable-gcc was given.  Do this 
+# before AC_CYGWIN is called so the compiler can 
+# be fully tested by built-in autoconf tools.
+# This macro also calls AC_PROG_CC to set the compiler if --enable-gcc
+# was not used.
+#--------------------------------------------------------------------
+
+SC_ENABLE_GCC
+AC_PROG_INSTALL
+
+#--------------------------------------------------------------------
+# Checks to see if the make program sets the $MAKE variable.
+#--------------------------------------------------------------------
+
+AC_PROG_MAKE_SET
+
+#--------------------------------------------------------------------
+# Find ranlib
+#--------------------------------------------------------------------
+
+AC_PROG_RANLIB
+
+#--------------------------------------------------------------------
+# This macro performs additional compiler tests.
+#--------------------------------------------------------------------
+
+AC_CYGWIN
+
+#--------------------------------------------------------------------
+# Determines the correct binary file extension (.o, .obj, .exe etc.)
+#--------------------------------------------------------------------
+
+AC_OBJEXT
+AC_EXEEXT
+
+#--------------------------------------------------------------------
+# "cygpath" is used on windows to generate native path names for include
+# files.
+# These variables should only be used with the compiler and linker since
+# they generate native path names.
+#
+# Unix tclConfig.sh points SRC_DIR at the top-level directory of
+# the Tcl sources, while the Windows tclConfig.sh points SRC_DIR at
+# the win subdirectory.  Hence the different usages of SRC_DIR below.
+#
+# This must be done before calling SC_PUBLIC_TCL_HEADERS
+#--------------------------------------------------------------------
+
+case "`uname -s`" in
+    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
+	CYGPATH="cygpath -w"
+	RELPATH=".. .. bin"
+    ;;
+    *)
+	CYGPATH=echo
+	RELPATH=..
+    ;;
+esac
+
+AC_SUBST(CYGPATH)
+AC_SUBST(RELPATH)
+
+#--------------------------------------------------------------------
+# Includes for this package
+#--------------------------------------------------------------------
+
+ITK_GENERIC_DIR_NATIVE=`${CYGPATH} ${srcdir}/generic`
+ITK_WIN_DIR_NATIVE=`${CYGPATH} ${srcdir}/win`
+ITK_UNIX_DIR_NATIVE=`${CYGPATH} ${srcdir}/unix`
+
+case "`uname -s`" in
+    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
+	ITK_PLATFORM_DIR_NATIVE=${ITK_WIN_DIR_NATIVE}
+    ;;
+    *)
+	ITK_PLATFORM_DIR_NATIVE=${ITK_UNIX_DIR_NATIVE}
+    ;;
+esac
+
+ITK_INCLUDES="-I\"${ITK_GENERIC_DIR_NATIVE}\" -I\"${ITK_PLATFORM_DIR_NATIVE}\""
+
+AC_SUBST(ITK_GENERIC_DIR_NATIVE)
+AC_SUBST(ITK_WIN_DIR_NATIVE)
+AC_SUBST(ITK_UNIX_DIR_NATIVE)
+AC_SUBST(ITK_INCLUDES)
+
+#--------------------------------------------------------------------
+# Load the tclConfig.sh file
+#--------------------------------------------------------------------
+
+SC_PATH_TCLCONFIG
+SC_LOAD_TCLCONFIG
+
+#--------------------------------------------------------------------
+# Load the tkConfig.sh file
+#--------------------------------------------------------------------
+
+SC_PATH_TKCONFIG
+SC_LOAD_TKCONFIG
+
+AC_ARG_WITH(itcl, [  --with-itclinclude=DIR          use Itcl headers from DIR],
+        ITCL_LIB_DIR=$withval, ITCL_LIB_DIR=`cd ${srcdir}/../itcl; pwd`)
+
+if test ! -r "${ITCL_LIB_DIR}/generic/itclInt.h" ; then
+    AC_MSG_ERROR(Can't find Itcl private header files.  Use --with-itclinclude to specify the directory containing the Itcl private headers on your system.)
+fi
+
+ITCL_INCLUDES=-I\"`${CYGPATH} ${ITCL_LIB_DIR}/generic`\"
+AC_SUBST(ITCL_INCLUDES)
+
+#--------------------------------------------------------------------
+# The value for this should have been cached during the Itcl configuration.
+# Make sure the cache-ID that appears here is the same as the one that
+# appears in the Itcl configure script.
+#--------------------------------------------------------------------
+
+AC_MSG_CHECKING(for name if Itcl stub library)
+AC_CACHE_VAL(ac_cv_itclstub_LIB_FILE, ac_cv_itclstub_LIB_FILE="NONE")
+if test x"${ac_cv_itclstub_LIB_FILE}" = x"NONE" ; then
+    AC_MSG_ERROR(Can't find name of Itcl stub library.  How did this happen?)
+else
+    AC_MSG_RESULT(${ac_cv_itclstub_LIB_FILE})
+fi
+itclstub_LIB_FILE=${ac_cv_itclstub_LIB_FILE}
+AC_SUBST(itclstub_LIB_FILE)
+
+SC_LIB_SPEC(tkstub, ${TK_BIN_DIR})
+AC_SUBST(tkstub_LIB_SPEC)
+
+SC_LIB_SPEC(itclstub, ../itcl)
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# Choose which headers you need.  Extension authors should try very
+# hard to only rely on the Tcl public header files.  Internal headers
+# contain private data structures and are subject to change without
+# notice.
+# This must be done AFTER calling SC_PATH_TCLCONFIG/SC_LOAD_TCLCONFIG
+# so that we can extract TCL_SRC_DIR from the config file (in the case
+# of private headers
+#--------------------------------------------------------------------
+
+#SC_PUBLIC_TCL_HEADERS
+SC_PRIVATE_TCL_HEADERS
+
+#SC_PUBLIC_TK_HEADERS
+SC_PRIVATE_TK_HEADERS
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# A few miscellaneous platform-specific items:
+#
+# Define a special symbol for Windows (BUILD_itk in this case) so
+# that we create the export library with the dll.  See sha1.h on how
+# to use this.
+#
+# Windows creates a few extra files that need to be cleaned up.
+# You can add more files to clean if your extension creates any extra
+# files.
+#
+# Define any extra compiler flags in the PACKAGE_CFLAGS variable.
+# These will be appended to the current set of compiler flags for
+# your system.
+#--------------------------------------------------------------------
+
+case "`uname -s`" in
+    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
+	AC_DEFINE_UNQUOTED(BUILD_${PACKAGE})
+	CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch"
+	PLATFORM_SOURCES='$(WIN_SOURCES)'
+	PLATFORM_OBJECTS='$(WIN_OBJECTS)'
+	PLATFORM_DIR='$(WIN_DIR)'
+    ;;
+    *)
+	CLEANFILES=
+	PLATFORM_SOURCES='$(UNIX_SOURCES)'
+	PLATFORM_OBJECTS='$(UNIX_OBJECTS)'
+	PLATFORM_DIR='$(UNIX_DIR)'
+    ;;
+esac
+
+AC_SUBST(CLEANFILES)
+AC_SUBST(PLATFORM_SOURCES)
+AC_SUBST(PLATFORM_OBJECTS)
+AC_SUBST(PLATFORM_DIR)
+
+#--------------------------------------------------------------------
+# Check whether --enable-threads or --disable-threads was given.
+# So far only Tcl responds to this one.
+#--------------------------------------------------------------------
+
+SC_ENABLE_THREADS
+
+#--------------------------------------------------------------------
+# The statement below defines a collection of symbols related to
+# building as a shared library instead of a static library.
+#--------------------------------------------------------------------
+
+SC_ENABLE_SHARED
+
+#--------------------------------------------------------------------
+# This macro figures out what flags to use with the compiler/linker
+# when building shared/static debug/optimized objects.  This information
+# is all taken from the tclConfig.sh file.
+#--------------------------------------------------------------------
+
+CFLAGS_DEBUG=${TCL_CFLAGS_DEBUG}
+CFLAGS_OPTIMIZE=${TCL_CFLAGS_OPTIMIZE}
+LDFLAGS_DEBUG=${TCL_LDFLAGS_DEBUG}
+LDFLAGS_OPTIMIZE=${TCL_LDFLAGS_OPTIMIZE}
+SHLIB_LD=${TCL_SHLIB_LD}
+STLIB_LD=${TCL_STLIB_LD}
+SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
+
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(STLIB_LD)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LDFLAGS)
+
+#--------------------------------------------------------------------
+# Set the default compiler switches based on the --enable-symbols 
+# option.
+#--------------------------------------------------------------------
+
+SC_ENABLE_SYMBOLS
+
+if test "${SHARED_BUILD}" = "1" ; then
+    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
+else
+    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
+fi
+
+#--------------------------------------------------------------------
+# Everyone should be linking against the Tcl stub library.  If you
+# can't for some reason, remove this definition.  If you aren't using
+# stubs, you also need to modify the SHLIB_LD_LIBS setting below to
+# link against the non-stubbed Tcl library.
+#--------------------------------------------------------------------
+
+AC_DEFINE(USE_TCL_STUBS)
+AC_DEFINE(USE_TK_STUBS)
+AC_DEFINE(USE_ITCL_STUBS)
+
+#--------------------------------------------------------------------
+# This macro generates a line to use when building a library.  It
+# depends on values set by the SC_ENABLE_SHARED, SC_ENABLE_SYMBOLS,
+# and SC_LOAD_TCLCONFIG macros above.
+#--------------------------------------------------------------------
+
+SC_MAKE_LIB
+
+#--------------------------------------------------------------------
+# eval these two values to dereference the ${DBGX} variable.
+#--------------------------------------------------------------------
+
+eval "SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
+eval "UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
+
+#--------------------------------------------------------------------
+# Shared libraries and static libraries have different names.
+#--------------------------------------------------------------------
+
+case "`uname -s`" in
+    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
+	if test "${SHARED_BUILD}" = "1" ; then
+	    SHLIB_LD_LIBS="\"`cygpath -w ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\" ${TCL_SHLIB_LD_LIBS} \"`${CYGPATH} ../itcl/${itclstub_LIB_FILE}`\" ${tkstub_LIB_SPEC} "
+	    eval "${PACKAGE}_LIB_FILE=${PACKAGE}${SHARED_LIB_SUFFIX}"
+	    RANLIB=:
+	else
+	    eval "${PACKAGE}_LIB_FILE=${PACKAGE}${UNSHARED_LIB_SUFFIX}"
+	fi
+	eval "${PACKAGE}stub_LIB_FILE=${PACKAGE}stub${UNSHARED_LIB_SUFFIX}"
+	;;
+    *)
+	if test "${SHARED_BUILD}" = "1" ; then
+	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
+	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
+	    RANLIB=:
+	else
+	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}"
+	fi
+	eval "${PACKAGE}stub_LIB_FILE=lib${PACKAGE}stub${UNSHARED_LIB_SUFFIX}"
+	;;
+esac
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# Change the name from exampeA_LIB_FILE to match your package name.
+# Use the stub_LIB_FILE substitution if your package creates a stub
+# library.
+#--------------------------------------------------------------------
+
+AC_SUBST(itkstub_LIB_FILE)
+AC_SUBST(itk_LIB_FILE)
+AC_SUBST(SHLIB_LD_LIBS)
+
+#--------------------------------------------------------------------
+# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
+# file during the install process.  Don't run the TCLSH_PROG through
+# ${CYGPATH} because it's being used directly by make.
+# Require that we use a tclsh shell version 8.2 or later since earlier
+# versions have bugs in the pkg_mkIndex routine.
+#--------------------------------------------------------------------
+
+SC_PROG_TCLSH
+
+#--------------------------------------------------------------------
+# Finally, substitute all of the various values into the Makefile.
+#--------------------------------------------------------------------
+
+AC_OUTPUT([Makefile \
+	pkgIndex.tcl])

generic/itk.decls

@@ -0,0 +1,111 @@
+# itk.decls --
+#
+#	This file contains the declarations for all supported public
+#	functions that are exported by the Itk library via the stubs table.
+#	This file is used to generate the itkDecls.h file.
+#	
+#
+# Copyright (c) 1998-1999 by XXXX
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# 
+# RCS: 
+
+library itk
+interface itk
+
+# Declare each of the functions in the public Itk interface.  Note that
+# the an index should never be reused for a different function in order
+# to preserve backwards compatibility.
+
+
+#
+#  Exported functions:
+#
+
+declare 0 generic {
+    int Itk_Init (Tcl_Interp *interp)
+}
+#declare 1 generic {
+#    int Itk_SafeInit (Tcl_Interp *interp)
+#}
+
+
+#
+#  Functions used internally by this package:
+#
+
+declare 2 generic {
+    int Itk_ConfigBodyCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *CONST objv[])
+}
+declare 3 generic {
+    int Itk_UsualCmd (ClientData cdata, Tcl_Interp *interp, int objc, \
+        Tcl_Obj *CONST objv[])
+}
+
+
+#
+#  Functions for managing options included in class definitions:
+#
+
+declare 4 generic {
+    int Itk_ClassOptionDefineCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *CONST objv[])
+}
+declare 5 generic {
+    int Itk_ClassOptionIllegalCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *CONST objv[])
+}
+declare 6 generic {
+    int Itk_ConfigClassOption (Tcl_Interp *interp, ItclObject *contextObj, \
+        ClientData cdata, char* newVal)
+}
+declare 7 generic {
+    ItkClassOptTable* Itk_CreateClassOptTable( Tcl_Interp *interp, \
+        ItclClass *cdefn)
+}
+declare 8 generic {
+    ItkClassOptTable* Itk_FindClassOptTable (ItclClass *cdefn)
+}
+#declare 9 generic {
+#    void Itk_DeleteClassOptTable (Tcl_Interp *interp, ItclClass *cdefn)
+#}
+declare 10 generic {
+    int Itk_CreateClassOption (Tcl_Interp *interp, ItclClass *cdefn, \
+        char *switchName, char *resName, char *resClass, char *defVal, \
+        char *config, ItkClassOption **optPtr)
+}
+declare 11 generic {
+    ItkClassOption* Itk_FindClassOption (ItclClass *cdefn, char *switchName)
+}
+declare 12 generic {
+    void Itk_DelClassOption (ItkClassOption *opt)
+}
+
+
+#
+#  Functions needed for the Archetype base class:
+#
+
+declare 13 generic {
+    int Itk_ArchetypeInit (Tcl_Interp* interp)
+}
+
+
+#
+#  Functions for maintaining the ordered option list:
+#
+
+declare 14 generic {
+    void Itk_OptListInit (ItkOptList* olist, Tcl_HashTable *options)
+}
+declare 15 generic {
+    void Itk_OptListFree (ItkOptList* olist)
+}
+declare 16 generic {
+    void Itk_OptListAdd (ItkOptList* olist, Tcl_HashEntry *entry)
+}
+declare 17 generic {
+    void Itk_OptListRemove (ItkOptList* olist, Tcl_HashEntry *entry)
+}

generic/itk.h

@@ -38,7 +38,7 @@
  *           mmclennan@lucent.com
  *           http://www.tcltk.com/itcl
  *
- *     RCS:  $Id: itk.h,v 1.4 1998/08/11 14:40:54 welch Exp $
+ *     RCS:  $Id: itk.h,v 1.5 1999/05/24 21:10:47 redman Exp $
  * ========================================================================
  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
  * ------------------------------------------------------------------------
@@ -93,62 +93,7 @@ typedef struct ItkClassOption {
     char *init;                   /* initial value for option */
 } ItkClassOption;
 
-
-/*
- *  Exported functions:
- */
-EXTERN int Itk_Init _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int Itk_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
-
-/*
- *  Functions used internally by this package:
- */
-EXTERN int Itk_ConfigBodyCmd _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int Itk_UsualCmd _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-
-/*
- *  Functions for managing options included in class definitions:
- */
-EXTERN int Itk_ClassOptionDefineCmd _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int Itk_ClassOptionIllegalCmd _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-
-EXTERN int Itk_ConfigClassOption _ANSI_ARGS_((Tcl_Interp *interp,
-    ItclObject *contextObj, ClientData cdata, char* newVal));
-
-EXTERN ItkClassOptTable* Itk_CreateClassOptTable _ANSI_ARGS_((
-    Tcl_Interp *interp, ItclClass *cdefn));
-EXTERN ItkClassOptTable* Itk_FindClassOptTable _ANSI_ARGS_((
-    ItclClass *cdefn));
-EXTERN void Itk_DeleteClassOptTable _ANSI_ARGS_((Tcl_Interp *interp,
-    ItclClass *cdefn));
-
-EXTERN int Itk_CreateClassOption _ANSI_ARGS_((Tcl_Interp *interp,
-    ItclClass *cdefn, char *switchName, char *resName, char *resClass,
-    char *defVal, char *config, ItkClassOption **optPtr));
-EXTERN ItkClassOption* Itk_FindClassOption _ANSI_ARGS_((
-    ItclClass *cdefn, char *switchName));
-EXTERN void Itk_DelClassOption _ANSI_ARGS_((ItkClassOption *opt));
-
-/*
- *  Functions needed for the Archetype base class:
- */
-EXTERN int Itk_ArchetypeInit _ANSI_ARGS_((Tcl_Interp* interp));
-
-/*
- *  Functions for maintaining the ordered option list:
- */
-EXTERN void Itk_OptListInit _ANSI_ARGS_((ItkOptList* olist,
-    Tcl_HashTable *options));
-EXTERN void Itk_OptListFree _ANSI_ARGS_((ItkOptList* olist));
-
-EXTERN void Itk_OptListAdd _ANSI_ARGS_((ItkOptList* olist,
-    Tcl_HashEntry *entry));
-EXTERN void Itk_OptListRemove _ANSI_ARGS_((ItkOptList* olist,
-    Tcl_HashEntry *entry));
+#include "itkDecls.h"
 
 # undef TCL_STORAGE_CLASS
 # define TCL_STORAGE_CLASS DLLIMPORT

generic/itkDecls.h

@@ -0,0 +1,202 @@
+/*
+ * itkDecls.h --
+ *
+ *	Declarations of functions in the platform independent public Tcl API.
+ *
+ * Copyright (c) 1998-1999 by XXXX
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS:
+ */
+
+#ifndef _ITKDECLS
+#define _ITKDECLS
+
+#ifdef BUILD_itk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+/*
+ * WARNING: This file is automatically generated by the tools/genStubs.tcl
+ * script.  Any modifications to the function declarations below should be made
+ * in the generic/tk.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+/*
+ * Exported function declarations:
+ */
+
+/* 0 */
+EXTERN int		Itk_Init _ANSI_ARGS_((Tcl_Interp * interp));
+/* Slot 1 is reserved */
+/* 2 */
+EXTERN int		Itk_ConfigBodyCmd _ANSI_ARGS_((ClientData cdata, 
+				Tcl_Interp * interp, int objc, 
+				Tcl_Obj *CONST objv[]));
+/* 3 */
+EXTERN int		Itk_UsualCmd _ANSI_ARGS_((ClientData cdata, 
+				Tcl_Interp * interp, int objc, 
+				Tcl_Obj *CONST objv[]));
+/* 4 */
+EXTERN int		Itk_ClassOptionDefineCmd _ANSI_ARGS_((
+				ClientData cdata, Tcl_Interp * interp, 
+				int objc, Tcl_Obj *CONST objv[]));
+/* 5 */
+EXTERN int		Itk_ClassOptionIllegalCmd _ANSI_ARGS_((
+				ClientData cdata, Tcl_Interp * interp, 
+				int objc, Tcl_Obj *CONST objv[]));
+/* 6 */
+EXTERN int		Itk_ConfigClassOption _ANSI_ARGS_((
+				Tcl_Interp * interp, ItclObject * contextObj, 
+				ClientData cdata, char* newVal));
+/* 7 */
+EXTERN ItkClassOptTable* Itk_CreateClassOptTable _ANSI_ARGS_((
+				Tcl_Interp * interp, ItclClass * cdefn));
+/* 8 */
+EXTERN ItkClassOptTable* Itk_FindClassOptTable _ANSI_ARGS_((
+				ItclClass * cdefn));
+/* Slot 9 is reserved */
+/* 10 */
+EXTERN int		Itk_CreateClassOption _ANSI_ARGS_((
+				Tcl_Interp * interp, ItclClass * cdefn, 
+				char * switchName, char * resName, 
+				char * resClass, char * defVal, 
+				char * config, ItkClassOption ** optPtr));
+/* 11 */
+EXTERN ItkClassOption*	Itk_FindClassOption _ANSI_ARGS_((ItclClass * cdefn, 
+				char * switchName));
+/* 12 */
+EXTERN void		Itk_DelClassOption _ANSI_ARGS_((ItkClassOption * opt));
+/* 13 */
+EXTERN int		Itk_ArchetypeInit _ANSI_ARGS_((Tcl_Interp* interp));
+/* 14 */
+EXTERN void		Itk_OptListInit _ANSI_ARGS_((ItkOptList* olist, 
+				Tcl_HashTable * options));
+/* 15 */
+EXTERN void		Itk_OptListFree _ANSI_ARGS_((ItkOptList* olist));
+/* 16 */
+EXTERN void		Itk_OptListAdd _ANSI_ARGS_((ItkOptList* olist, 
+				Tcl_HashEntry * entry));
+/* 17 */
+EXTERN void		Itk_OptListRemove _ANSI_ARGS_((ItkOptList* olist, 
+				Tcl_HashEntry * entry));
+
+typedef struct ItkStubs {
+    int magic;
+    struct ItkStubHooks *hooks;
+
+    int (*itk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 0 */
+    void *reserved1;
+    int (*itk_ConfigBodyCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 2 */
+    int (*itk_UsualCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 3 */
+    int (*itk_ClassOptionDefineCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 4 */
+    int (*itk_ClassOptionIllegalCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 5 */
+    int (*itk_ConfigClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclObject * contextObj, ClientData cdata, char* newVal)); /* 6 */
+    ItkClassOptTable* (*itk_CreateClassOptTable) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn)); /* 7 */
+    ItkClassOptTable* (*itk_FindClassOptTable) _ANSI_ARGS_((ItclClass * cdefn)); /* 8 */
+    void *reserved9;
+    int (*itk_CreateClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn, char * switchName, char * resName, char * resClass, char * defVal, char * config, ItkClassOption ** optPtr)); /* 10 */
+    ItkClassOption* (*itk_FindClassOption) _ANSI_ARGS_((ItclClass * cdefn, char * switchName)); /* 11 */
+    void (*itk_DelClassOption) _ANSI_ARGS_((ItkClassOption * opt)); /* 12 */
+    int (*itk_ArchetypeInit) _ANSI_ARGS_((Tcl_Interp* interp)); /* 13 */
+    void (*itk_OptListInit) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashTable * options)); /* 14 */
+    void (*itk_OptListFree) _ANSI_ARGS_((ItkOptList* olist)); /* 15 */
+    void (*itk_OptListAdd) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 16 */
+    void (*itk_OptListRemove) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 17 */
+} ItkStubs;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern ItkStubs *itkStubsPtr;
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS)
+
+/*
+ * Inline function declarations:
+ */
+
+#ifndef Itk_Init
+#define Itk_Init \
+	(itkStubsPtr->itk_Init) /* 0 */
+#endif
+/* Slot 1 is reserved */
+#ifndef Itk_ConfigBodyCmd
+#define Itk_ConfigBodyCmd \
+	(itkStubsPtr->itk_ConfigBodyCmd) /* 2 */
+#endif
+#ifndef Itk_UsualCmd
+#define Itk_UsualCmd \
+	(itkStubsPtr->itk_UsualCmd) /* 3 */
+#endif
+#ifndef Itk_ClassOptionDefineCmd
+#define Itk_ClassOptionDefineCmd \
+	(itkStubsPtr->itk_ClassOptionDefineCmd) /* 4 */
+#endif
+#ifndef Itk_ClassOptionIllegalCmd
+#define Itk_ClassOptionIllegalCmd \
+	(itkStubsPtr->itk_ClassOptionIllegalCmd) /* 5 */
+#endif
+#ifndef Itk_ConfigClassOption
+#define Itk_ConfigClassOption \
+	(itkStubsPtr->itk_ConfigClassOption) /* 6 */
+#endif
+#ifndef Itk_CreateClassOptTable
+#define Itk_CreateClassOptTable \
+	(itkStubsPtr->itk_CreateClassOptTable) /* 7 */
+#endif
+#ifndef Itk_FindClassOptTable
+#define Itk_FindClassOptTable \
+	(itkStubsPtr->itk_FindClassOptTable) /* 8 */
+#endif
+/* Slot 9 is reserved */
+#ifndef Itk_CreateClassOption
+#define Itk_CreateClassOption \
+	(itkStubsPtr->itk_CreateClassOption) /* 10 */
+#endif
+#ifndef Itk_FindClassOption
+#define Itk_FindClassOption \
+	(itkStubsPtr->itk_FindClassOption) /* 11 */
+#endif
+#ifndef Itk_DelClassOption
+#define Itk_DelClassOption \
+	(itkStubsPtr->itk_DelClassOption) /* 12 */
+#endif
+#ifndef Itk_ArchetypeInit
+#define Itk_ArchetypeInit \
+	(itkStubsPtr->itk_ArchetypeInit) /* 13 */
+#endif
+#ifndef Itk_OptListInit
+#define Itk_OptListInit \
+	(itkStubsPtr->itk_OptListInit) /* 14 */
+#endif
+#ifndef Itk_OptListFree
+#define Itk_OptListFree \
+	(itkStubsPtr->itk_OptListFree) /* 15 */
+#endif
+#ifndef Itk_OptListAdd
+#define Itk_OptListAdd \
+	(itkStubsPtr->itk_OptListAdd) /* 16 */
+#endif
+#ifndef Itk_OptListRemove
+#define Itk_OptListRemove \
+	(itkStubsPtr->itk_OptListRemove) /* 17 */
+#endif
+
+#endif /* defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS) */
+
+/* !END!: Do not edit above this line. */
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* _ITKDECLS */
+

generic/itkStubInit.c

@@ -0,0 +1,51 @@
+/* 
+ * tkStubInit.c --
+ *
+ *	This file contains the initializers for the Itk stub vectors.
+ *
+ * Copyright (c) 1998-1999 by XXXX
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS:
+ */
+
+#include "itk.h"
+
+/*
+ * Remove macros that will interfere with the definitions below.
+ */
+
+/*
+ * WARNING: The contents of this file is automatically generated by the
+ * tools/genStubs.tcl script. Any modifications to the function declarations
+ * below should be made in the generic/itk.decls script.
+ */
+
+/* !BEGIN!: Do not edit below this line. */
+
+ItkStubs itkStubs = {
+    TCL_STUB_MAGIC,
+    NULL,
+    Itk_Init, /* 0 */
+    NULL, /* 1 */
+    Itk_ConfigBodyCmd, /* 2 */
+    Itk_UsualCmd, /* 3 */
+    Itk_ClassOptionDefineCmd, /* 4 */
+    Itk_ClassOptionIllegalCmd, /* 5 */
+    Itk_ConfigClassOption, /* 6 */
+    Itk_CreateClassOptTable, /* 7 */
+    Itk_FindClassOptTable, /* 8 */
+    NULL, /* 9 */
+    Itk_CreateClassOption, /* 10 */
+    Itk_FindClassOption, /* 11 */
+    Itk_DelClassOption, /* 12 */
+    Itk_ArchetypeInit, /* 13 */
+    Itk_OptListInit, /* 14 */
+    Itk_OptListFree, /* 15 */
+    Itk_OptListAdd, /* 16 */
+    Itk_OptListRemove, /* 17 */
+};
+
+/* !END!: Do not edit above this line. */

generic/itkStubLib.c

@@ -0,0 +1,81 @@
+/* 
+ * itkStubLib.c --
+ *
+ *	Stub object that will be statically linked into extensions that wish
+ *	to access Itk.
+ *
+ * Copyright (c) 1998-1999 by XXXX
+ * Copyright (c) 1998 Paul Duffin.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: 
+ */
+
+/*
+ * We need to ensure that we use the stub macros so that this file contains
+ * no references to any of the stub functions.  This will make it possible
+ * to build an extension that references Tcl_InitStubs but doesn't end up
+ * including the rest of the stub functions.
+ */
+
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
+
+#ifndef USE_ITCL_STUBS
+#define USE_ITCL_STUBS
+#endif
+#undef USE_ITCL_STUB_PROCS
+
+#include "itk.h"
+
+/*
+ * Ensure that Itcl_InitStubs is built as an exported symbol.  The other stub
+ * functions should be built as non-exported symbols.
+ */
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+
+ItkStubs *itkStubsPtr;
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Itk_InitStubs --
+ *
+ *	Tries to initialise the stub table pointers and ensures that
+ *	the correct version of Itk is loaded.
+ *
+ * Results:
+ *	The actual version of Itk that satisfies the request, or
+ *	NULL to indicate that an error occurred.
+ *
+ * Side effects:
+ *	Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+char *
+Itk_InitStubs (interp, version, exact)
+    Tcl_Interp *interp;
+    char *version;
+    int exact;
+{
+    char *actualVersion;
+    
+    actualVersion = Tcl_PkgRequireEx(interp, "Itk", version, exact,
+        (ClientData *) &itkStubsPtr);
+
+    if (actualVersion == NULL) {
+	itkStubsPtr = NULL;
+	return NULL;
+    }
+    
+    return actualVersion;
+}

generic/itk_cmds.c

@@ -16,7 +16,7 @@
  *           mmclennan@lucent.com
  *           http://www.tcltk.com/itcl
  *
- *     RCS:  $Id: itk_cmds.c,v 1.4 1998/08/18 10:48:32 suresh Exp $
+ *     RCS:  $Id: itk_cmds.c,v 1.6 1999/05/25 01:35:20 redman Exp $
  * ========================================================================
  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
  * ------------------------------------------------------------------------
@@ -80,6 +80,10 @@ namespace eval ::itk {\n\
     _find_init\n\
 }";
 
+extern ItkStubs itkStubs;
+ItclStubs *itclStubsPtr;
+ItclIntStubs *itclIntStubsPtr;
+
 
 /*
  * ------------------------------------------------------------------------
@@ -101,13 +105,20 @@ Initialize(interp)
     Tcl_Namespace *itkNs, *parserNs;
     ClientData parserInfo;
 
-    if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
 	return TCL_ERROR;
-    }
-    if (Tcl_PkgRequire(interp, "Itcl", ITCL_VERSION, 0) == NULL) {
+    };
+    if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
+	return TCL_ERROR;
+    };
+    if (Tcl_PkgRequireEx(interp, "Itcl", ITCL_VERSION, 0,
+            (ClientData *) &itclStubsPtr) == NULL) {
 	return TCL_ERROR;
     }
 
+    itclIntStubsPtr = itclStubsPtr->hooks->itclIntStubs;
+
+
     /*
      *  Add the "itk_option" ensemble to the itcl class definition parser.
      */
@@ -189,7 +200,8 @@ Initialize(interp)
     /*
      *  Signal that the package has been loaded.
      */
-    if (Tcl_PkgProvide(interp, "Itk", ITCL_VERSION) != TCL_OK) {
+    if (Tcl_PkgProvideEx(interp, "Itk", ITCL_VERSION,
+            (ClientData) &itkStubs) != TCL_OK) {
 	return TCL_ERROR;
     }
     return TCL_OK;

mac/itkMacLibrary.r

@@ -89,6 +89,6 @@ read 'TEXT' (ITK_LIBRARY_RESOURCES+12, "itk:tclIndex", purgeable)
 	"::mac:tclIndex";
 data 'TEXT' (ITK_LIBRARY_RESOURCES+13,"pkgIndex",purgeable, preload) {
 	"# Tcl package index file, version 1.0\n"
-	"package ifneeded Itk 3.0 [list package require Itcl 3.0 \; load [file join $dir itk30[info sharedlibextension]] Itk \; source -rsrc itk:tclIndex]\n"
+	"package ifneeded Itk 3.1 [list package require Itcl 3.1 \; load [file join $dir itk31[info sharedlibextension]] Itk \; source -rsrc itk:tclIndex]\n"
 };
 

mac/pkgIndex.tcl

@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itk 3.0 [list load [file join $dir itk30[info sharedlibextension]] Itk]
+package ifneeded Itk 3.1 [list load [file join $dir itk31[info sharedlibextension]] Itk]

pkgIndex.tcl.in

@@ -0,0 +1,3 @@
+# Tcl package index file, version 1.0
+
+package ifneeded Itk @VERSION@ [list load [file join $dir @RELPATH@ "@itk_LIB_FILE@"] Itk]

unix/Makefile.in

@@ -5,7 +5,7 @@
 # script generated by the "autoconf" program (constructs like
 # "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: $Id: Makefile.in,v 1.2 1998/08/11 14:41:03 welch Exp $
+# RCS: $Id: Makefile.in,v 1.4 1999/08/21 17:05:46 matt Exp $
 
 # Current [incr Tcl] version;  used in various names.
 
@@ -119,8 +119,12 @@ X11_LIB_SWITCHES =	@TK_XLIBSW@
 # and the math library (in that order).  The "LIBS" part will be
 # replaced (or has already been replaced) with relevant libraries as
 # determined by the configure script.
-LIBS = @TK_LIB_SPEC@ $(X11_LIB_SWITCHES) \
-	@ITCL_BUILD_LIB_SPEC@ @TCL_LIB_SPEC@ \
+EXE_LIBS = @TK_BUILD_LIB_SPEC@ $(X11_LIB_SWITCHES) \
+	@ITCL_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \
+	@TCL_LIBS@ @DL_LIBS@ -lc
+
+LIBS = @TK_BUILD_STUB_LIB_SPEC@ $(X11_LIB_SWITCHES) \
+	@ITCL_BUILD_LIB_SPEC@ @TCL_BUILD_STUB_LIB_SPEC@ \
 	@TCL_LIBS@ @DL_LIBS@ -lc
 
 # To change the compiler switches, for example to change from -O
@@ -172,6 +176,9 @@ LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
 ITK_LIB_FILE = @ITK_LIB_FILE@
 #ITK_LIB_FILE = libitk.a
 
+ITK_STUB_LIB_FILE = @ITK_STUB_LIB_FILE@
+#ITK_LIB_FILE = libitkstub.a
+
 # The symbol below provides support for dynamic loading and shared
 # libraries.  See configure.in for a description of what it means.
 # The values of the symbolis normally set by the configure script.
@@ -198,16 +205,21 @@ UNIX_DIR =		$(TOP_DIR)/unix
 
 
 CC = @CC@
-CC_SWITCHES = $(CFLAGS) $(SHLIB_CFLAGS) -I$(UNIX_DIR) -I$(GENERIC_DIR) \
+EXE_CC_SWITCHES = $(CFLAGS) $(SHLIB_CFLAGS) -I$(UNIX_DIR) -I$(GENERIC_DIR) \
 -I$(TCL_SRC_DIR)/generic -I$(ITCL_SRC_DIR)/generic \
 -I$(TK_SRC_DIR)/generic $(X11_INCLUDES) \
 $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) \
 -DITK_LIBRARY=\"$(ITK_LIBRARY)\"
 
-OBJS = itk_cmds.o itk_option.o itk_archetype.o itk_util.o
+CC_SWITCHES = $(EXE_CC_SWITCHES) @TCL_STUB_FLAGS@
+
+OBJS = itkStubInit.o itk_cmds.o itk_option.o itk_archetype.o itk_util.o
+
+ITK_STUB_LIB_OBJS = itkStubLib.o
 
 SRCS = $(GENERIC_DIR)/itk_cmds.c $(GENERIC_DIR)/itk_option.c \
-	$(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c
+	$(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c \
+	$(GENERIC_DIR)/itkStubInit.c $(GENERIC_DIR)/itkStubLib.c 
 
 all: itkwish
 
@@ -219,9 +231,14 @@ all: itkwish
 	@MAKE_LIB@
 	$(RANLIB) $(ITK_LIB_FILE)
 
-itkwish: tkAppInit.o $(ITK_LIB_FILE)
+itkwish: tkAppInit.o $(ITK_LIB_FILE) $(ITK_STUB_LIB_FILE)
 	$(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \
-		$(LIBS) $(LD_SEARCH_FLAGS) -o itkwish
+		$(EXE_LIBS) $(LD_SEARCH_FLAGS) -o itkwish
+
+$(ITK_STUB_LIB_FILE): $(ITCL_STUB_LIB_OBJS) 
+	rm -f $(ITK_STUB_LIB_FILE)
+	@MAKE_STUB_LIB@
+	$(RANLIB) $(ITCL_STUB_LIB_FILE)
 
 # Note, in the target below TCL_LIBRARY needs to be set or else
 # "make test" won't work in the case where the compilation directory
@@ -239,12 +256,16 @@ test: itkwish
 
 install: install-binaries install-libraries install-man
 
-install-binaries: $(ITK_LIB_FILE) itkwish
+install-binaries: $(ITK_LIB_FILE) $(ITK_STUB_LIB_FILE) itkwish
 	@$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
 	@echo "Installing $(ITK_LIB_FILE)"
 	@$(INSTALL_DATA) $(ITK_LIB_FILE) $(LIB_INSTALL_DIR)
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_LIB_FILE))
 	@chmod 555 $(LIB_INSTALL_DIR)/$(ITK_LIB_FILE)
+	@echo "Installing $(ITK_STUB_LIB_FILE)"
+	@$(INSTALL_DATA) $(ITK_STUB_LIB_FILE) $(LIB_INSTALL_DIR)
+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_STUB_LIB_FILE))
+	@chmod 555 $(LIB_INSTALL_DIR)/$(ITK_STUB_LIB_FILE)
 	@echo "Installing itkwish"
 	$(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION)
 	@echo "Installing itkConfig.sh"
@@ -284,6 +305,10 @@ install-man:
 Makefile: $(UNIX_DIR)/Makefile.in
 	$(SHELL) config.status
 
+genstubs:
+	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
+		$(GENERIC_DIR)/itk.decls $(GENERIC_DIR)/itkInt.decls
+
 clean:
 	rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors \
 	rm -f itkwish* libitk* *pure* *% ../tests/core
@@ -309,7 +334,13 @@ configure: configure.in
 	$(CC) -c $(CC_SWITCHES) $<
 
 tkAppInit.o:	$(UNIX_DIR)/tkAppInit.c Makefile
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
+	$(CC) -c $(EXE_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
+
+itkStubInit.o: $(GENERIC_DIR)/itkStubInit.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itkStubInit.c
+
+itkStubLib.o: $(GENERIC_DIR)/itkStubLib.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itkStubLib.c
 
 itk_cmds.o:	$(GENERIC_DIR)/itk_cmds.c Makefile
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_cmds.c

unix/configure.in

@@ -3,11 +3,11 @@ dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 
 AC_INIT(../generic/itk.h)
-# RCS: $Id: configure.in,v 1.2 1998/08/11 14:41:04 welch Exp $
+# RCS: $Id: configure.in,v 1.5 1999/06/28 18:47:35 hershey Exp $
 
-ITCL_VERSION=3.0
+ITCL_VERSION=3.1
 ITCL_MAJOR_VERSION=3
-ITCL_MINOR_VERSION=0
+ITCL_MINOR_VERSION=1
 ITCL_RELEASE_LEVEL=0
 VERSION=${ITCL_VERSION}
 
@@ -52,10 +52,10 @@ fi
 #--------------------------------------------------------------------
 
 AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.0 binaries from DIR],
-        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl8.0*/unix`)
+        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl8.*/unix`)
 
 TCL_LIB_DIR=""
-for dir in $exec_prefix/lib $itcl_search ; do
+for dir in $itcl_search $exec_prefix/lib ; do
     if test -r $dir/tclConfig.sh; then
         TCL_LIB_DIR=$dir
         break
@@ -98,10 +98,10 @@ fi
 #--------------------------------------------------------------------
 
 AC_ARG_WITH(tk, [  --with-tk=DIR           use Tk 8.0 binaries from DIR],
-        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk8.0*/unix`)
+        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk8.*/unix`)
 
 TK_LIB_DIR=""
-for dir in $exec_prefix/lib $itcl_search ; do
+for dir in $itcl_search $exec_prefix/lib ; do
     if test -r $dir/tkConfig.sh; then
         TK_LIB_DIR=$dir
         break
@@ -120,7 +120,7 @@ file=$TK_LIB_DIR/tkConfig.sh
 #   If not, assume that its top-level directory is a sibling of ours.
 #--------------------------------------------------------------------
 
-AC_ARG_WITH(itcl, [  --with-itcl=DIR          use Itcl 3.0 binaries from DIR],
+AC_ARG_WITH(itcl, [  --with-itcl=DIR          use Itcl binaries from DIR],
         ITCL_LIB_DIR=$withval, ITCL_LIB_DIR=`cd ../../itcl/unix; pwd`)
 
 if test ! -r "$ITCL_LIB_DIR/itclConfig.sh"; then
@@ -147,7 +147,7 @@ if test -z "$CFLAGS" ; then
     CFLAGS="-O"
 fi
 if test "$itcl_cv_prog_gcc" = "yes" ; then
-    CFLAGS="$CFLAGS -Wshadow -Wtraditional -Wall"
+    CFLAGS="$CFLAGS -Wall -Wconversion -Wno-implicit-int"
 fi
 
 AC_MSG_CHECKING([default compiler flags])
@@ -169,23 +169,30 @@ fi
 
 AC_ARG_ENABLE(shared,
     [  --enable-shared         build libitk as a shared library],
-    [ok=$enableval], [ok=no])
+    [ok=$enableval], [ok=yes])
 if test "$ok" = "yes"; then
     if test ${TCL_SHARED_BUILD} = 0; then
         AC_MSG_ERROR(Tcl was not built with --enable-shared, so you can't use shared libraries.)
     fi
     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+    TCL_STUB_FLAGS=-DUSE_TCL_STUBS
     eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}"
     ITK_PKG_FILE="[[file join [file dirname \$dir] ${ITK_LIB_FILE}]]"
-    MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} \$(LD_SEARCH_FLAGS)"
+    MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS}"
     RANLIB=":"
 else
     SHLIB_CFLAGS=""
+    TCL_STUB_FLAGS=""
     eval "ITK_LIB_FILE=libitk${VERSION}.a"
     ITK_PKG_FILE=""
     MAKE_LIB="ar cr ${ITK_LIB_FILE} \${OBJS}"
 fi
 
+eval "STUB_LIB_FILE=libitkstub${TCL_UNSHARED_LIB_SUFFIX}"
+MAKE_STUB_LIB="ar cr \${ITK_STUB_LIB_FILE} \${ITK_STUB_LIB_OBJS}"
+ITK_STUB_LIB_FILE=${STUB_LIB_FILE}
+
+
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
 # AIX remembers this path and will attempt to use it at run-time to look
@@ -199,10 +206,14 @@ else
     ITK_LIB_SPEC="-L${exec_prefix}/lib -litk`echo ${VERSION} | tr -d .`"
 fi
 
+ITK_BUILD_STUB_LIB_SPEC="-L`pwd` -litkstub${VERSION}"
+ITK_STUB_LIB_SPEC="-L${exec_prefix}/lib -litkstub${VERSION}"
+
 AC_SUBST(CFLAGS)
 AC_SUBST(DL_LIBS)
 AC_SUBST(LD_FLAGS)
 AC_SUBST(MAKE_LIB)
+AC_SUBST(MAKE_STUB_LIB)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_LD_LIBS)
@@ -212,6 +223,9 @@ AC_SUBST(LD_SEARCH_FLAGS)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_LIB_SPEC)
+AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
+AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_STUB_FLAGS)
 AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_DBGX)
 AC_SUBST(TCL_DEFS)
@@ -222,6 +236,7 @@ AC_SUBST(TCL_COMPAT_OBJS)
 
 AC_SUBST(TK_VERSION)
 AC_SUBST(TK_BUILD_LIB_SPEC)
+AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
 AC_SUBST(TK_LIB_DIR)
 AC_SUBST(TK_LIB_SPEC)
 AC_SUBST(TK_LIB_FLAG)
@@ -242,6 +257,9 @@ AC_SUBST(ITCL_SRC_DIR)
 AC_SUBST(ITK_BUILD_LIB_SPEC)
 AC_SUBST(ITK_LIB_FILE)
 AC_SUBST(ITK_LIB_SPEC)
+AC_SUBST(ITK_BUILD_STUB_LIB_SPEC)
+AC_SUBST(ITK_STUB_LIB_FILE)
+AC_SUBST(ITK_STUB_LIB_SPEC)
 AC_SUBST(ITK_PKG_FILE)
 AC_SUBST(ITK_SRC_DIR)
 

unix/itkConfig.sh

@@ -12,20 +12,31 @@
 # The information in this file is specific to a single platform.
 
 # Itcl's version number.
-ITCL_VERSION='3.0'
+ITCL_VERSION='3.1'
 ITCL_MAJOR_VERSION='3'
-ITCL_MINOR_VERSION='0'
+ITCL_MINOR_VERSION='1'
 
 # The name of the Itk library (may be either a .a file or a shared library):
-ITK_LIB_FILE=libitk3.0.so
+ITK_LIB_FILE=libitk3.1.so
 
 # String to pass to linker to pick up the Itk library from its
 # build directory.
-ITK_BUILD_LIB_SPEC='-L/home/mmc/itcl/itcl3.0/itk/unix -litk3.0'
+ITK_BUILD_LIB_SPEC='-L/home/hershey/cvs/itcl3.1.0/itk/unix -litk3.1'
 
 # String to pass to linker to pick up the Itk library from its
 # installed directory.
-ITK_LIB_SPEC='-L/tmp/itcl/lib -litk3.0'
+ITK_LIB_SPEC='-L/home/hershey/cvs/lib -litk3.1'
+
+# The name of the Itk stub library (a .a file):
+ITK_STUB_LIB_FILE=libitkstub3.1.a
+
+# String to pass to linker to pick up the Itk stub library from its
+# build directory.
+ITK_BUILD_STUB_LIB_SPEC='-L/home/hershey/cvs/itcl3.1.0/itk/unix -litkstub3.1'
+
+# String to pass to linker to pick up the Itk stub library from its
+# installed directory.
+ITK_STUB_LIB_SPEC='-L/home/hershey/cvs/lib -litkstub3.1'
 
 # Location of the top-level source directories from which [incr Tk]
 # was built.  This is the directory that contains a README file as well
@@ -33,4 +44,4 @@ ITK_LIB_SPEC='-L/tmp/itcl/lib -litk3.0'
 # compiled in a different place than the directory containing the source
 # files, this points to the location of the sources, not the location
 # where [incr Tk] was compiled.
-ITK_SRC_DIR='/home/mmc/itcl/itcl3.0/itk'
+ITK_SRC_DIR='/home/hershey/cvs/itcl3.1.0/itk'

unix/itkConfig.sh.in

@@ -27,6 +27,17 @@ ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
 # installed directory.
 ITK_LIB_SPEC='@ITK_LIB_SPEC@'
 
+# The name of the Itk stub library (a .a file):
+ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@
+
+# String to pass to linker to pick up the Itk stub library from its
+# build directory.
+ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@'
+
+# String to pass to linker to pick up the Itk stub library from its
+# installed directory.
+ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
+
 # Location of the top-level source directories from which [incr Tk]
 # was built.  This is the directory that contains a README file as well
 # as subdirectories such as generic, unix, etc.  If [incr Tk] was

win/makefile.vc

@@ -30,8 +30,9 @@ ITCLDIR     = ..\..\itcl
 
 ITKNAMEPREFIX  = itk
 WISHNAMEPREFIX = itkwish
-VERSION	       = 30
-DOTVERSION     = 3.0
+VERSION	       = 31
+DOTVERSION     = 3.1
+STUBPREFIX = $(ITKNAMEPREFIX)stub
 
 BINROOT		= .
 !IF "$(NODEBUG)" == "1"
@@ -50,6 +51,10 @@ ITKLIB 		= $(OUTDIR)\$(ITKNAMEPREFIX)$(VERSION)$(DBGX).lib
 ITKWISH 	= $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
 DUMPEXTS 	= $(TMPDIR)\dumpexts.exe
 
+ITKSTUBLIBNAME = $(STUBPREFIX)$(VERSION)$(DBGX).lib
+ITKSTUBLIB     = $(OUTDIR)\$(ITKSTUBLIBNAME)
+
+
 LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
 BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
 SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\itk$(DOTVERSION)
@@ -59,37 +64,53 @@ ITKWISHOBJS = \
 	$(TMPDIR)\winMain.obj
 
 ITKOBJS = \
+	$(TMPDIR)\itkStubInit.obj \
 	$(TMPDIR)\itk_archetype.obj \
 	$(TMPDIR)\itk_cmds.obj \
 	$(TMPDIR)\itk_option.obj \
 	$(TMPDIR)\itk_util.obj \
 	$(TMPDIR)\dllEntryPoint.obj
 
+ITKSTUBOBJS = \
+    $(TMPDIR)\itkStubLib.obj
+
 cc32		= $(TOOLS32)\bin\cl.exe
 link32		= $(TOOLS32)\bin\link.exe
 rc32		= $(TOOLS32_rc)\bin\rc.exe
 include32	= -I$(TOOLS32)\include
+lib32       = "$(TOOLS32)\bin\lib.exe"
 
 WINDIR      = $(ROOT)\win
 GENERICDIR	= $(ROOT)\generic
 RCDIR       = $(WINDIR)\rc
 
 TCLBUILDDIR	= $(TCLDIR)\win\$(OUTDIR)
-TCLLIB      = $(TCLBUILDDIR)\tcl80$(DBGX).lib
-TCLDLL      = $(TCLBUILDDIR)\tcl80$(DBGX).dll
+TCLLIB      = $(TCLBUILDDIR)\tcl81$(DBGX).lib
+TCLSTUBLIB      = $(TCLBUILDDIR)\tclstub81$(DBGX).lib
+TCLDLL      = $(TCLBUILDDIR)\tcl81$(DBGX).dll
 TKBUILDDIR	= $(TKDIR)\win\$(OUTDIR)
-TKLIB       = $(TKBUILDDIR)\tk80$(DBGX).lib
-TKDLL       = $(TKBUILDDIR)\tk80$(DBGX).dll
+TKLIB       = $(TKBUILDDIR)\tk81$(DBGX).lib
+TKSTUBLIB       = $(TKBUILDDIR)\tkstub81$(DBGX).lib
+TKDLL       = $(TKBUILDDIR)\tk81$(DBGX).dll
 ITCLBUILDDIR = $(ITCLDIR)\win\$(OUTDIR)
 ITCLLIB      = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).lib
 ITCLDLL      = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).dll
 
-ITK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) \
-			-I$(TCLDIR)\generic -I$(TKDIR)\generic -I$(TKDIR)\xlib -I$(ITCLDIR)\generic
-ITK_DEFINES	= -DBUILD_itk $(DEBUGDEFINES)
+ITCLSTUBLIBNAME = itclstub$(VERSION)$(DBGX).lib
+ITCLSTUBLIB     = $(ITCLBUILDDIR)\$(ITCLSTUBLIBNAME)
 
-ITK_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
-			$(ITK_INCLUDES) $(ITK_DEFINES) 
+ITK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) \
+			-I$(TCLDIR)\generic -I$(TKDIR)\generic \
+			-I$(TCLDIR)\win -I$(TKDIR)\win \
+			-I$(TKDIR)\xlib -I$(ITCLDIR)\generic
+
+ITK_EXE_DEFINES	= -DBUILD_itk $(DEBUGDEFINES)
+
+ITK_EXE_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
+			$(ITK_INCLUDES) $(ITK_EXE_DEFINES) 
+
+ITK_CFLAGS	= $(ITK_EXE_CFLAGS) -DUSE_TK_STUBS -DUSE_TCL_STUBS \
+		         -DUSE_ITCL_STUBS
 
 ######################################################################
 # Link flags
@@ -107,7 +128,7 @@ lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
 # declarations for use on Intel i386, i486, and Pentium systems
 !IF "$(MACHINE)" == "IX86"
 DLLENTRY = @12
-lflags   = $(lcommon) -align:0x1000 /MACHINE:$(MACHINE)
+lflags   = $(lcommon) /MACHINE:$(MACHINE)
 !ELSE
 lflags   = $(lcommon) /MACHINE:$(MACHINE)
 !ENDIF
@@ -137,12 +158,12 @@ guilibsdll = $(libcdll) $(winlibs)
 !IF "$(NODEBUG)" == "1"
 !IF "$(MACHINE)" == "ALPHA"
 # MSVC on Alpha doesn't understand -Ot
-cdebug = -O2i -Gs -GD
+cdebug = -O2i -Gs -GD -DNDEBUG
 !ELSE
-cdebug = -Oti -Gs -GD
+cdebug = -Oti -Gs -GD -DNDEBUG
 !ENDIF
 !ELSE
-cdebug = -Z7 -Od -WX
+cdebug = -Z7 -Od -WX -DDEBUG
 !ENDIF
 
 # declarations common to all compiler options
@@ -180,31 +201,35 @@ CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
 # Project specific targets
 ######################################################################
 
-all:    setup $(ITKWISH)
-test:	setup $(ITKWISH)
+all:    setup $(ITKWISH) $(ITKDLL) $(ITKSTUBLIB)
+test:	setup $(ITKDLL) $(ITKSTUBLIB) $(ITKWISH)
 	-@copy $(TCLDLL) $(TMPDIR)
 	-@copy $(TKDLL) $(TMPDIR)
 	-@copy $(ITCLDLL) $(TMPDIR)
-	$(ITKWISH)
+#	$(ITKWISH)
 
 setup:
 	if not exist $(TMPDIR) mkdir $(TMPDIR)
 	if not exist $(OUTDIR) mkdir $(OUTDIR)
 
-$(ITKLIB): $(ITKDLL)
-
-$(ITKDLL): $(ITKOBJS) $(TMPDIR)\itk.res $(TMPDIR)\itkvc.def
+$(ITKLIB) : $(ITKDLL) $(ITKSTUBLIB)
+$(ITKDLL) : $(ITKOBJS) $(TMPDIR)\itk.res $(TMPDIR)\itkvc.def
 	set LIB=$(TOOLS32)\lib
        $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\itkvc.def \
-		-out:$@ $(TMPDIR)\itk.res $(TCLLIB) $(TKLIB) $(ITCLLIB) \
-		$(guilibsdll) @<<
+		-out:$@ $(TMPDIR)\itk.res $(TCLSTUBLIB)  \
+                $(TKSTUBLIB) $(guilibsdll) @<<
 			$(ITKOBJS)
 <<
 
+
+$(ITKSTUBLIB): $(ITKSTUBOBJS)
+    $(lib32) -nologo -out:$@ $(ITKSTUBOBJS)
+
 $(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) $(TMPDIR)\itkwish.res
 	set LIB=$(TOOLS32)\lib
 	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\itkwish.res -out:$@ \
-		$(guilibsdll) $(TCLLIB) $(TKLIB) $(ITCLLIB) $(ITKLIB) $(ITKWISHOBJS) 
+		$(guilibsdll) $(TCLLIB) $(TKLIB) $(ITCLLIB) $(ITKLIB) \
+		$(ITKWISHOBJS) 
 
 $(TMPDIR)\itkvc.def: $(DUMPEXTS) $(ITKOBJS)
 	$(DUMPEXTS) -o $@ $(ITKDLLNAME) @<<
@@ -229,12 +254,25 @@ install: all
 	copy $(ROOT)\library\*.* "$(SCRIPT_INSTALL_DIR)"
 	copy $(ROOT)\win\*.tcl "$(SCRIPT_INSTALL_DIR)"
 
+#
+# Regenerate the stubs files.
+#
+genstubs:
+    $(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
+        $(GENERICDIR)\itk.decls
+
 #
 # Special case object file targets
 #
 
 $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
-	$(cc32) -DBUILD_tcl -DBUILD_tk $(ITK_CFLAGS) -Fo$@ $?
+	$(cc32) $(ITK_EXE_CFLAGS) -Fo$@ $?
+
+# The following object is part of the stub library and should not
+# be built as DLL objects but none of the symbols should be exported
+
+$(TMPDIR)\itkStubLib.obj : $(GENERICDIR)\itkStubLib.c
+    $(cc32) -DSTATIC_BUILD $(ITK_CFLAGS) -Fo$@ $?
 
 #
 # Implicit rules

win/pkgIndex.tcl

@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itk 3.0 [list load [file join $dir itk30.dll] Itk]
+package ifneeded Itk 3.1 [list load [file join $dir itk31.dll] Itk]

win/rc/itk.rc

@@ -1,126 +1,126 @@
-// SCCS: @(#) tk.rc 1.17 96/09/12 16:22:08
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <itcl.h>
-#include <itk.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
- PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
- FILEFLAGSMASK	0x3fL
- FILEFLAGS	0x0L
- FILEOS		0x4L
- FILETYPE	0x2L
- FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Itk DLL\0"
-            VALUE "Authors", "Michael McLennan\0"
-
-            VALUE "OriginalFilename", "itk" STRINGIFY(ITCL_MAJOR_VERSION) STRINGIFY(ITCL_MINOR_VERSION) ".dll\0"
-            VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
-            VALUE "FileVersion", ITCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
-            VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
-            VALUE "ProductVersion", ITCL_PATCH_LEVEL
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-//
-// Icon
-//
-
-tk                      ICON    DISCARDABLE     "itk.ico"
-
-//
-// Cursor
-//
-
-X_cursor                CURSOR  DISCARDABLE     "cursor00.cur"
-arrow                   CURSOR  DISCARDABLE     "cursor02.cur"
-based_arrow_down        CURSOR  DISCARDABLE     "cursor04.cur"
-based_arrow_up          CURSOR  DISCARDABLE     "cursor06.cur"
-boat                    CURSOR  DISCARDABLE     "cursor08.cur"
-bogosity                CURSOR  DISCARDABLE     "cursor0a.cur"
-bottom_left_corner      CURSOR  DISCARDABLE     "cursor0c.cur"
-bottom_right_corner     CURSOR  DISCARDABLE     "cursor0e.cur"
-bottom_side             CURSOR  DISCARDABLE     "cursor10.cur"
-bottom_tee              CURSOR  DISCARDABLE     "cursor12.cur"
-box_spiral              CURSOR  DISCARDABLE     "cursor14.cur"
-center_ptr              CURSOR  DISCARDABLE     "cursor16.cur"
-circle                  CURSOR  DISCARDABLE     "cursor18.cur"
-clock                   CURSOR  DISCARDABLE     "cursor1a.cur"
-coffee_mug              CURSOR  DISCARDABLE     "cursor1c.cur"
-cross                   CURSOR  DISCARDABLE     "cursor1e.cur"
-cross_reverse           CURSOR  DISCARDABLE     "cursor20.cur"
-crosshair               CURSOR  DISCARDABLE     "cursor22.cur"
-diamond_cross           CURSOR  DISCARDABLE     "cursor24.cur"
-dot                     CURSOR  DISCARDABLE     "cursor26.cur"
-dotbox                  CURSOR  DISCARDABLE     "cursor28.cur"
-double_arrow            CURSOR  DISCARDABLE     "cursor2a.cur"
-draft_large             CURSOR  DISCARDABLE     "cursor2c.cur"
-draft_small             CURSOR  DISCARDABLE     "cursor2e.cur"
-draped_box              CURSOR  DISCARDABLE     "cursor30.cur"
-exchange                CURSOR  DISCARDABLE     "cursor32.cur"
-fleur                   CURSOR  DISCARDABLE     "cursor34.cur"
-gobbler                 CURSOR  DISCARDABLE     "cursor36.cur"
-gumby                   CURSOR  DISCARDABLE     "cursor38.cur"
-hand1                   CURSOR  DISCARDABLE     "cursor3a.cur"
-hand2                   CURSOR  DISCARDABLE     "cursor3c.cur"
-heart                   CURSOR  DISCARDABLE     "cursor3e.cur"
-icon                    CURSOR  DISCARDABLE     "cursor40.cur"
-iron_cross              CURSOR  DISCARDABLE     "cursor42.cur"
-left_ptr                CURSOR  DISCARDABLE     "cursor44.cur"
-left_side               CURSOR  DISCARDABLE     "cursor46.cur"
-left_tee                CURSOR  DISCARDABLE     "cursor48.cur"
-leftbutton              CURSOR  DISCARDABLE     "cursor4a.cur"
-ll_angle                CURSOR  DISCARDABLE     "cursor4c.cur"
-lr_angle                CURSOR  DISCARDABLE     "cursor4e.cur"
-man                     CURSOR  DISCARDABLE     "cursor50.cur"
-middlebutton            CURSOR  DISCARDABLE     "cursor52.cur"
-mouse                   CURSOR  DISCARDABLE     "cursor54.cur"
-pencil                  CURSOR  DISCARDABLE     "cursor56.cur"
-pirate                  CURSOR  DISCARDABLE     "cursor58.cur"
-plus                    CURSOR  DISCARDABLE     "cursor5a.cur"
-question_arrow          CURSOR  DISCARDABLE     "cursor5c.cur"
-right_ptr               CURSOR  DISCARDABLE     "cursor5e.cur"
-right_side              CURSOR  DISCARDABLE     "cursor60.cur"
-right_tee               CURSOR  DISCARDABLE     "cursor62.cur"
-rightbutton             CURSOR  DISCARDABLE     "cursor64.cur"
-rtl_logo                CURSOR  DISCARDABLE     "cursor66.cur"
-sailboat                CURSOR  DISCARDABLE     "cursor68.cur"
-sb_down_arrow           CURSOR  DISCARDABLE     "cursor6a.cur"
-sb_h_double_arrow       CURSOR  DISCARDABLE     "cursor6c.cur"
-sb_left_arrow           CURSOR  DISCARDABLE     "cursor6e.cur"
-sb_right_arrow          CURSOR  DISCARDABLE     "cursor70.cur"
-sb_up_arrow             CURSOR  DISCARDABLE     "cursor72.cur"
-sb_v_double_arrow       CURSOR  DISCARDABLE     "cursor74.cur"
-shuttle                 CURSOR  DISCARDABLE     "cursor76.cur"
-sizing                  CURSOR  DISCARDABLE     "cursor78.cur"
-spider                  CURSOR  DISCARDABLE     "cursor7a.cur"
-spraycan                CURSOR  DISCARDABLE     "cursor7c.cur"
-star                    CURSOR  DISCARDABLE     "cursor7e.cur"
-target                  CURSOR  DISCARDABLE     "cursor80.cur"
-tcross                  CURSOR  DISCARDABLE     "cursor82.cur"
-top_left_arrow          CURSOR  DISCARDABLE     "cursor84.cur"
-top_left_corner         CURSOR  DISCARDABLE     "cursor86.cur"
-top_right_corner        CURSOR  DISCARDABLE     "cursor88.cur"
-top_side                CURSOR  DISCARDABLE     "cursor8a.cur"
-top_tee                 CURSOR  DISCARDABLE     "cursor8c.cur"
-trek                    CURSOR  DISCARDABLE     "cursor8e.cur"
-ul_angle                CURSOR  DISCARDABLE     "cursor90.cur"
-umbrella                CURSOR  DISCARDABLE     "cursor92.cur"
-ur_angle                CURSOR  DISCARDABLE     "cursor94.cur"
-watch                   CURSOR  DISCARDABLE     "cursor96.cur"
-xterm                   CURSOR  DISCARDABLE     "cursor98.cur"
+// SCCS: @(#) tk.rc 1.17 96/09/12 16:22:08
+//
+// Version
+//
+
+#define VS_VERSION_INFO 1
+#define RESOURCE_INCLUDED
+#include <itcl.h>
+#include <itk.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION    ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ FILEFLAGSMASK	0x3fL
+ FILEFLAGS	0x0L
+ FILEOS		0x4L
+ FILETYPE	0x2L
+ FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Itk language extension for Tcl\0"
+            VALUE "Authors", "Michael McLennan\0"
+            VALUE "OriginalFilename", "itk" STRINGIFY(ITCL_MAJOR_VERSION) STRINGIFY(ITCL_MINOR_VERSION) ".dll\0"
+            VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
+            VALUE "FileVersion", ITCL_PATCH_LEVEL
+            VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
+            VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
+            VALUE "ProductVersion", ITCL_PATCH_LEVEL
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+//
+// Icon
+//
+
+tk                      ICON    DISCARDABLE     "itk.ico"
+
+//
+// Cursor
+//
+
+X_cursor                CURSOR  DISCARDABLE     "cursor00.cur"
+arrow                   CURSOR  DISCARDABLE     "cursor02.cur"
+based_arrow_down        CURSOR  DISCARDABLE     "cursor04.cur"
+based_arrow_up          CURSOR  DISCARDABLE     "cursor06.cur"
+boat                    CURSOR  DISCARDABLE     "cursor08.cur"
+bogosity                CURSOR  DISCARDABLE     "cursor0a.cur"
+bottom_left_corner      CURSOR  DISCARDABLE     "cursor0c.cur"
+bottom_right_corner     CURSOR  DISCARDABLE     "cursor0e.cur"
+bottom_side             CURSOR  DISCARDABLE     "cursor10.cur"
+bottom_tee              CURSOR  DISCARDABLE     "cursor12.cur"
+box_spiral              CURSOR  DISCARDABLE     "cursor14.cur"
+center_ptr              CURSOR  DISCARDABLE     "cursor16.cur"
+circle                  CURSOR  DISCARDABLE     "cursor18.cur"
+clock                   CURSOR  DISCARDABLE     "cursor1a.cur"
+coffee_mug              CURSOR  DISCARDABLE     "cursor1c.cur"
+cross                   CURSOR  DISCARDABLE     "cursor1e.cur"
+cross_reverse           CURSOR  DISCARDABLE     "cursor20.cur"
+crosshair               CURSOR  DISCARDABLE     "cursor22.cur"
+diamond_cross           CURSOR  DISCARDABLE     "cursor24.cur"
+dot                     CURSOR  DISCARDABLE     "cursor26.cur"
+dotbox                  CURSOR  DISCARDABLE     "cursor28.cur"
+double_arrow            CURSOR  DISCARDABLE     "cursor2a.cur"
+draft_large             CURSOR  DISCARDABLE     "cursor2c.cur"
+draft_small             CURSOR  DISCARDABLE     "cursor2e.cur"
+draped_box              CURSOR  DISCARDABLE     "cursor30.cur"
+exchange                CURSOR  DISCARDABLE     "cursor32.cur"
+fleur                   CURSOR  DISCARDABLE     "cursor34.cur"
+gobbler                 CURSOR  DISCARDABLE     "cursor36.cur"
+gumby                   CURSOR  DISCARDABLE     "cursor38.cur"
+hand1                   CURSOR  DISCARDABLE     "cursor3a.cur"
+hand2                   CURSOR  DISCARDABLE     "cursor3c.cur"
+heart                   CURSOR  DISCARDABLE     "cursor3e.cur"
+icon                    CURSOR  DISCARDABLE     "cursor40.cur"
+iron_cross              CURSOR  DISCARDABLE     "cursor42.cur"
+left_ptr                CURSOR  DISCARDABLE     "cursor44.cur"
+left_side               CURSOR  DISCARDABLE     "cursor46.cur"
+left_tee                CURSOR  DISCARDABLE     "cursor48.cur"
+leftbutton              CURSOR  DISCARDABLE     "cursor4a.cur"
+ll_angle                CURSOR  DISCARDABLE     "cursor4c.cur"
+lr_angle                CURSOR  DISCARDABLE     "cursor4e.cur"
+man                     CURSOR  DISCARDABLE     "cursor50.cur"
+middlebutton            CURSOR  DISCARDABLE     "cursor52.cur"
+mouse                   CURSOR  DISCARDABLE     "cursor54.cur"
+pencil                  CURSOR  DISCARDABLE     "cursor56.cur"
+pirate                  CURSOR  DISCARDABLE     "cursor58.cur"
+plus                    CURSOR  DISCARDABLE     "cursor5a.cur"
+question_arrow          CURSOR  DISCARDABLE     "cursor5c.cur"
+right_ptr               CURSOR  DISCARDABLE     "cursor5e.cur"
+right_side              CURSOR  DISCARDABLE     "cursor60.cur"
+right_tee               CURSOR  DISCARDABLE     "cursor62.cur"
+rightbutton             CURSOR  DISCARDABLE     "cursor64.cur"
+rtl_logo                CURSOR  DISCARDABLE     "cursor66.cur"
+sailboat                CURSOR  DISCARDABLE     "cursor68.cur"
+sb_down_arrow           CURSOR  DISCARDABLE     "cursor6a.cur"
+sb_h_double_arrow       CURSOR  DISCARDABLE     "cursor6c.cur"
+sb_left_arrow           CURSOR  DISCARDABLE     "cursor6e.cur"
+sb_right_arrow          CURSOR  DISCARDABLE     "cursor70.cur"
+sb_up_arrow             CURSOR  DISCARDABLE     "cursor72.cur"
+sb_v_double_arrow       CURSOR  DISCARDABLE     "cursor74.cur"
+shuttle                 CURSOR  DISCARDABLE     "cursor76.cur"
+sizing                  CURSOR  DISCARDABLE     "cursor78.cur"
+spider                  CURSOR  DISCARDABLE     "cursor7a.cur"
+spraycan                CURSOR  DISCARDABLE     "cursor7c.cur"
+star                    CURSOR  DISCARDABLE     "cursor7e.cur"
+target                  CURSOR  DISCARDABLE     "cursor80.cur"
+tcross                  CURSOR  DISCARDABLE     "cursor82.cur"
+top_left_arrow          CURSOR  DISCARDABLE     "cursor84.cur"
+top_left_corner         CURSOR  DISCARDABLE     "cursor86.cur"
+top_right_corner        CURSOR  DISCARDABLE     "cursor88.cur"
+top_side                CURSOR  DISCARDABLE     "cursor8a.cur"
+top_tee                 CURSOR  DISCARDABLE     "cursor8c.cur"
+trek                    CURSOR  DISCARDABLE     "cursor8e.cur"
+ul_angle                CURSOR  DISCARDABLE     "cursor90.cur"
+umbrella                CURSOR  DISCARDABLE     "cursor92.cur"
+ur_angle                CURSOR  DISCARDABLE     "cursor94.cur"
+watch                   CURSOR  DISCARDABLE     "cursor96.cur"
+xterm                   CURSOR  DISCARDABLE     "cursor98.cur"

win/winMain.c

@@ -21,15 +21,8 @@
 #include "itk.h"
 
 /* include tclInt.h for access to namespace API */
-#include "tclInt.h"
+#include "tkInt.h"
 
-/*
- * The following declarations refer to internal Tk routines.  These
- * interfaces are available for use, but are not supported.
- */
-
-EXTERN void		TkConsoleCreate(void);
-EXTERN int		TkConsoleInit(Tcl_Interp *interp);
 
 /*
  * Forward declarations for procedures defined later in this file:
@@ -90,14 +83,6 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
      */
     SetMessageQueue(64);
 
-    /*
-     * Create the console channels and install them as the standard
-     * channels.  All I/O will be discarded until TkConsoleInit is
-     * called to attach the console to a text widget.
-     */
-
-    TkConsoleCreate();
-
     setargv(&argc, &argv);
 
     /*
@@ -182,7 +167,7 @@ Tcl_AppInit(interp)
      * application.
      */
 
-    if (TkConsoleInit(interp) == TCL_ERROR) {
+    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 	goto error;
     }