[brlcad-commits] CVS: brlcad/src/other/incrTcl/itk aclocal.m4, 14.1, 14.2 itkConfig.sh.in, 14.2, 14.3 license.terms, 14.2, 14.3 pkgIndex.tcl.in, 14.1, 14.2

[Erik G. <eri...@us...>]

Update of /cvsroot/brlcad/brlcad/src/other/incrTcl/itk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18639/itk

Modified Files:
	aclocal.m4 itkConfig.sh.in license.terms pkgIndex.tcl.in 
Log Message:
Upgrade to itcl/itk 3.3

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/other/incrTcl/itk/aclocal.m4,v
retrieving revision 14.1
retrieving revision 14.2
diff -w -u -r14.1 -r14.2
--- aclocal.m4	16 Nov 2004 19:42:18 -0000	14.1
+++ aclocal.m4	24 Oct 2007 20:30:26 -0000	14.2
@@ -1 +1 @@
-builtin(include,../tcl.m4)
+builtin(include,tclconfig/tcl.m4)

Index: itkConfig.sh.in
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/other/incrTcl/itk/itkConfig.sh.in,v
retrieving revision 14.2
retrieving revision 14.3
diff -w -u -r14.2 -r14.3
--- itkConfig.sh.in	14 Sep 2007 15:21:33 -0000	14.2
+++ itkConfig.sh.in	24 Oct 2007 20:30:26 -0000	14.3
@@ -12,37 +12,29 @@
 # The information in this file is specific to a single platform.
 
 # Itcl's version number.
-ITK_VERSION='@VERSION@'
-ITK_MAJOR_VERSION='@MAJOR_VERSION@'
-ITK_MINOR_VERSION='@MINOR_VERSION@'
+ITCL_VERSION='@ITCL_VERSION@'
 
 # The name of the Itk library (may be either a .a file or a shared library):
-itk_LIB_FILE=@itk_LIB_FILE@
-ITK_LIB_FILE=@itk_LIB_FILE@
+ITK_LIB_FILE=@ITK_LIB_FILE@
 
 # String to pass to linker to pick up the Itk library from its
 # build directory.
-itk_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
-ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
+ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk library from its
 # installed directory.
-itk_LIB_SPEC='@itk_LIB_SPEC@'
-ITK_LIB_SPEC='@itk_LIB_SPEC@'
+ITK_LIB_SPEC='@ITK_LIB_SPEC@'
 
 # The name of the Itk stub library (a .a file):
-itk_STUB_LIB_FILE=@itk_STUB_LIB_FILE@
-ITK_STUB_LIB_FILE=@itk_STUB_LIB_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@'
-ITK_BUILD_STUB_LIB_SPEC='@itk_BUILD_STUB_LIB_SPEC@'
+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@'
-ITK_STUB_LIB_SPEC='@itk_STUB_LIB_SPEC@'
+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
@@ -50,5 +42,4 @@
 # 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='@itk_SRC_DIR@'
-ITK_SRC_DIR='@itk_SRC_DIR@'
+ITK_SRC_DIR='@ITK_SRC_DIR@'

Index: license.terms
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/other/incrTcl/itk/license.terms,v
retrieving revision 14.2
retrieving revision 14.3
diff -w -u -r14.2 -r14.3

Index: pkgIndex.tcl.in
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/other/incrTcl/itk/pkgIndex.tcl.in,v
retrieving revision 14.1
retrieving revision 14.2
diff -w -u -r14.1 -r14.2
--- pkgIndex.tcl.in	16 Nov 2004 19:42:18 -0000	14.1
+++ pkgIndex.tcl.in	24 Oct 2007 20:30:26 -0000	14.2
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itk @ITCL_VERSION@ [list load [file join $dir "libitk@ITCL_VERSION@"] Itk]
+package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]