Index: itcl/aclocal.m4 =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itcl/aclocal.m4,v retrieving revision 1.3 diff -u -p -u -p -r1.3 aclocal.m4 --- itcl/aclocal.m4 25 Mar 2005 19:37:41 -0000 1.3 +++ itcl/aclocal.m4 30 Apr 2005 18:06:11 -0000 @@ -1 +1 @@ -builtin(include,tclconfig/tcl.m4) +builtin(include,../tclconfig/tcl.m4) Index: itk/Makefile.in =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itk/Makefile.in,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile.in --- itk/Makefile.in 25 Mar 2005 22:58:48 -0000 1.29 +++ itk/Makefile.in 30 Apr 2005 18:06:12 -0000 @@ -77,7 +77,7 @@ ITK_WIN_DIR_NATIVE = @ITK_WIN_DIR_NATIVE PKG_LIB_FILE = @PKG_LIB_FILE@ PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ -lib_BINARIES = $(PKG_LIB_FILE) +lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE) BINARIES = $(lib_BINARIES) SHELL = @SHELL@ Index: itk/aclocal.m4 =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itk/aclocal.m4,v retrieving revision 1.3 diff -u -p -u -p -r1.3 aclocal.m4 --- itk/aclocal.m4 25 Mar 2005 19:39:53 -0000 1.3 +++ itk/aclocal.m4 30 Apr 2005 18:06:12 -0000 @@ -1 +1 @@ -builtin(include,tclconfig/tcl.m4) +builtin(include,../tclconfig/tcl.m4) Index: itk/configure =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itk/configure,v retrieving revision 1.48 diff -u -p -u -p -r1.48 configure --- itk/configure 25 Mar 2005 19:39:53 -0000 1.48 +++ itk/configure 30 Apr 2005 18:06:13 -0000 @@ -308,7 +308,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS LN_S CONFIG_CLEAN_FILES TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES itcl_VERSION itcl_BIN_DIR itcl_SRC_DIR itcl_LIB_FILE itcl_LIB_SPEC itcl_STUB_LIB_FILE itcl_STUB_LIB_SPEC itcl_STUB_LIB_PATH CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS CLEANFILES TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_TOP_DIR_NATIVE TK_UNIX_DIR_NATIVE TK_WIN_DIR_NATIVE TK_GENERIC_DIR_NATIVE TK_XLIB_DIR_NATIVE TK_PLATFORM_DIR_NATIVE TK_INCLUDES SHARED_BUILD AR TCLSH_PROG CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LD_LIBS LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB itkstub_LIB_FILE itk_LIB_FILE WISH_PROG LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS LN_S CONFIG_CLEAN_FILES TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES itcl_VERSION itcl_BIN_DIR itcl_SRC_DIR itcl_LIB_FILE itcl_LIB_SPEC itcl_STUB_LIB_FILE itcl_STUB_LIB_SPEC itcl_STUB_LIB_PATH CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS CLEANFILES TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_TOP_DIR_NATIVE TK_UNIX_DIR_NATIVE TK_WIN_DIR_NATIVE TK_GENERIC_DIR_NATIVE TK_XLIB_DIR_NATIVE TK_PLATFORM_DIR_NATIVE TK_INCLUDES SHARED_BUILD AR TCLSH_PROG CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LD_LIBS LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB itkstub_LIB_FILE itk_LIB_FILE WISH_PROG itk_BUILD_LIB_SPEC itk_LIB_SPEC itk_BUILD_STUB_LIB_SPEC itk_STUB_LIB_SPEC itk_BUILD_STUB_LIB_PATH itk_STUB_LIB_PATH itk_SRC_DIR LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -6472,7 +6472,31 @@ echo "$as_me: error: could not find head PKG_CFLAGS="$PKG_CFLAGS " -#TEA_ADD_STUB_SOURCES([itkStubLib.c]) + + vars="itkStubLib.c" + for i in $vars; do + # check for existence - allows for generic/win/unix VPATH + if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ + -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ + ; then + { { echo "$as_me:$LINENO: error: could not find stub source file '$i'" >&5 +echo "$as_me: error: could not find stub source file '$i'" >&2;} + { (exit 1); exit 1; }; } + fi + PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" + # this assumes it is in a VPATH dir + i=`basename $i` + # handle user calling this before or after TEA_SETUP_COMPILER + if test x"${OBJEXT}" != x ; then + j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" + else + j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" + fi + PKG_STUB_OBJECTS="$PKG_STUB_OBJECTS $j" + done + + + vars="library/Archetype.itk library/Toplevel.itk @@ -10226,6 +10250,8 @@ fi # library. #-------------------------------------------------------------------- +itk_STUB_LIB_FILE=${PKG_STUB_LIB_FILE} +itk_LIB_FILE=${PKG_LIB_FILE} @@ -10327,6 +10353,39 @@ echo "$as_me: error: No wish found in PA #-------------------------------------------------------------------- +# These are for itkConfig.sh +#-------------------------------------------------------------------- + +# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) +eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}" +if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}" + eval itk_STUB_LIB_FLAG="-litkstub${PACKAGE_VERSION}${DBGX}" +else + eval itk_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval itk_STUB_LIB_FLAG="-litkstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" +fi +itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}" +itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}" + +itk_BUILD_STUB_LIB_SPEC="-L`pwd` ${itk_STUB_LIB_FLAG}" +itk_STUB_LIB_SPEC="-L${pkglibdir} ${itk_STUB_LIB_FLAG}" +itk_BUILD_STUB_LIB_PATH="`pwd`/${itk_STUB_LIB_FILE}" +itk_STUB_LIB_PATH="${pkglibdir}/${itk_STUB_LIB_FILE}" + + + + + + + + +# itk_SRC_DIR must be a fully qualified path +eval itk_SRC_DIR="$srcdir" +itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd` + + +#-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. #-------------------------------------------------------------------- @@ -11074,6 +11133,13 @@ s,@RANLIB_STUB@,$RANLIB_STUB,;t t s,@itkstub_LIB_FILE@,$itkstub_LIB_FILE,;t t s,@itk_LIB_FILE@,$itk_LIB_FILE,;t t s,@WISH_PROG@,$WISH_PROG,;t t +s,@itk_BUILD_LIB_SPEC@,$itk_BUILD_LIB_SPEC,;t t +s,@itk_LIB_SPEC@,$itk_LIB_SPEC,;t t +s,@itk_BUILD_STUB_LIB_SPEC@,$itk_BUILD_STUB_LIB_SPEC,;t t +s,@itk_STUB_LIB_SPEC@,$itk_STUB_LIB_SPEC,;t t +s,@itk_BUILD_STUB_LIB_PATH@,$itk_BUILD_STUB_LIB_PATH,;t t +s,@itk_STUB_LIB_PATH@,$itk_STUB_LIB_PATH,;t t +s,@itk_SRC_DIR@,$itk_SRC_DIR,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: itk/configure.in =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itk/configure.in,v retrieving revision 1.33 diff -u -p -u -p -r1.33 configure.in --- itk/configure.in 25 Mar 2005 19:39:53 -0000 1.33 +++ itk/configure.in 30 Apr 2005 18:06:13 -0000 @@ -86,7 +86,7 @@ TEA_ADD_HEADERS([generic/itk.h generic/i TEA_ADD_INCLUDES([${ITCL_INCLUDES} -I\"`${CYGPATH} ${srcdir}/generic`\"]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) -#TEA_ADD_STUB_SOURCES([itkStubLib.c]) +TEA_ADD_STUB_SOURCES([itkStubLib.c]) TEA_ADD_TCL_SOURCES([library/Archetype.itk library/Toplevel.itk library/Widget.itk @@ -219,6 +219,8 @@ fi # library. #-------------------------------------------------------------------- +itk_STUB_LIB_FILE=${PKG_STUB_LIB_FILE} +itk_LIB_FILE=${PKG_LIB_FILE} AC_SUBST(itkstub_LIB_FILE) AC_SUBST(itk_LIB_FILE) @@ -234,6 +236,39 @@ TEA_PROG_TCLSH TEA_PROG_WISH #-------------------------------------------------------------------- +# These are for itkConfig.sh +#-------------------------------------------------------------------- + +# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) +eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}" +if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}" + eval itk_STUB_LIB_FLAG="-litkstub${PACKAGE_VERSION}${DBGX}" +else + eval itk_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval itk_STUB_LIB_FLAG="-litkstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" +fi +itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}" +itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}" + +itk_BUILD_STUB_LIB_SPEC="-L`pwd` ${itk_STUB_LIB_FLAG}" +itk_STUB_LIB_SPEC="-L${pkglibdir} ${itk_STUB_LIB_FLAG}" +itk_BUILD_STUB_LIB_PATH="`pwd`/${itk_STUB_LIB_FILE}" +itk_STUB_LIB_PATH="${pkglibdir}/${itk_STUB_LIB_FILE}" + +AC_SUBST(itk_BUILD_LIB_SPEC) +AC_SUBST(itk_LIB_SPEC) +AC_SUBST(itk_BUILD_STUB_LIB_SPEC) +AC_SUBST(itk_STUB_LIB_SPEC) +AC_SUBST(itk_BUILD_STUB_LIB_PATH) +AC_SUBST(itk_STUB_LIB_PATH) + +# itk_SRC_DIR must be a fully qualified path +eval itk_SRC_DIR="$srcdir" +itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd` +AC_SUBST(itk_SRC_DIR) + +#-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. #-------------------------------------------------------------------- Index: itk/itkConfig.sh.in =================================================================== RCS file: /cvsroot/incrtcl/incrTcl/itk/itkConfig.sh.in,v retrieving revision 1.2 diff -u -p -u -p -r1.2 itkConfig.sh.in --- itk/itkConfig.sh.in 10 Aug 2004 20:58:44 -0000 1.2 +++ itk/itkConfig.sh.in 30 Apr 2005 18:06:13 -0000 @@ -6,40 +6,57 @@ # This script is intended to be included by the configure scripts # for Itk extensions so that they don't have to figure this all # out for themselves. This file does not duplicate information -# already provided by tclConfig.sh, tkConfig.sh or itclConfig.sh, +# already provided by tkConfig.sh, tkConfig.sh or itkConfig.sh, # so you may need to use those files in addition to this one. # # The information in this file is specific to a single platform. -# Itcl's version number. -ITCL_VERSION='@ITCL_VERSION@' +# Itk's version number. +itk_VERSION='@PACKAGE_VERSION@' +ITK_VERSION='@PACKAGE_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@' + +# String to pass to linker to pick up the Itk stub library from its +# build directory. +itk_BUILD_STUB_LIB_PATH='@itk_BUILD_STUB_LIB_PATH@' +ITK_BUILD_STUB_LIB_PATH='@itk_BUILD_STUB_LIB_PATH@' + +# String to pass to linker to pick up the Itk stub library from its +# installed directory. +itk_STUB_LIB_PATH='@itk_STUB_LIB_PATH@' +ITK_STUB_LIB_PATH='@itk_STUB_LIB_PATH@' # 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 -# 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@' +# was built. This is the directory that contains generic, unix, etc. +# If [incr Tk] was 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@'