From 17ad8ae112c8a4072e863d0f4a9b47f1962512e4 Mon Sep 17 00:00:00 2001 From: hunt Date: Tue, 21 Jan 2003 21:04:22 +0000 Subject: [PATCH] Updated to itcl 3.2.1. --- itcl/ChangeLog | 2119 ++++++++++++++++++++----------------- itcl/Makefile.in | 2 +- itcl/configure | 68 +- itcl/configure.in | 2 +- itcl/cygtcl.m4 | 18 +- itcl/itcl/configure | 164 ++- itcl/itcl/configure.in | 2 +- itcl/itcl/doc/Resolvers.3 | 222 ---- itcl/itcl/generic/itcl.h | 16 +- itcl/itcl/generic/itclInt.decls | 2 +- itcl/itcl/generic/itclInt.h | 7 + itcl/itcl/generic/itclIntDecls.h | 4 +- itcl/itcl/generic/itclStubLib.c | 4 +- itcl/itcl/generic/itcl_bicmds.c | 4 +- itcl/itcl/generic/itcl_class.c | 81 +- itcl/itcl/generic/itcl_cmds.c | 50 +- itcl/itcl/generic/itcl_ensemble.c | 28 +- itcl/itcl/generic/itcl_methods.c | 21 +- itcl/itcl/generic/itcl_objects.c | 29 +- itcl/itcl/generic/itcl_obsolete.c | 10 +- itcl/itcl/generic/itcl_parse.c | 18 +- itcl/itcl/generic/itcl_util.c | 28 +- itcl/itcl/itclConfig.sh.in | 11 +- itcl/itcl/library/itcl.tcl | 101 +- itcl/itcl/tests/interp.test | 15 + itcl/itcl/unix/Makefile.in | 321 ------ itcl/itcl/unix/configure | 1521 -------------------------- itcl/itcl/unix/configure.in | 224 ---- itcl/itcl/unix/pkgIndex.tcl.in | 3 - itcl/itcl/win/configure | 37 +- itcl/itcl/win/itcl.rc | 42 - itcl/itcl/win/itclsh.rc | 37 - itcl/itcl/win/makefile.bc | 425 ++++---- itcl/itcl/win/makefile.vc | 598 ++++++----- itcl/itcl/win/pkgIndex.tcl | 3 - itcl/itcl/win/tclAppInit.c | 280 ----- itcl/itk/configure | 182 ++-- itcl/itk/configure.in | 2 +- itcl/itk/demos/itkedit | 18 +- itcl/itk/generic/itk.decls | 6 +- itcl/itk/generic/itk.h | 10 +- itcl/itk/generic/itkDecls.h | 12 +- itcl/itk/generic/itkStubInit.c | 2 +- itcl/itk/generic/itkStubLib.c | 4 +- itcl/itk/generic/itk_archetype.c | 57 +- itcl/itk/generic/itk_cmds.c | 50 +- itcl/itk/itkConfig.sh.in | 12 +- itcl/itk/library/Toplevel.itk | 6 - itcl/itk/library/Widget.itk | 6 - itcl/itk/library/itk.tcl | 1 - itcl/itk/tests/toplevel.test | 39 - itcl/itk/tests/widget.test | 36 - itcl/itk/unix/Makefile.in | 336 ------ itcl/itk/unix/configure | 1608 ---------------------------- itcl/itk/unix/configure.in | 278 ----- itcl/itk/unix/pkgIndex.tcl.in | 3 - itcl/itk/win/configure | 37 +- itcl/itk/win/dllEntryPoint.c | 76 +- itcl/itk/win/makefile.bc | 455 ++++---- itcl/itk/win/makefile.vc | 598 +++++------ itcl/itk/win/rc/cursor00.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor02.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor04.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor06.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor08.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor0a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor0c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor0e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor10.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor12.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor14.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor16.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor18.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor1a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor1c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor1e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor20.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor22.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor24.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor26.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor28.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor2a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor2c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor2e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor30.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor32.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor34.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor36.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor38.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor3a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor3c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor3e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor40.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor42.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor44.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor46.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor48.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor4a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor4c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor4e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor50.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor52.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor54.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor56.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor58.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor5a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor5c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor5e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor60.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor62.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor64.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor66.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor68.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor6a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor6c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor6e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor70.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor72.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor74.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor76.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor78.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor7a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor7c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor7e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor80.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor82.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor84.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor86.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor88.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor8a.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor8c.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor8e.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor90.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor92.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor94.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor96.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/cursor98.cur | Bin 326 -> 0 bytes itcl/itk/win/rc/itk.rc | 188 ++-- itcl/itk/win/rc/itkwish.rc | 43 - itcl/itk/win/winMain.c | 345 ------ itcl/makefile.bc | 229 ++-- itcl/makefile.vc | 140 +-- 142 files changed, 2977 insertions(+), 8319 deletions(-) delete mode 100644 itcl/itcl/doc/Resolvers.3 delete mode 100644 itcl/itcl/unix/Makefile.in delete mode 100755 itcl/itcl/unix/configure delete mode 100644 itcl/itcl/unix/configure.in delete mode 100644 itcl/itcl/unix/pkgIndex.tcl.in delete mode 100644 itcl/itcl/win/itcl.rc delete mode 100644 itcl/itcl/win/itclsh.rc delete mode 100644 itcl/itcl/win/pkgIndex.tcl delete mode 100644 itcl/itcl/win/tclAppInit.c delete mode 100644 itcl/itk/unix/Makefile.in delete mode 100755 itcl/itk/unix/configure delete mode 100644 itcl/itk/unix/configure.in delete mode 100644 itcl/itk/unix/pkgIndex.tcl.in delete mode 100644 itcl/itk/win/rc/cursor00.cur delete mode 100644 itcl/itk/win/rc/cursor02.cur delete mode 100644 itcl/itk/win/rc/cursor04.cur delete mode 100644 itcl/itk/win/rc/cursor06.cur delete mode 100644 itcl/itk/win/rc/cursor08.cur delete mode 100644 itcl/itk/win/rc/cursor0a.cur delete mode 100644 itcl/itk/win/rc/cursor0c.cur delete mode 100644 itcl/itk/win/rc/cursor0e.cur delete mode 100644 itcl/itk/win/rc/cursor10.cur delete mode 100644 itcl/itk/win/rc/cursor12.cur delete mode 100644 itcl/itk/win/rc/cursor14.cur delete mode 100644 itcl/itk/win/rc/cursor16.cur delete mode 100644 itcl/itk/win/rc/cursor18.cur delete mode 100644 itcl/itk/win/rc/cursor1a.cur delete mode 100644 itcl/itk/win/rc/cursor1c.cur delete mode 100644 itcl/itk/win/rc/cursor1e.cur delete mode 100644 itcl/itk/win/rc/cursor20.cur delete mode 100644 itcl/itk/win/rc/cursor22.cur delete mode 100644 itcl/itk/win/rc/cursor24.cur delete mode 100644 itcl/itk/win/rc/cursor26.cur delete mode 100644 itcl/itk/win/rc/cursor28.cur delete mode 100644 itcl/itk/win/rc/cursor2a.cur delete mode 100644 itcl/itk/win/rc/cursor2c.cur delete mode 100644 itcl/itk/win/rc/cursor2e.cur delete mode 100644 itcl/itk/win/rc/cursor30.cur delete mode 100644 itcl/itk/win/rc/cursor32.cur delete mode 100644 itcl/itk/win/rc/cursor34.cur delete mode 100644 itcl/itk/win/rc/cursor36.cur delete mode 100644 itcl/itk/win/rc/cursor38.cur delete mode 100644 itcl/itk/win/rc/cursor3a.cur delete mode 100644 itcl/itk/win/rc/cursor3c.cur delete mode 100644 itcl/itk/win/rc/cursor3e.cur delete mode 100644 itcl/itk/win/rc/cursor40.cur delete mode 100644 itcl/itk/win/rc/cursor42.cur delete mode 100644 itcl/itk/win/rc/cursor44.cur delete mode 100644 itcl/itk/win/rc/cursor46.cur delete mode 100644 itcl/itk/win/rc/cursor48.cur delete mode 100644 itcl/itk/win/rc/cursor4a.cur delete mode 100644 itcl/itk/win/rc/cursor4c.cur delete mode 100644 itcl/itk/win/rc/cursor4e.cur delete mode 100644 itcl/itk/win/rc/cursor50.cur delete mode 100644 itcl/itk/win/rc/cursor52.cur delete mode 100644 itcl/itk/win/rc/cursor54.cur delete mode 100644 itcl/itk/win/rc/cursor56.cur delete mode 100644 itcl/itk/win/rc/cursor58.cur delete mode 100644 itcl/itk/win/rc/cursor5a.cur delete mode 100644 itcl/itk/win/rc/cursor5c.cur delete mode 100644 itcl/itk/win/rc/cursor5e.cur delete mode 100644 itcl/itk/win/rc/cursor60.cur delete mode 100644 itcl/itk/win/rc/cursor62.cur delete mode 100644 itcl/itk/win/rc/cursor64.cur delete mode 100644 itcl/itk/win/rc/cursor66.cur delete mode 100644 itcl/itk/win/rc/cursor68.cur delete mode 100644 itcl/itk/win/rc/cursor6a.cur delete mode 100644 itcl/itk/win/rc/cursor6c.cur delete mode 100644 itcl/itk/win/rc/cursor6e.cur delete mode 100644 itcl/itk/win/rc/cursor70.cur delete mode 100644 itcl/itk/win/rc/cursor72.cur delete mode 100644 itcl/itk/win/rc/cursor74.cur delete mode 100644 itcl/itk/win/rc/cursor76.cur delete mode 100644 itcl/itk/win/rc/cursor78.cur delete mode 100644 itcl/itk/win/rc/cursor7a.cur delete mode 100644 itcl/itk/win/rc/cursor7c.cur delete mode 100644 itcl/itk/win/rc/cursor7e.cur delete mode 100644 itcl/itk/win/rc/cursor80.cur delete mode 100644 itcl/itk/win/rc/cursor82.cur delete mode 100644 itcl/itk/win/rc/cursor84.cur delete mode 100644 itcl/itk/win/rc/cursor86.cur delete mode 100644 itcl/itk/win/rc/cursor88.cur delete mode 100644 itcl/itk/win/rc/cursor8a.cur delete mode 100644 itcl/itk/win/rc/cursor8c.cur delete mode 100644 itcl/itk/win/rc/cursor8e.cur delete mode 100644 itcl/itk/win/rc/cursor90.cur delete mode 100644 itcl/itk/win/rc/cursor92.cur delete mode 100644 itcl/itk/win/rc/cursor94.cur delete mode 100644 itcl/itk/win/rc/cursor96.cur delete mode 100644 itcl/itk/win/rc/cursor98.cur delete mode 100644 itcl/itk/win/rc/itkwish.rc delete mode 100644 itcl/itk/win/winMain.c diff --git a/itcl/ChangeLog b/itcl/ChangeLog index 8a01885939..c6782351a3 100644 --- a/itcl/ChangeLog +++ b/itcl/ChangeLog @@ -1,413 +1,606 @@ -2002-09-05 Keith Seitz - - * itk/Makefile.in (distclean): Remove pkgIndex.tcl and - itkConfig.sh - * itcl/Makefile.in (distclean): Remove pkgIndex.tcl and - itclConfig.sh - * iwidgets3.0.0/Makefile.in (distclean): Remove pkgIndex.tcl and - iwidgets.tcl. - * configure.in (subdirs): New variable. Don't put AC_CONFIG_SUBDIRS - macro into configure.in twice: it confuses autoconf. Instead use - the variable to hold the subdirs to be configured. - * configure: Regenerated. - -2002-09-04 Keith Seitz - - From Chris Drexler : - * iwidgets3.0.0/doc/tk2html.perl: - Change hard coded path name of perl so that - rpm will not complain at install time. - -2002-08-06 Keith Seitz - - From Mo Dejong : - * iwidgets3.0.0/Makefile.in: Don't create a symlink - from $(SCRIPT_INSTALL_DIR) to $(LIB_INSTALL_DIR)/iwidgets. - Remove LN_S and LIB_INSTALL_DIR variables. - -2002-08-06 Keith Seitz - - From Mo Dejong : - * configure.in: Don't configure iwidgets when building - Source-Navigator. - * configure: Regenerated. - -2002-06-03 Keith Seitz - - From Mo Dejong : - * itk/generic/itk_archetype.c (ArchComponent, Itk_ArchCompDeleteCmd, - Itk_CreateArchComponent, Itk_DelArchComponent): Save a copy - of the window path name in the ArchComponent struct and use - it in the Itk_ArchCompDeleteCmd method. The old code was - invoking Tk_PathName(tkwin) on a Tk_Window which lead to - a memory access on memory that has already been free'd - when the widget was destroyed. - * itk/library/itk.tcl (itk::remove_destroy_hook): Don't attempt - to remove the widget binding if the widget has already been - destroyed. - -2002-04-17 Keith Seitz - - From investigative work by Ton van Overbeek : - * iwidgets3.0.0/generic/scrolledhtml.itk (_defUnknownImg): Add - global namespace qualifier to "image" command, since a parent - class now defines an image method. - (::iwidgets::scrolledhtml::destructor): Likewise. - (::iwidgets::Scrolledhtml::unknownimage): Likewise. - (::iwidgets::scrolledhtml::clear): Likewise. - (::iwidgets::scrolledhtml::_entity_img): Likewise. - -2002-04-01 Keith Seitz - - * iwidgets3.0.0/generic/feedback.itk: Import version 1.5. - (iwidgets::Feedback): Define new option, "-fraction". - (fraction): New configbody. - (step): Cap the step increment at the total number of - requested steps. - -2002-02-21 Mo DeJong - - * itk/library/Toplevel.itk (destructor): - * itk/library/Widget.itk (destructor): Remove the - hull component after destroying the hull. - Destroy any component that still exists after - destroying the hull since it must have been - created outside the hull. - * itk/tests/toplevel.test: - * itk/tests/widget.test: Test that a component - outside the hull is destroyed when the mega-widget - is destroyed. - -2002-01-15 Keith Seitz - - * itcl/library/itcl.tcl: Add recognition for "class", "body", - "ensemble", and "configbody" without the "itcl::" namespace - qualifier. - (auto_mkindex_parser::command public): If given an argument - list of just one item, re-eval it again so that the whole - thing is not interpreted as one humongous command. - -2002-01-11 Keith Seitz - - * iwidgets3.0.0/Makefile.in (install-libraries): Don't install - $(GENERIC_DIR)/*.tcl: there are no such files. - -2001-10-12 Christopher Faylor - - * itcl/win/Makefile.in: Fix typo in cygitcl.res build. - -2001-08-08 Mo DeJong - - * cygtcl.m4: Update from Tcl. - * itcl/configure: Regen. - * itk/configure: Regen. - -2001-08-06 Mo DeJong - - * cygtcl.m4: Update from Tcl. - * itcl/configure: Regen. - * itk/configure: Regen. - This update pulls in the library name changes so Itcl - uses the "rh" or "cyg" vendor prefix if set. - -2001-08-01 Mo DeJong - - * cygtcl.m4: Update from Tcl. - * itcl/configure: Regen. - * itcl/configure.in: Use TCL_TOOL_SHARED_LIB_LONGNAME - and TCL_TOOL_STATIC_LIB_LONGNAME to generate lib names. - * itk/configure: Regen. - * itk/configure.in: Use TCL_TOOL_SHARED_LIB_LONGNAME - and TCL_TOOL_STATIC_LIB_LONGNAME to generate lib names. - -2001-07-12 Mo DeJong - - * tcl.m4 (SC_MAKE_LIB): Add support for building with gcc - under Windows. Add POST_MAKE_LIB and POST_MAKE_STATIC_LIB - substitutions to deal with ranlib issues. - * itcl/Makefile.in: Subst POST_MAKE_LIB and POST_MAKE_STATIC_LIB - into lib and stub lib targets. - * itcl/configure: Regen. - * itcl/configure.in: Set ITCL_LIB_FILE to the static import lib - name when building a shared lib under Windows. Set itcl_LIB_FILE - to the dll name when building under Windows. Use unquoted - TCL_BUILD_STUB_LIB_SPEC in SHLIB_LD_LIBS. - * itk/Makefile.in: Subst POST_MAKE_LIB and POST_MAKE_STATIC_LIB - into lib and stub lib targets. - * itk/configure: Regen. - * itk/configure.in: Set ITK_LIB_FILE to the static import lib - name when building a shared lib under Windows. Set itk_LIB_FILE - to the dll name when building under Windows. Use unquoted - TCL_BUILD_STUB_LIB_SPEC in SHLIB_LD_LIBS. - -2001-07-11 Mo DeJong - - * cygtcl.m4: Update from Tcl. - * itcl/configure: Regen. - * itcl/configure.in: Use AC_CHECK_PROG to set CYGPATH - so that cross compiling works correctly. - * itk/configure: Regen. - * itk/configure.in: Use AC_CHECK_PROG to set CYGPATH - so that cross compiling works correctly. - -2001-07-11 Mo DeJong - - * Makefile.in: If an error is returned by the make - in a subdirectory exit from the parent make instead - of processing the next subdirectory. - -2001-06-22 Mo DeJong - - * cygtcl.m4: Update from Tcl. - * tcl.m4: Use $host to determine system type - instead of invoking uname. Add support for - mingw32 and windows32 host identifiers. - * itcl/configure: Regen. - * itcl/configure.in: Ditto. - * itk/configure: Regen. - * itk/configure.in: Ditto. - -2001-06-20 Mo DeJong - - * tcl.m4 (SC_ENABLE_GCC, SC_CONFIG_CFLAGS, SC_SERIAL_PORT, - SC_MISSING_POSIX_HEADERS, SC_PATH_X, SC_BLOCKING_STYLE, - SC_HAVE_VFORK, SC_TIME_HANLDER, SC_BUGGY_STRTOD, - SC_TCL_LINK_LIBS, SC_LIB_SPEC, SC_PUBLIC_TCL_HEADERS, - SC_PUBLIC_TK_HEADERS, SC_SIMPLE_EXEEXT, SC_PROG_TCLSH, - SC_PROG_WISH): - Remove unused macros. The Itcl version of tcl.m4 has - already diverged from the Tcl one. Since we need to - maintain this Itcl version separately, it should be - as simple as possible. - -2001-06-11 Mo DeJong - - * tcl.m4 (SC_ENABLE_SHARED): Configure with shared library - support when building under Windows. - * itcl/configure: Regen. - * itk/configure: Regen. - -2001-06-06 Mo DeJong - - * itk/aclocal.m4: Pull in ../../config/acinclude.m4 - so we can use the CYG_AC_PATH_ITCLCONFIG and - CYG_AC_LOAD_ITCLCONFIG macros. - * itk/configure: Regen. - * itk/configure.in: Call CYG_AC_PATH_ITCLCONFIG - and CYG_AC_LOAD_ITCLCONFIG to load the itclConfig.sh - config file. The existing configure script would - try to figure out lib file names by hand. - -2001-06-06 Mo DeJong - - * itk/configure: Regen. - * itk/configure.in: Use TCL_BUILD_STUB_LIB_SPEC in place - of TCL_BUILD_STUB_LIB_PATH. Use TK_BUILD_STUB_LIB_SPEC - in place of TK_STUB_LIB_SPEC since the tk stub lib - would not have been installed yet. - -2001-06-05 Mo DeJong - - * itcl/configure: Regen. - * itcl/configure.in: Use TCL_BUILD_STUB_LIB_PATH instead - of TCL_STUB_LIB_PATH since Tcl is not install yet. - * itk/configure: Regen. - * itk/configure.in: Use TCL_BUILD_STUB_LIB_PATH instead - of TCL_STUB_LIB_PATH since Tcl is not install yet. - -2001-06-05 Mo DeJong - - * cygtcl.m4: - * itcl/configure: - * itk/configure: Update from Tcl. +2001-09-06 David Gravereaux -2001-06-01 Mo DeJong + * itcl/generic/itcl_util.c: Threading patch from "Haneef Mohammed" + . + [Patch: 445670] - * cygtcl.m4: - * itcl/configure: - * itk/configure: Update from Tcl. + -=[ Incr Tcl/Tk 3.2.1 tagged as done. ]=- + +2001-06-22 David Gravereaux + + * tcl.m4: Added support for MacOS X [#435256] + + * itk/win/makefile.vc: fixed a bad macro use in the genstubs target. + + * itk/generic/itk_cmds.c: Added Itk_SafeInit(). + + * itk/generic/itk.decls: + * itk/generic/itkDecls.h: + * itk/generic/itkStubInit.c: Needed to add Itk_SafeInit() to the Stubs table. + Regen'd Stubs table. -2001-06-01 Mo DeJong +2001-05-28 Andreas Kupries - * itcl/configure: Regen. - * itcl/configure.in: Define ITCL_LIB_FILE and ITCL_STUB_LIB_FILE - before using them. - * itk/configure: Regen. - * itk/configure.in: Define ITK_LIB_FILE and ITK_STUB_LIB_FILE - before using them. - * itk/itkConfig.sh.in: Add ITK_STUB_LIB_FILE, ITK_BUILD_STUB_LIB_SPEC, - ITK_STUB_LIB_SPEC, and ITK_STUB_LIB_FULL_PATH variables. + * itcl/Makefile.in: + * itk/Makefile.in: + * iwidgets/Makefile.in: Fixed installation of manpages, added + invocations of "basename" to create the correct paths into the + installation directories. Fixes [#427118]. -2001-05-31 Mo DeJong +2001-05-25 davygrvy + * ChangeLog (new): + Auto-generated this from the output of `cvs log`. This will be the + day-to-day reference of per-commits. CHANGES will now be the digest + of the data in here. Just like how Tcl does it. Information from + iwidgets was not used. - * itcl/win/dllEntryPoint.c: Add #endif that was - accidently left out during the Itcl 3.0 -> 3.2 - merge process. + * itk/generic/itk.h: + * itk/generic/itkStubLib.c: + * itk/generic/itk_cmds.c: + added CONST to return type for Itk_InitStubs() to match what Kevin Kenny + is doing to Tcl. Along with a little lint cleaning regarding Stubs. -2001-05-30 Mo DeJong + * itcl/generic/itcl.h: + * itcl/generic/itclStubLib.c: + added CONST to return type for Itcl_InitStubs() to match what + Kevin Kenny is doing to Tcl + +2001-05-24 davygrvy + * README.vc.txt: + instructions how to use makefile.vc to build the package - * configure: Regen. - * tcl.m4 (SC_PATH_TCLCONFIG, SC_PATH_TKCONFIG): Check - in win subdirectory in addition to unix subdirectory for - tclConfig.sh and tkConfig.sh files. * itcl/configure: - * itk/configure: Regen. - * iwidgets3.0.0/configure: Regen. + * itcl/configure.in: + * itcl/itclConfig.sh.in: + * itk/configure: + * itk/configure.in: + * itk/itkConfig.sh.in: + Bug #427113 + +2001-05-23 davygrvy + * itcl/win/makefile.vc: + added missing quotes around include paths. -2001-05-30 Mo DeJong + * .cvsignore: + * configure: + * configure.in: + changed configure.in to the new iwidgets subdir. Removed the older + references to iwidgets3.0.0 and iwidgets2.2.0 + + * configure: + this could be useful. - * configure: Regen. - * tcl.m4 (SC_PATH_TCLCONFIG, SC_PATH_TKCONFIG): Generate - an error instead of a warning when config files cannot be found. + * itcl/.cvsignore: * itcl/configure: - * itk/configure: Regen. - * iwidgets3.0.0/configure: Regen. + * itcl/configure.in: + * itk/.cvsignore: + * itk/configure: + * itk/configure.in: + Updated patch level to 3.2.1 in prep for a release. -2001-05-29 Mo DeJong + * itcl/win/makefile.vc: + * itcl/win/rc/itcl.rc: + yet another rc problem repaired - * cygtcl.m4: Add from tcl module. - * itcl/aclocal.m4: Include cygtcl.m4. - * itcl/configure: Regen. - * itcl/configure.in: Fix --prefix variable. Use TCL_TOOL macros - to deal with path name portibility issues. - * itcl/itclConfig.sh.in: Add full path and stub lib vars. - * itk/aclocal.m4: Include cygtcl.m4. - * itk/configure: Regen. - * itk/configure.in: Fix --prefix variable. Use TCL_TOOL macros - to deal with path name portibility issues. - * iwidgets3.0.0/aclocal.m4: Include cygtcl.m4. - * iwidgets3.0.0/configure: Regen. + * itcl/win/makefile.vc: + rc problem repaired -2001-05-29 Mo DeJong +2001-05-22 davygrvy + * itcl/generic/itcl_objects.c: + * itcl/tests/interp.test: + patch #426205, self deleting class caused core dump. - * itk/configure: Regen. - * itk/configure.in: Adjust AC_CONFIG_AUX_DIR() - and fix --prefix and --exec-prefix variables. + * itk/generic/itk_archetype.c: + * itk/generic/itk_cmds.c: + Fix for Tcl_GetCommandName() now returning a CONST char * + from the changes Kevin Kenny is doing to the HEAD tcl code. + This hasn't been tested with older header files, yet. -2001-05-25 Mo DeJong + * config.vc: + * itcl/win/makefile.vc: + * itk/win/makefile.vc: + * itk/win/rc/itk.rc: + * makefile.vc: + makefile.vc actually works again. + + * itk/win/rc/cursor00.cur: + * itk/win/rc/cursor02.cur: + * itk/win/rc/cursor04.cur: + * itk/win/rc/cursor06.cur: + * itk/win/rc/cursor08.cur: + * itk/win/rc/cursor0a.cur: + * itk/win/rc/cursor0c.cur: + * itk/win/rc/cursor0e.cur: + * itk/win/rc/cursor10.cur: + * itk/win/rc/cursor12.cur: + * itk/win/rc/cursor14.cur: + * itk/win/rc/cursor16.cur: + * itk/win/rc/cursor18.cur: + * itk/win/rc/cursor1a.cur: + * itk/win/rc/cursor1c.cur: + * itk/win/rc/cursor1e.cur: + * itk/win/rc/cursor20.cur: + * itk/win/rc/cursor22.cur: + * itk/win/rc/cursor24.cur: + * itk/win/rc/cursor26.cur: + * itk/win/rc/cursor28.cur: + * itk/win/rc/cursor2a.cur: + * itk/win/rc/cursor2c.cur: + * itk/win/rc/cursor2e.cur: + * itk/win/rc/cursor30.cur: + * itk/win/rc/cursor32.cur: + * itk/win/rc/cursor34.cur: + * itk/win/rc/cursor36.cur: + * itk/win/rc/cursor38.cur: + * itk/win/rc/cursor3a.cur: + * itk/win/rc/cursor3c.cur: + * itk/win/rc/cursor3e.cur: + * itk/win/rc/cursor40.cur: + * itk/win/rc/cursor42.cur: + * itk/win/rc/cursor44.cur: + * itk/win/rc/cursor46.cur: + * itk/win/rc/cursor48.cur: + * itk/win/rc/cursor4a.cur: + * itk/win/rc/cursor4c.cur: + * itk/win/rc/cursor4e.cur: + * itk/win/rc/cursor50.cur: + * itk/win/rc/cursor52.cur: + * itk/win/rc/cursor54.cur: + * itk/win/rc/cursor56.cur: + * itk/win/rc/cursor58.cur: + * itk/win/rc/cursor5a.cur: + * itk/win/rc/cursor5c.cur: + * itk/win/rc/cursor5e.cur: + * itk/win/rc/cursor60.cur: + * itk/win/rc/cursor62.cur: + * itk/win/rc/cursor64.cur: + * itk/win/rc/cursor66.cur: + * itk/win/rc/cursor68.cur: + * itk/win/rc/cursor6a.cur: + * itk/win/rc/cursor6c.cur: + * itk/win/rc/cursor6e.cur: + * itk/win/rc/cursor70.cur: + * itk/win/rc/cursor72.cur: + * itk/win/rc/cursor74.cur: + * itk/win/rc/cursor76.cur: + * itk/win/rc/cursor78.cur: + * itk/win/rc/cursor7a.cur: + * itk/win/rc/cursor7c.cur: + * itk/win/rc/cursor7e.cur: + * itk/win/rc/cursor80.cur: + * itk/win/rc/cursor82.cur: + * itk/win/rc/cursor84.cur: + * itk/win/rc/cursor86.cur: + * itk/win/rc/cursor88.cur: + * itk/win/rc/cursor8a.cur: + * itk/win/rc/cursor8c.cur: + * itk/win/rc/cursor8e.cur: + * itk/win/rc/cursor90.cur: + * itk/win/rc/cursor92.cur: + * itk/win/rc/cursor94.cur: + * itk/win/rc/cursor96.cur: + * itk/win/rc/cursor98.cur: + * itk/win/rc/itkwish.rc: + * itk/win/winMain.c: + Removing of old cruft. itkwishXX.exe is no longer needed as itkXX.dll is a + pure extension and loads in a vanilla wish just fine. - * itcl/itcl/Makefile.in: - * itk/Makefile.in: - * iwidgets3.0.0/Makefile.in: Install cross - platform itk and itk files in @datadir@ (share). + * itcl/win/pkgIndex.tcl: + * itk/win/pkgIndex.tcl: + we'll auto gen these from the makefile -2001-05-24 Mo DeJong + * itcl/win/makefile.vc: + * itk/win/makefile.vc: + fixed include paths to make sure paths to itcl.h and itk.h in the source tree + are mentioned first to avoid a possible bug during building. - * itcl/configure: Regen. + * itcl/configure: * itcl/configure.in: - Use fully qualified srcdir, add ITCL_SRC_DIR_NATIVE variable. - Don't call the SC_PROG_TCLSH macro since it does not bootstrap. - Add itclConfig.sh back to configure.in, it was lost at some point. - * itk/configure: Regen. + * itk/configure: * itk/configure.in: - Use fully qualified srcdir, add ITK_SRC_DIR_NATIVE variable. - Don't call SC_PROG_TCLSH or SC_PROG_WISH macros since they - do not bootstrap. - Add itkConfig.sh back to configure.in, it was lost at some point. - * iwidgets3.0.0/configure: Regen. - * iwidgets3.0.0/configure.in: - Don't call the SC_PROG_TCLSH macro since it does not bootstrap. - -2001-05-24 Mo DeJong - - * tcl.m4 (SC_LIB_SPEC): Add note about broken - SC_LIB_SPEC macro. It does not effect us since - we only build static libs. - * itcl/configure: Regen. - * itcl/configure.in: Call AC_PROG_CC and not - SC_ENABLE_GCC since it break cross compiling. - * itk/configure: Regen. - * itk/configure.in: Ditto. - -2001-05-23 Mo DeJong - - * configure: Regen. - * tcl.m4: Default to building an unshared - version of the Itcl library. - * itcl/configure: Regen. - * itk/configure: Regen. - * iwidgets3.0.0/configure: Regen. - -2001-05-23 Mo DeJong - - * itcl/unix/aclocal.m4: - * itcl/unix/tcl.m4: - * itcl/win/aclocal.m4: - * itcl/win/tcl.m4: - * itk/unix/aclocal.m4: - * itk/unix/tcl.m4: - * itk/win/aclocal.m4: - * itk/win/tcl.m4: - Remove old autoconf files, they should - have been removed as part of the 3.0 -> 3.2 - transition. - -2001-05-23 Mo DeJong - - * config/installFile.tcl: Removed ill conceived - Tcl install script since it does not bootstrap. + patch #426203 + + * itk/win/makefile.vc: + Mostly working. Not fully tested, but lots closer. + + * itk/win/makefile.vc: + more closer, but not yet perfect. + + * itcl/generic/itcl_cmds.c: + * itcl/generic/itcl_methods.c: + Fix for Tcl_GetCommandName() now returning a CONST char * + from the changes Kevein Kenny is doing to the HEAD tcl code. + This hasn't been tested with older header files, yet. + + * itk/generic/itk_cmds.c: + Removed old reference to external ItkStubs structure. + Old cruft left from before Itk_InitStubs existed. + + * itcl/win/itcl.rc: + * itcl/win/rc/itcl.rc: + moving the resource script + + * itcl/win/rc/itcl.rc: + subtle changes. + + * itcl/win/itclsh.rc: + * itcl/win/tclAppInit.c: + Removing of old cruft. itclshXX.exe is no longer needed as itclXX.dll is a + pure extension and loads in a vanilla shell just fine. + + * itcl/generic/itcl_methods.c: + * itcl/generic/itcl_util.c: + removed #include "tclCompile.h"! + It wasn't needed. Those source files made no reference to anything in it. + + * itk/win/makefile.vc: + closer to perfection. + + * itk/win/rc/itk.rc: + This is now the resource script for the dll. + + * itcl/generic/itcl_methods.c: + whoops.. doh! + + * itk/win/dllEntryPoint.c: + Stubs bug logic fix. Same as itcl/win/dllEntryPoint.c. This help build a debug + version of itcl/itk from the standard tclstubXX.lib by removing the link + requirement to msvcrt.lib which should never have been there. + + * itcl/win/makefile.vc: + adapted for new location of itcl.rc + + * itk/win/rc/itk.rc: + subtle changes to infere the correct filename and support more + complete versioning info. + + * itcl/generic/itcl.h: + * itk/generic/itk.h: + changed RESOURCE_INCLUDED to RC_INVOKED. The windows resource + compiler to preset to define this already. + + * itcl/generic/itclInt.decls: + * itcl/generic/itclIntDecls.h: + * itcl/generic/itcl_class.c: + Fix for Itcl_ClassCmdResolver() not being of type Tcl_ResolveCmdProc with + the CONST type added to param 2 in the lastest headers. I haven't tested + this with an older tcl.h yet. Hopefully, this won't get messy. + + * itcl/win/makefile.vc: + small $(RCDIR) change. + + * itcl/generic/itcl_bicmds.c: + patch #426207, contextNs ptr can be NULL in Itcl_BiInfoClassCmd + ). + +2001-05-18 andreas_kupries + * itcl/generic/itcl_class.c: + [Fix 227811] Check for any command with the given name, not only + objects. + +2001-05-17 andreas_kupries + * itcl/generic/itcl_class.c: + * itcl/generic/itcl_cmds.c: + Fixed bug 227804. + +2001-05-11 andreas_kupries + * itk/generic/itk_archetype.c: + 2001-05-11 Andreas Kupries + + * itk/generic/itk_archetype.c: Fixed bug 227876. + + * itcl/generic/itcl_objects.c: + 2001-05-11 Andreas Kupries + + * itk/generic/itk_archetype.c: Fixed bug 227824 (and several duplicates). + + * itk/generic/itk_archetype.c: + 2001-05-11 Andreas Kupries + + * itk/generic/itk_archetype.c: Fixed bug 227814 + +2001-04-25 davygrvy + * pkg.vc: + moved the info about the iwidget version for makefile.vc + +2001-04-18 davygrvy + * itcl/win/dllEntryPoint.c: + whoops... removed C++ style comment from this .c file :) + +2001-04-14 davygrvy + * itcl/library/itcl.tcl: + Patch ID #227860 + + * rules.vc: + added an $Id$ keyword + + * .cvsignore: + just testing loginfo mailing... + + * .cvsignore: + only making a change to see the history file get an entry... + +2001-04-12 davygrvy + * itcl/win/makefile.vc: + progress is happening + +2001-04-08 davygrvy + * itcl/win/.cvsignore: + * itk/win/.cvsignore: + no need to have CVS bother itself with the build directories + + * itcl/win/makefile.vc: + a large rewrite + + * makefile.vc: + todays work progress. I'm not done yet. + + * itcl/generic/itcl_ensemble.c: + * itcl/generic/itcl_util.c: + Added mutex locking around the ItclPreservedList global hash table. This + appears to be the only work needed to support multithreading. + + * config.vc: + * pkg.vc: + * rules.vc: + new build files for VC++ compiles + + * .cvsignore: + ignore MSVC++ project artifacts + +2001-04-07 davygrvy + * itcl/win/dllEntryPoint.c: + a small windows specific fix against Tcl's Stubs library. + + * itcl/generic/itclInt.h: + * itcl/generic/itclStubLib.c: + * itcl/generic/itcl_class.c: + * itcl/generic/itcl_cmds.c: + * itcl/generic/itcl_ensemble.c: + 4/07/01 (bug fix) + Tcl's internal header, tclInt.h, in 8.4a2 got a small change in the Command + structure that needed 2 changes in Itcl to resolve. 1) #if/#else/#endif blocks + added in itcl_class.c and itc_ensemble.c allowing Itcl to compile. 2) added + a global variable called itclCompatFlags that's sets a flag in Itcl_Init() + that will modify the logic around access to cmdPtr->flags/deleted. This + way, any core compile will yeild a fully forward/backward compatible + binary (correct logic set at runtime). + +2000-12-21 smithc + * itk/win/makefile.vc: + Patch #102914. + +2000-12-12 smithc + * itcl/generic/itcl_ensemble.c: + Patch #102774 + + * itcl/generic/itcl_class.c: + Patch #100274 + +2000-09-23 davidg + * CHANGES: + added a note about the 3.2 release + + * itcl/generic/itcl.h: + 9/22/00 (stubs cleanup) + Itcl_InitStub prototype in itcl/generic/itcl.h was getting name mangled + by c++ compilers. Fixed with an 'extern "C"' appropriately applied. + +2000-08-18 davidg + * itcl/generic/itcl_cmds.c: + Tcl_InitStubs was using the TCL_VERSION macro set by the tcl.h header. + Changed it to be "8.1" instead as it doesn't matter unless Itcl needs + special/new features of the core it's header is from. But it doesn't.. so hard + code it for an 8.1 minimum. + +2000-08-07 welch + * itcl/Makefile.in: + * itcl/generic/itcl.h: + * itcl/generic/itclStubLib.c: + Final iteration, really, on getting Itcl_StubInit correctly set + up. + + * itk/generic/itk_cmds.c: + Removed redundant definitions of itclStubsPtr and + itclIntStubsPtr. + + * itcl/Makefile.in: + Added Itcl_InitStubs to the main Itcl library as well as the stubs + library for those applications (like Itk) that call Itcl_InitStub + but are linked against the main library. + + * CHANGES: + * CHANGES: + *** empty log message *** + +2000-08-04 davidg + * itcl/generic/itcl.decls: + * itcl/generic/itclDecls.h: + * itcl/generic/itclIntDecls.h: + * itcl/generic/itclStubInit.c: + * itk/generic/itk.decls: + * itk/generic/itkDecls.h: + * itk/generic/itkStubInit.c: + * itk/generic/itkStubLib.c: + added missing RCS $Id$ strings + + * itcl/generic/itcl.h: + * itcl/generic/itclStubLib.c: + * itk/generic/itk.h: + * itk/generic/itkStubLib.c: + yanked ugly linkage cruft from the StubLib functions. It's + always static. + +2000-08-02 davidg + * itk/generic/itk_cmds.c: + simplified how Itcl Stubs are set + + * itcl/generic/itcl.h: + * itk/generic/itk.h: + added missing Itcl_InitStubs and Itk_InitStubs declarations. + +2000-08-02 welch + * itk/generic/itkStubLib.c: + Fixed this new function + * itcl/Makefile.in: * itk/Makefile.in: - * iwidgets3.0.0/Makefile.in: Use @INSTALL@ instead - of installFile.tcl. - Don't remove man pages or html files before - installing. Don't chmod the installed files - since that will make a second call to make install - fail. + Changed this to use installFiles.tcl instead of install-sh -2001-05-17 Mo DeJong + * itcl/generic/itclStubLib.c: + Fix for new Itcl_InitStubs.c - Upgrade Itcl from 3.0 to 3.2. + * config/installFile.tcl: + Added a Tcl version of install-sh that avoids copying a file if + the target has the same size and date stamp as the source file already. + This helps parallel builds on different platforms avoid changing + files out from one another. + + * CHANGES: + *** empty log message *** + +2000-07-29 welch + * itcl/configure: + * itk/configure: + Ran autoconf + + * tcl.m4: + Fixed this with respect to recent changes in windows def of TCL_SRC_DIR + +2000-07-23 wart + * itcl/Makefile.in: + * itk/Makefile.in: + Use INSTALL_PROGRAM instead of INSTALL_DATA to install libraries so + they get execute permission on HPUX + +2000-07-14 welch + * itcl/configure: + * itk/configure: + Updated configure - * Makefile.in: - * aclocal.m4: Removed: - * configure: - * configure.in: - * license.terms: - * makefile.vc: - * tcl.m4: Added. * config/install-sh: - * config/installFile.tcl: Added. - * itcl/Makefile.in: Added. - * itcl/aclocal.m4: Added. - * itcl/configure: Added. - * itcl/configure.in: Added. - * itcl/pkgIndex.tcl: Added. - * itcl/pkgIndex.tcl.in: Added. - * itcl/doc/Resolvers.3: Removed. - * itcl/doc/find.n: - * itcl/doc/itcl_info.n: - * itcl/doc/itclvars.n: - * itcl/doc/scope.n: - * itcl/generic/itcl.decls: Added. - * itcl/generic/itcl.h: - * itcl/generic/itclDecls.h: Added. - * itcl/generic/itclInt.decls: Added. - * itcl/generic/itclInt.h: - * itcl/generic/itclIntDecls.h: Added. - * itcl/generic/itclStubInit.c: Added. - * itcl/generic/itclStubLib.c: Added. + Nuked debug echo statement + +2000-07-12 welch + * config/install-sh: + Added -f to MV command + + * CHANGES: + * Makefile.in: + Added some feedback to the top-level makefile loops + + * itcl/configure.in: + * itk/Makefile.in: + * itk/configure.in: + Disable stubs in the case of static builds. + +2000-07-07 csmith + * itcl/tests/info.test: + patch submitted by David Cuthbert, 7/7/00 + * itcl/generic/itcl_bicmds.c: + patch submitted by David Cuthbert, 7/7/00 to fix segfault caused by the + following code: + + itcl::class X { } + namespace eval X { info class } + +2000-07-06 mmc + * Makefile.in: + * README: + + Touched up README for itcl3.2 release. Fixed master Makefile to + avoid testing iwidgets2.2.0, which is an older release provided + only for backward-compatibility. Bug fixes and improvements are + made and tested in the newer iwidgets3.0.0 release. + + * CHANGES: + * itcl/generic/itcl.h: * itcl/generic/itcl_class.c: * itcl/generic/itcl_cmds.c: - * itcl/generic/itcl_ensemble.c: - * itcl/generic/itcl_linkage.c: - * itcl/generic/itcl_methods.c: - * itcl/generic/itcl_migrate.c: * itcl/generic/itcl_objects.c: - * itcl/generic/itcl_obsolete.c: - * itcl/generic/itcl_parse.c: - * itcl/generic/itcl_util.c: - * itcl/library/itcl.tcl: - * itcl/mac/MW_ItclHeader.pch: Added - * itcl/mac/itclMacLibrary.r: - * itcl/mac/pkgIndex.tcl: * itcl/tests/all: - * itcl/tests/all.tcl: Added. + * itcl/tests/all.tcl: + * itcl/tests/basic.test: + * itcl/tests/defs: + * itcl/tests/inherit.test: + * itcl/tests/methods.test: + * itcl/tests/namespace.test: + * itcl/unix/Makefile.in: + * itcl/unix/configure.in: + * itcl/unix/itclConfig.sh.in: + * itcl/unix/pkgIndex.tcl.in: + * itcl/unix/test.tcl: + * itk/Makefile.in: + * itk/generic/itk_archetype.c: + * itk/library/itk.tcl: + * itk/tests/all: + * itk/tests/all.tcl: + * itk/tests/defs: + * itk/tests/widget.test: + * itk/unix/Makefile.in: + * itk/unix/configure.in: + * itk/unix/itkConfig.sh: + * itk/unix/itkConfig.sh.in: + * itk/unix/pkgIndex.tcl.in: + + 6/26/00 (bug fix) + Fixed Itcl_ClassVarResolver so that the formal parameters in a + method/proc take precedence over class data members. + + 6/30/00 (bug fix) + Fixed all itcl/itk/iwidgets3.0.0 tests to run cleanly with the new + tcltest package. + + 7/1/00 (bug fix) + Fixed "itk_component delete" so that the composite option list is + cleaned up whenever a component is deleted. For example, suppose + a component is the sole contributor of -font. When that component + is removed via "itk_component delete", the -font option goes away + as well. Also fixed the handling of the itk-delete-* binding for + the component. When the component is removed, the binding tag + is also removed by itk::remove_destroy_hook. + + 7/5/00 (bug fix) + Fixed the check done during object creation to avoid clobbering + existing commands. Previously, itcl would look for any command-- + in the local *and* global namespace--that might be clobbered. + Now, it looks for commands only in the local namespace, since + those are the only ones that could truly be clobbered. + + 7/5/00 (cleanup) + Removed obsolete Makefile/configure files in the various "unix" + directories. Makefiles and configure files now reside one level + above, in the standard TEA place. + +2000-06-22 wart + * itcl/Makefile.in: + Added itclDecls.h to list of header files to install. + +2000-06-22 welch + * itk/Makefile.in: + Installing stub table tkDecls.h + + * itcl/Makefile.in: + Installing all header files, not just public ones. + +2000-06-16 matt + * itcl/generic/itcl_util.c: + Moved #ifndef NDEBUG inside Itcl_Assert routine otherwise it may not get inclued + BUT it is specified in the Stubs Table..... + +2000-06-06 wart + * itk/tests/all.tcl: + Added missing file for running test suite. + + * itcl/tests/all.tcl: + Added missing file for running test suite + +2000-06-01 wart + * itcl/Makefile.in: * itcl/tests/basic.test: * itcl/tests/body.test: * itcl/tests/chain.test: - * itcl/tests/defs: * itcl/tests/delete.test: * itcl/tests/ensemble.test: * itcl/tests/import.test: @@ -416,700 +609,634 @@ * itcl/tests/interp.test: * itcl/tests/local.test: * itcl/tests/methods.test: - * itcl/tests/mkindex.itcl: * itcl/tests/mkindex.test: * itcl/tests/namespace.test: * itcl/tests/protection.test: * itcl/tests/scope.test: - * itcl/tests/old/AAA.test: - * itcl/tests/old/Bar.tcl: - * itcl/tests/old/BarFoo.tcl: - * itcl/tests/old/Baz.tcl: - * itcl/tests/old/Foo.tcl: - * itcl/tests/old/FooBar.tcl: - * itcl/tests/old/Geek.tcl: - * itcl/tests/old/Mongrel.tcl: - * itcl/tests/old/VirtualErr.tcl: - * itcl/tests/old/all: - * itcl/tests/old/basic.test: - * itcl/tests/old/inherit.test: - * itcl/tests/old/testlib.tcl: - * itcl/tests/old/toaster.test: - * itcl/tests/old/uplevel.test: - * itcl/tests/old/upvar.test: - * itcl/tests/old/toasters/Appliance.tcl: - * itcl/tests/old/toasters/Hazard.tcl: - * itcl/tests/old/toasters/Outlet.tcl: - * itcl/tests/old/toasters/SmartToaster.tcl: - * itcl/tests/old/toasters/Toaster.tcl: - * itcl/tests/old/toasters/usualway.tcl: - * itcl/unix/Makefile.in: Removed. - * itcl/unix/confdefs.h: Removed. - * itcl/unix/config.log: Removed. - * itcl/unix/configure: Removed. - * itcl/unix/configure.in: Removed. - * itcl/unix/pkgIndex.tcl.in: Removed. - * itcl/win/Makefile.in: Removed. - * itcl/win/configure: Removed. - * itcl/win/configure.in: Removed. - * itcl/win/dllEntryPoint.c: - * itcl/win/itcl.rc: - * itcl/win/itclsh.rc: - * itcl/win/makefile.vc: - * itcl/win/pkgIndex.tcl: - * itk/Makefile.in: Added. - * itk/aclocal.m4: Added. - * itk/configure: Added. - * itk/configure.in: Added. - * itk/pkgIndex.tcl: Added. - * itk/pkgIndex.tcl.in: Added. - * itk/doc/Archetype.n: - * itk/doc/Toplevel.n: - * itk/doc/Widget.n: - * itk/doc/itk.n: - * itk/doc/itkvars.n: - * itk/doc/itkwish.1: - * itk/doc/usual.n: - * itk/generic/itk.decls: Added. - * itk/generic/itk.h: - * itk/generic/itkDecls.h: Added. - * itk/generic/itkStubInit.c: Added. - * itk/generic/itkStubLib.c: Added. - * itk/generic/itk_archetype.c: - * itk/generic/itk_cmds.c: - * itk/generic/itk_option.c: - * itk/generic/itk_util.c: - * itk/library/Archetype.itk: - * itk/library/Toplevel.itk: - * itk/library/Widget.itk: - * itk/library/itk.tcl: - * itk/mac/itkMacLibrary.r: - * itk/mac/pkgIndex.tcl: - * itk/tests/all: - * itk/tests/all.tcl: Added. - * itk/tests/defs: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: * itk/tests/interp.test: * itk/tests/option.test: * itk/tests/privacy.test: * itk/tests/public.test: * itk/tests/toplevel.test: * itk/tests/widget.test: - * itk/unix/Makefile.in: Removed. - * itk/unix/configure: Removed. - * itk/unix/configure.in: Removed. - * itk/unix/pkgIndex.tcl.in: Removed. - * itk/win/Makefile.in: Removed. - * itk/win/Makefile.in_first: Removed. - * itk/win/configure: Removed. - * itk/win/configure.in: Removed. - * itk/win/dllEntryPoint.c: - * itk/win/makefile.bc: - * itk/win/makefile.vc: - * itk/win/pkgIndex.tcl: - * itk/win/winMain.c: - * itk/win/rc/itk.rc: - * itk/win/rc/itkwish.rc: - * iwidgets3.0.0/CHANGES: - * iwidgets3.0.0/Makefile.in: Added. - * iwidgets3.0.0/README: - * iwidgets3.0.0/aclocal.m4: Added. - * iwidgets3.0.0/catalog: Removed. - * iwidgets3.0.0/configure: Added. - * iwidgets3.0.0/configure.in: Added. - * iwidgets3.0.0/iwidgets.tcl: Added. - * iwidgets3.0.0/iwidgets.tcl.in: Added. - * iwidgets3.0.0/pkgIndex.tcl: Added. - * iwidgets3.0.0/pkgIndex.tcl.in: Added. - * iwidgets3.0.0/demos/canvasprintbox: Added. - * iwidgets3.0.0/demos/catalog: Added. - * iwidgets3.0.0/demos/feedback: - * iwidgets3.0.0/demos/mainwindow: - * iwidgets3.0.0/demos/scopedobject: Added. - * iwidgets3.0.0/demos/shell: Added. - * iwidgets3.0.0/demos/watch: - * iwidgets3.0.0/demos/html/buttonbox.n.html: - * iwidgets3.0.0/demos/html/calendar.n.html: Added. - * iwidgets3.0.0/demos/html/canvasprintbox.n.html: - * iwidgets3.0.0/demos/html/canvasprintdialog.n.html: - * iwidgets3.0.0/demos/html/checkbox.n.html: Added. - * iwidgets3.0.0/demos/html/combobox.n.html: - * iwidgets3.0.0/demos/html/dateentry.n.html: Added. - * iwidgets3.0.0/demos/html/datefield.n.html: Added. - * iwidgets3.0.0/demos/html/dialog.n.html: - * iwidgets3.0.0/demos/html/dialogshell.n.html: - * iwidgets3.0.0/demos/html/disjointlistbox.n.html: Added. - * iwidgets3.0.0/demos/html/entryfield.n.html: - * iwidgets3.0.0/demos/html/extfileselectionbox.n.html: Added. - * iwidgets3.0.0/demos/html/extfileselectiondialog.n.html: Added. - * iwidgets3.0.0/demos/html/feedback.n.html: - * iwidgets3.0.0/demos/html/fileselectionbox.n.html: - * iwidgets3.0.0/demos/html/fileselectiondialog.n.html: - * iwidgets3.0.0/demos/html/finddialog.n.html: Added. - * iwidgets3.0.0/demos/html/hierarchy.n.html: Added. - * iwidgets3.0.0/demos/html/hyperhelp.n.html: - * iwidgets3.0.0/demos/html/iwidgets2.2.0UserCmds.html: Removed. - * iwidgets3.0.0/demos/html/iwidgets3.0.0UserCmds.html: Added. - * iwidgets3.0.0/demos/html/labeledframe.n.html: Added. - * iwidgets3.0.0/demos/html/labeledwidget.n.html: - * iwidgets3.0.0/demos/html/mainwindow.n.html: Added. - * iwidgets3.0.0/demos/html/menubar.n.html: - * iwidgets3.0.0/demos/html/messagebox.n.html: Added. - * iwidgets3.0.0/demos/html/messagedialog.n.html: - * iwidgets3.0.0/demos/html/notebook.n.html: - * iwidgets3.0.0/demos/html/optionmenu.n.html: - * iwidgets3.0.0/demos/html/panedwindow.n.html: - * iwidgets3.0.0/demos/html/promptdialog.n.html: - * iwidgets3.0.0/demos/html/pushbutton.n.html: - * iwidgets3.0.0/demos/html/radiobox.n.html: - * iwidgets3.0.0/demos/html/scopedobject.n.html: Added. - * iwidgets3.0.0/demos/html/scrolledcanvas.n.html: - * iwidgets3.0.0/demos/html/scrolledframe.n.html: - * iwidgets3.0.0/demos/html/scrolledhtml.n.html: - * iwidgets3.0.0/demos/html/scrolledlistbox.n.html: - * iwidgets3.0.0/demos/html/scrolledtext.n.html: - * iwidgets3.0.0/demos/html/selectionbox.n.html: - * iwidgets3.0.0/demos/html/selectiondialog.n.html: - * iwidgets3.0.0/demos/html/shell.n.html: - * iwidgets3.0.0/demos/html/spindate.n.html: - * iwidgets3.0.0/demos/html/spinint.n.html: - * iwidgets3.0.0/demos/html/spinner.n.html: - * iwidgets3.0.0/demos/html/spintime.n.html: - * iwidgets3.0.0/demos/html/tabnotebook.n.html: - * iwidgets3.0.0/demos/html/tabset.n.html: - * iwidgets3.0.0/demos/html/timeentry.n.html: Added. - * iwidgets3.0.0/demos/html/timefield.n.html: Added. - * iwidgets3.0.0/demos/html/toolbar.n.html: - * iwidgets3.0.0/demos/html/watch.n.html: Added. - * iwidgets3.0.0/doc/checkbox.n: - * iwidgets3.0.0/doc/entryfield.n: - * iwidgets3.0.0/doc/generateHtml.sh: Added. - * iwidgets3.0.0/doc/hierarchy.n: - * iwidgets3.0.0/doc/radiobox.n: - * iwidgets3.0.0/doc/scrolledlistbox.n: - * iwidgets3.0.0/doc/scrolledtext.n: - * iwidgets3.0.0/doc/toolbar.n: - * iwidgets3.0.0/generic/buttonbox.itk: - * iwidgets3.0.0/generic/calendar.itk: - * iwidgets3.0.0/generic/canvasprintbox.itk: - * iwidgets3.0.0/generic/checkbox.itk: - * iwidgets3.0.0/generic/colors.itcl: - * iwidgets3.0.0/generic/combobox.itk: - * iwidgets3.0.0/generic/dateentry.itk: - * iwidgets3.0.0/generic/datefield.itk: - * iwidgets3.0.0/generic/dialog.itk: - * iwidgets3.0.0/generic/dialogshell.itk: - * iwidgets3.0.0/generic/disjointlistbox.itk: - * iwidgets3.0.0/generic/entryfield.itk: - * iwidgets3.0.0/generic/extfileselectionbox.itk: - * iwidgets3.0.0/generic/extfileselectiondialog.itk: - * iwidgets3.0.0/generic/feedback.itk: - * iwidgets3.0.0/generic/fileselectionbox.itk: - * iwidgets3.0.0/generic/fileselectiondialog.itk: - * iwidgets3.0.0/generic/finddialog.itk: - * iwidgets3.0.0/generic/hierarchy.itk: - * iwidgets3.0.0/generic/hyperhelp.itk: - * iwidgets3.0.0/generic/labeledframe.itk: - * iwidgets3.0.0/generic/labeledwidget.itk: - * iwidgets3.0.0/generic/mainwindow.itk: - * iwidgets3.0.0/generic/menubar.itk: - * iwidgets3.0.0/generic/messagebox.itk: - * iwidgets3.0.0/generic/messagedialog.itk: - * iwidgets3.0.0/generic/notebook.itk: - * iwidgets3.0.0/generic/optionmenu.itk: - * iwidgets3.0.0/generic/pane.itk: - * iwidgets3.0.0/generic/panedwindow.itk: - * iwidgets3.0.0/generic/promptdialog.itk: - * iwidgets3.0.0/generic/pushbutton.itk: - * iwidgets3.0.0/generic/radiobox.itk: - * iwidgets3.0.0/generic/scrolledcanvas.itk: - * iwidgets3.0.0/generic/scrolledframe.itk: - * iwidgets3.0.0/generic/scrolledhtml.itk: - * iwidgets3.0.0/generic/scrolledlistbox.itk: - * iwidgets3.0.0/generic/scrolledtext.itk: - * iwidgets3.0.0/generic/scrolledwidget.itk: - * iwidgets3.0.0/generic/selectionbox.itk: - * iwidgets3.0.0/generic/selectiondialog.itk: - * iwidgets3.0.0/generic/shell.itk: - * iwidgets3.0.0/generic/spindate.itk: - * iwidgets3.0.0/generic/spinint.itk: - * iwidgets3.0.0/generic/spinner.itk: - * iwidgets3.0.0/generic/spintime.itk: - * iwidgets3.0.0/generic/tabnotebook.itk: - * iwidgets3.0.0/generic/tabset.itk: - * iwidgets3.0.0/generic/timeentry.itk: - * iwidgets3.0.0/generic/timefield.itk: - * iwidgets3.0.0/generic/toolbar.itk: - * iwidgets3.0.0/generic/watch.itk: - * iwidgets3.0.0/tests/all: - * iwidgets3.0.0/tests/all.tcl: Added. - * iwidgets3.0.0/tests/buttonbox.test: - * iwidgets3.0.0/tests/calendar.test: - * iwidgets3.0.0/tests/canvasprintbox.test: - * iwidgets3.0.0/tests/canvasprintdialog.test: - * iwidgets3.0.0/tests/checkbox.test: - * iwidgets3.0.0/tests/combobox.test: - * iwidgets3.0.0/tests/dateentry.test: - * iwidgets3.0.0/tests/datefield.test: - * iwidgets3.0.0/tests/defs: - * iwidgets3.0.0/tests/dialog.test: - * iwidgets3.0.0/tests/dialogshell.test: - * iwidgets3.0.0/tests/disjointlistbox.test: - * iwidgets3.0.0/tests/entryfield.test: - * iwidgets3.0.0/tests/extfileselectionbox.test: - * iwidgets3.0.0/tests/extfileselectiondialog.test: - * iwidgets3.0.0/tests/feedback.test: - * iwidgets3.0.0/tests/fileselectionbox.test: - * iwidgets3.0.0/tests/fileselectiondialog.test: - * iwidgets3.0.0/tests/finddialog.test: - * iwidgets3.0.0/tests/hierarchy.test: - * iwidgets3.0.0/tests/hyperhelp.test: - * iwidgets3.0.0/tests/labeledframe.test: - * iwidgets3.0.0/tests/labeledwidget.test: - * iwidgets3.0.0/tests/menubar.test: - * iwidgets3.0.0/tests/messagebox.test: - * iwidgets3.0.0/tests/messagedialog.test: - * iwidgets3.0.0/tests/notebook.test: - * iwidgets3.0.0/tests/optionmenu.test: - * iwidgets3.0.0/tests/panedwindow.test: - * iwidgets3.0.0/tests/promptdialog.test: - * iwidgets3.0.0/tests/pushbutton.test: - * iwidgets3.0.0/tests/radiobox.test: - * iwidgets3.0.0/tests/regexpfield.test: - * iwidgets3.0.0/tests/scrolledcanvas.test: - * iwidgets3.0.0/tests/scrolledframe.test: - * iwidgets3.0.0/tests/scrolledhtml.test: - * iwidgets3.0.0/tests/scrolledlistbox.test: - * iwidgets3.0.0/tests/scrolledtext.test: - * iwidgets3.0.0/tests/selectionbox.test: - * iwidgets3.0.0/tests/selectiondialog.test: - * iwidgets3.0.0/tests/shell.test: - * iwidgets3.0.0/tests/spindate.test: - * iwidgets3.0.0/tests/spinint.test: - * iwidgets3.0.0/tests/spinner.test: - * iwidgets3.0.0/tests/spintime.test: - * iwidgets3.0.0/tests/tabnotebook.test: - * iwidgets3.0.0/tests/tabset.test: - * iwidgets3.0.0/tests/timeentry.test: - * iwidgets3.0.0/tests/timefield.test: - * iwidgets3.0.0/tests/toolbar.test: - * iwidgets3.0.0/tests/usual.test: - * iwidgets3.0.0/tests/watch.test: - * iwidgets3.0.0/unix/Makefile.in: Removed. - * iwidgets3.0.0/unix/configure: Removed. - * iwidgets3.0.0/unix/configure.in: Removed. - * iwidgets3.0.0/unix/iwidgets.tcl.in: Removed. - * iwidgets3.0.0/unix/pkgIndex.tcl.in: Removed. - * iwidgets3.0.0/win/iwidgets.tcl: Added. - * iwidgets3.0.0/win/makefile.vc: Added. - * iwidgets3.0.0/win/pkgIndex.tcl: Added. - -2001-04-09 Mo DeJong - - * itcl/unix/aclocal.m4: Include tcl.m4. - * itcl/unix/configure: Regen. - * itcl/unix/configure.in: Call TCL_TOOL_PATH - to match use in win version. - * itcl/unix/tcl.m4: Add from tcl/unix. - * itcl/win/aclocal.m4: Include tcl.m4. - * itcl/win/configure: Regen. - * itcl/win/configure.in: Call TCL_TOOL_PATH for - TCL_BIN_DIR, TCL_SRC_DIR, TCL_BUILD_LIB_SPEC. - * itcl/win/tcl.m4: Add from tcl/win. - * itk/unix/aclocal.m4: Include tcl.m4. - * itk/unix/configure: Regen. - * itk/unix/configure.in: Call TCL_TOOL_PATH - to match use in win version. Remove - --with-cflags option. - * itk/unix/tcl.m4: Add from tcl/unix. - * itk/win/aclocal.m4: Include tcl.m4. - * itk/win/configure: Regen. - * itk/win/configure.in: Call TCL_TOOL_PATH for - ITK_SRC_DIR, TCL_BIN_DIR, TCL_SRC_DIR, TCL_BUILD_LIB_SPEC, - TCL_BUILD_STUB_LIB_SPEC, TK_BIN_DIR, TK_SRC_DIR, TK_BUILD_LIB_SPEC, - and ITCL_BIN_DIR. Remove --with-cflags option. - * itk/win/tcl.m4: Add from tcl/win. - -2001-04-05 Mo DeJong - - * itcl/win/Makefile.in: - * itk/win/Makefile.in: Remove code that depends on dumpexts.exe - since it was removed from Tcl. Building a .dll no longer - requires a .def file. - -2001-04-05 Mo DeJong - - * configure.in: Don't build iwidgets under Windows since there - is no build system in the win subdirectory. - * itcl/win/configure.in: - * itk/win/configure.in: Don't look for tclConfig.sh in the - ../unix directory, look in the win/ subdirectory instead. - Fix copy and paste error in --with argument. Add subst - of the TCL_BUILD_STUB_LIB_SPEC variable. - * configure: - * itcl/win/configure: - * itk/win/configure: Regen. - -2001-04-05 Mo DeJong - - * itk/win/winMain.c: Replace calls - to TkConsoleCreate and TkConsoleInit - with call to Tk_CreateConsoleWindow. - The old methods were removed in - Tk 8.3 and replaced with a public API. - -2001-03-27 Ian Roxborough - - * itcl/generic/itcl_cmds.c - * itcl/generic/itcl_ensemble.c - * itcl/generic/itcl_methods.c - * itcl/generic/itcl_obsolete.c - * itcl/generic/itcl_parse.c - * itcl/generic/itk_archetype.c: Tcl/Tk 8.3 support. - Call Tcl_EvalObj with only two parameter for Tcl8.3. - -2000-12-20 Syd Polk - - * itcl/itcl/itclConfig.sh.in: Added new line at end of file. + Tests modified to work with TEA Makefile. -2000-10-27 Syd Polk - - * itk/win/Makefile.in: Install itk dll when installing libraries. - -2000-10-13 Mo DeJong - - * itcl/generic/itcl_objects.c (Itcl_CreateObject): - Add code to check for an object that deletes itself - inside its own constructor. We need to avoid adding - this object to the global object list. - -2000-06-22 Syd Polk - - * itcl/win/Makefile.in: Added target install-shared-libraries. - Make install-binaries and install-libraries both install it. - * itk/win/Makefile.in: Likewise. - - * iwidgets3.0.0/unix/Makefile.in: Add dummy target - install-binaries. - -2000-06-19 Syd Polk +2000-04-19 mmc + * CHANGES: + * itcl/Makefile.in: + * itcl/configure: + * itcl/configure.in: + * itcl/doc/find.n: + * itcl/generic/itcl.h: + * itcl/generic/itcl_cmds.c: + * itcl/tests/basic.test: + * itcl/tests/body.test: + * itcl/tests/chain.test: + * itcl/tests/defs: + * itcl/tests/delete.test: + * itcl/tests/ensemble.test: + * itcl/tests/info.test: + * itcl/tests/inherit.test: + * itcl/tests/local.test: + * itcl/tests/methods.test: + * itcl/tests/mkindex.itcl: + * itcl/tests/namespace.test: + * itcl/tests/protection.test: + * itcl/tests/scope.test: + * itcl/tests/tclIndex: + * itcl/unix/configure.in: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: + * itk/tests/defs: + * itk/tests/option.test: + * itk/tests/widget.test: + * license.terms: + + - fixed itcl::find to find classes/objects in *all* namespaces + - fixed tests to run cleanly - * itcl/win/Makefile.in: Install ITCLLIB instead of CYGITCLLIB - when installing the finished binaries. +2000-03-28 csmith + * itcl/generic/itcl_cmds.c: + Patch for Ticket 4111, submitted by David Cuthbert: + + *** itcl3.1.0/itcl/generic/itcl_cmds.c.orig Tue Feb 1 16:37:53 2000 + --- itcl3.1.0/itcl/generic/itcl_cmds.c.new Tue Feb 1 + 16:38:06 2000 + *************** + *** 94,100 **** + static char safeInitScript[] = + "proc ::itcl::local {class name args} {\n\ + ! set ptr [uplevel eval [list $class $name] $args]\n\ + uplevel [list set itcl-local-$ptr $ptr]\n\ + set cmd [uplevel namespace which -command $ptr]\n\ + uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n\ + + --- 94,100 ---- + static char safeInitScript[] = + "proc ::itcl::local {class name args} {\n\ + ! set ptr [uplevel [list $class $name] $args]\n\ + uplevel [list set itcl-local-$ptr $ptr]\n\ + set cmd [uplevel namespace which -command $ptr]\n\ + uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n\ -2000-06-15 Jonathan Larmour + * itcl/library/itcl.tcl: + Patch for ticket 4111, submitted by David Cuthbert: + + *** itcl3.1.0/itcl/library/itcl.tcl.orig Tue Feb 1 16:38:24 2000 + --- itcl3.1.0/itcl/library/itcl.tcl.new Tue Feb 1 16:38:30 2000 + *************** + *** 27,33 **** + # alive until a procedure exits. + # ---------------------------------------------------------------------- + proc ::itcl::local {class name args} { + ! set ptr [uplevel eval [list $class $name] $args] + uplevel [list set itcl-local-$ptr $ptr] + set cmd [uplevel namespace which -command $ptr] + uplevel [list trace variable itcl-local-$ptr u \ + + --- 27,33 ---- + # alive until a procedure exits. + # ---------------------------------------------------------------------- + proc ::itcl::local {class name args} { + ! set ptr [uplevel [list $class $name] $args] + uplevel [list set itcl-local-$ptr $ptr] + set cmd [uplevel namespace which -command $ptr] + uplevel [list trace variable itcl-local-$ptr u \ + +2000-03-20 wart + * itk/configure: + * itk/configure.in: + Fixed typo in variable name - * iwidgets3.0.0/unix/configure.in: Use config scripts from build - tree before exec_prefix - * iwidgets3.0.0/unix/configure: regenerate +2000-03-17 wart + * itcl/Makefile.in: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: + Added TCL_EXTRA_CFLAGS to compile line to fix build problems on Irix -Tue Jun 6 22:09:02 2000 Christopher Faylor +2000-02-04 wart + * itk/configure: + * itk/configure.in: + Fixed typo that was causing builds on CYGWIN_NT platforms not to pick up + the Tcl stub library (TCL_STUB_LIB_SPEC was not being substituted in the + Makefile) - * itcl/win/Makefile.in: Set up and use autoconf variables throughout to - allow overriding variables from the make command line. - * itk/win/Makefile.in: Ditto. - * itcl/iwidgets3.0.0/unix/Makefile.in: Ditto. +2000-01-28 wart + * itcl/configure: + * itcl/configure.in: + * itk/configure: + * itk/configure.in: + Fixed a few more places where the configure wasn't checking for cygwin on + Windows 95/98 -2000-05-03 Syd Polk +2000-01-24 wart + * itcl/configure: + * itk/configure: + Regenerated configure scripts to pick up changes to tcl.m4 - * Makefile.in (check test): Call "make test" explicitly when - running toplevel "make check" or "make test". + * itcl/configure: + * itk/configure: + Regenerated configure scripts to pick up recent changes to tcl.m4 -2000-04-29 Andreas Jaeger + * tcl.m4: + * tcl.m4: + Updated to reflect recent TEA changes - * Makefile.in (check): Handle make check like make test. +2000-01-18 wart + * tcl.m4: + Updated to reflect recent TEA changes -Wed Apr 19 13:58:32 2000 Andrew Cagney +2000-01-03 csmith + * itcl/unix/Makefile.in: + Patch submitted by Mo Dejong needed so Itcl will link to the Tcl libs + when Tcl is compiled with debugging on. - * itcl/unix/config.log, itcl/unix/confdefs.h: Delete generated - files. + * itcl/generic/itcl_parse.c: + Patch by Mo Dejong to fix a Windows NT/95 crashing problem where you can + build with debugging on, load the Itcl package, and press the X in the + upper right corner. Note that I'm unable to test this on Windows and + that this patch introduces a compiler warning. -2000-01-26 DJ Delorie + * itcl/generic/itcl_parse.c: + Duuuuhhhh.... + + This is the patch from Mo Dejong regarding the Windows NT/95 crashing + problem. My previous checkin of itcl_parse.c did not include all of + the patch - got in a hurry. Disregard the compiler warning mentioned + in my previous checkin. - * itcl/win/dllEntryPoint.c (DllMain): Use _imp__ instead of __imp_ - * itk/win/dllEntryPoint.c (DllMain): ditto - * itcl/generic/itcl_methods.c (tclByteCodeType): ditto, but unused + * itcl/tests/defs: + Patch submitted by Mo Dejong: needed to add "-force" option to the + namespace import command so fix a bug with 'make test'. -1999-12-21 Mo DeJong + * itcl/generic/itcl_parse.c: + *** empty log message *** - * itcl/generic/itcl_parse.c: Applied patch to fix - crash when tearing down the itcl::parser namespace. +1999-11-24 wart + * itcl/configure: + * itk/configure: + regenerated configure scripts to pick up tcl.m4 changes -1999-09-23 Ben Elliston + * itcl/configure: + * itk/configure: + * tcl.m4: + tcl.m4: Updated to reflect recent TEA changes + + */configure: Regnereated with new tcl.m4 + + iwidgets2.2.0/Makefile.in: Don't copy nonexistent files - * itcl/unix/configure.in: Quoting fix for AC_EGREP_CPP. - * itcl/win/configure.in: Likewise. - * itk/unix/configure.in: Likewise. - * itk/win/configure.in: Likewise. - * itcl/unix/configure: Regenerate. - * itcl/win/configure: Likewise. - * itk/unix/configure: Likewise. - * itk/win/configure: Likewise. + * tcl.m4: + Updated to reflect recent TEA changes -1999-09-22 DJ Delorie +1999-09-21 wart + * itk/Makefile.in: + Itk now installs appropriate library files. - * itcl/win/Makefile.in (ITCL_LIB_DIR etc): use @dir@ form - * itk/win/Makefile.in (INSTALL_LIB_DIR etc): ditto +1999-09-20 wart + * itcl/configure: + * itcl/configure.in: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: + pkgIndex on Windows now looks in the correct directory for the + .dll files. -1999-07-13 Jonathan Larmour +1999-09-17 wart + * tcl.m4: + Updated to reflect recent changes - * itcl/unix/configure.in: Workaround bug in autoconf 2.13 by adding - an extra AC_PROG_CPP before AC_EGREP_CPP - * itcl/win/configure.in: Likewise - * itk/unix/configure.in: Likewise - * itk/win/configure.in: Likewise - * itcl/unix/configure: regenerated - * itcl/win/configure: regenerated - * itk/unix/configure: regenerated - * itk/win/configure: regenerated +1999-09-15 wart + * itcl/configure: + * itcl/configure.in: + * itcl/pkgIndex.tcl.in: + * itk/configure: + * itk/configure.in: + * itk/pkgIndex.tcl.in: + Better pkgIndex.tcl files that should now work on solaris. -1999-06-16 Keith Seitz +1999-09-14 wart + * itcl/Makefile.in: + * itcl/configure: + * itcl/configure.in: + * itcl/mkIndex.tcl.in: + * itcl/pkgIndex.tcl.in: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: + * itk/mkIndex.tcl.in: + * itk/pkgIndex.tcl.in: + Fixed installation of pkgIndex.tcl file. We have to install a pre-made + pkgIndex.tcl file since pkg_mkIndex can't seem to make a usable one. - * itk/win/Makefile.in (install-man): Don't install *.3 -- there - are no manpages in this section. +1999-09-10 wart + * itk/Makefile.in: + Fixed bug when calling mkIndex.tcl for itk + + reduced amount of output from "make install" in iwidgets -1999-03-26 Martin Hunt + * itcl/Makefile.in: + * itk/Makefile.in: + Removed Makefiles rules to regenerate the configure scripts. This was + causing problems when building on Windows and Unix simultaneoulsy. - * iwidgets3.0.0/generic/scrolledwidget.itk - (iwidgets::Scrolledwidget::sbwidth): The default width of 15 - was incompatible with Windows. Change the default to "" and - only actually change the scrollbar width if someone changes - it to something else. +1999-09-09 wart + * itcl/configure: + * itcl/configure.in: + * itk/configure: + * itk/configure.in: + configure scripts now look for tclsh82d.exe executable when searching + for valid tcl interpreter. -1999-03-22 James Ingham + * Makefile.in: + Added pkgIndex files for Iwidgets + + Top level Makefile should no longer loop endlessly if the configure went bad. - * itcl/unix/configure.in: Leave the LD_SEARCH_PATH off of - MAKE_LIBS. This loses on OSF with --enable-shared. - * itcl/unix/configure: regenerated - * itk/unix/configure.in: Leave the LD_SEARCH_PATH off of - MAKE_LIBS. This lses on OSF with --enable-shared. - * itk/unix/configure: regenerated + * itcl/configure: + * itcl/configure.in: + * itk/configure: + * itk/configure.in: + * tcl.m4: + Look for tclsh82d.exe before tclsh82.exe. + + configure scripts for itcl and itk now use the tcl.m4 macro SC_PROG_TCLSH. -1999-03-18 Keith Seitz +1999-09-07 wart + * itcl/Makefile.in: + * itcl/configure: + * itcl/configure.in: + * itk/Makefile.in: + * itk/configure: + * itk/configure.in: + configure now searches for tclsh82 shell in exec-prefix, then prefix, then + relative to tclConfig.sh, then in the users path. - * iwidgets3.0.0/unix/Makefile.in (install-libraries): Don't bother with - making symlinks for other versions of iwidgets -- we don't use them. +1999-09-04 wart + * configure.in: + * itcl/Makefile.in: + * itcl/aclocal.m4: + * itcl/configure: + * itcl/configure.in: + * itcl/mkIndex.tcl.in: + * itk/Makefile.in: + * itk/aclocal.m4: + * itk/configure: + * itk/configure.in: + * itk/mkIndex.tcl.in: + * tcl.m4: + TEA changes. Itcl now uses the same Makefiles and configure scripts for + both Windows and Unix. + + Note that static shells are not yet done in this TEA implementation. -1999-03-03 James Ingham + * itcl/Makefile.in: + * itk/Makefile.in: + Temporarily removed pkg_mkIndex step from Makefile since it causes a + crash on Windows. - * iwidgets3.0.0/generic/labeledframe.itk (_reconfigure): Make sure - that the widget has not been destroyed while in the update - idletasks. FIXME - see if we can eliminate the need for this - update. +1999-08-21 matt + * itcl/unix/Makefile.in: + Fixed mismatch between configure script and makefile for stub + enabled builds - * iwidgets3.0.0/generic/labeledframe.itk (clientHandlesConfigure): - Added method to allow the user of the labeled frame to do the - reconfigure, so this can be batched up and reduce flashing. + * itk/unix/Makefile.in: + Fixed mismatch between conifgure script and Makefile for stub + enabled builds. -1999-03-02 DJ Delorie +1999-06-28 hershey + * itk/unix/configure.in: + * itk/unix/itkConfig.sh: + remove version number from comments - * itk/win/configure.in: support cross compiling, fix syntax error - in BASELIBS. - * itk/win/configure: regenerate +1999-06-26 wart + * itcl/mac/itclMacLibrary.r: + * itcl/mac/pkgIndex.tcl: + * itcl/unix/configure.in: + * itk/mac/itkMacLibrary.r: + * itk/mac/pkgIndex.tcl: + * itk/unix/configure.in: + * itk/win/pkgIndex.tcl: + Version numbers changed from 3.0.1 to 3.1.0 -1999-03-02 Syd Polk +1999-05-25 redman + * itcl/generic/itcl.h: + * itcl/win/makefile.vc: + * itk/win/makefile.vc: + * itk/win/winMain.c: + * makefile.vc: + Fixed the use of Tcl & Tk stubs on Windows. + + Now the extra shells (itclsh31.exe and itkwish31.exe) are being + created and run properly. - * itk/win/configure.in: Generated incorrect library name for cygwin - build. - * itk/win/configure: Regenerate. + * itcl/generic/itcl_cmds.c: + * itcl/unix/Makefile.in: + * itcl/unix/configure.in: + * itcl/unix/itclConfig.sh.in: + * itk/generic/itk_cmds.c: + * itk/unix/Makefile.in: + * itk/unix/configure.in: + * itk/unix/itkConfig.sh: + * itk/unix/itkConfig.sh.in: + Fix the makefile and configure files, etc., for Unix + in order to compile with Tcl/Tk 8.1 with stubs. + + Builds itclsh and itkwish properly. -Fri Feb 26 12:48:01 1999 Geoffrey Noer +1999-05-24 redman + * itcl/generic/itcl.decls: + * itcl/generic/itcl.h: + * itcl/generic/itclDecls.h: + * itcl/generic/itclInt.decls: + * itcl/generic/itclInt.h: + * itcl/generic/itclIntDecls.h: + * itcl/generic/itclStubInit.c: + * itcl/generic/itclStubLib.c: + * itcl/generic/itcl_cmds.c: + * itcl/generic/itcl_ensemble.c: + * itcl/tests/defs: + * itcl/tests/tclIndex: + * itcl/win/itcl.rc: + * itcl/win/makefile.vc: + * itcl/win/pkgIndex.tcl: + * itk/generic/itk.decls: + * itk/generic/itk.h: + * itk/generic/itkDecls.h: + * itk/generic/itkStubInit.c: + * itk/generic/itkStubLib.c: + * itk/generic/itk_cmds.c: + * itk/win/makefile.vc: + * itk/win/rc/itk.rc: + * makefile.vc: + Applied patches from David Gravereaux to update Itcl and Itk to + use Tcl/Tk 8.1 stubs and provide it's own stubs interface, on + Windows only. + + Changes have not been made to support I18N (if needed) or MT-safety. + + Version number has been changed to 3.1.0 (from 3.0.1) by + David to coincide with the shift to Tcl/Tk 8.1. + + Building of itclsh31.exe and iwish31.exe have been disabled + until someone else makes them work properly. Test suites + have been modified to work with tclsh81.exe instead. - * configure.in: Change "cygwin32*" check to "cygwin*". - * configure: Regenerate. - * itcl/win/configure.in: Change "cygwin32*" check to "cygwin*". - * itcl/win/configure: Regenerate. - * itk/win/configure.in: Change "cygwin32*" check to "cygwin*". - * itk/win/configure: Regenerate. +1999-02-05 stanton + * itk/unix/itkConfig.sh: + updated version to itcl3.0.1 -1999-02-24 James Ingham +1999-01-15 rjohnson + * itcl/tests/mkindex.itcl: + + Fixed typo in tcl file. - * iwidgets3.0.0/generic/labeledframe.itk: Make it derive from Widget - not Archetype (which was a BAD idea). Add an interposing frame so - you didn't have to much with the highlightthickness of the - MegaWidget itself. Doing this allows you to actually use the - labeledframe in derived classes. - * iwidgets3.0.0/generic/scrolledwidget.itk: Derive from labeledframe, - not labeledwidget. This way you can add a relief around the - label, which looks better for scrolled text, scrolled listboxes - and scrolled canvases. - * iwidgets3.0.0/generic scrolledcanvas.itk, scrolledlistbox.itk, - scrolledtext.itk: Pushed throught the changes needed to get the - derivation from labeledframe to work. +1998-10-29 stanton + * itcl/doc/itcl_info.n: + Cleaned up some out of date references to 2.2 syntax. + +1998-09-14 stanton + * itk/win/rc/cursor00.cur: + * itk/win/rc/cursor02.cur: + * itk/win/rc/cursor04.cur: + * itk/win/rc/cursor06.cur: + * itk/win/rc/cursor08.cur: + * itk/win/rc/cursor0a.cur: + * itk/win/rc/cursor0c.cur: + * itk/win/rc/cursor0e.cur: + * itk/win/rc/cursor10.cur: + * itk/win/rc/cursor12.cur: + * itk/win/rc/cursor14.cur: + * itk/win/rc/cursor16.cur: + * itk/win/rc/cursor18.cur: + * itk/win/rc/cursor1a.cur: + * itk/win/rc/cursor1c.cur: + * itk/win/rc/cursor1e.cur: + * itk/win/rc/cursor20.cur: + * itk/win/rc/cursor22.cur: + * itk/win/rc/cursor24.cur: + * itk/win/rc/cursor26.cur: + * itk/win/rc/cursor28.cur: + * itk/win/rc/cursor2a.cur: + * itk/win/rc/cursor2c.cur: + * itk/win/rc/cursor2e.cur: + * itk/win/rc/cursor30.cur: + * itk/win/rc/cursor32.cur: + * itk/win/rc/cursor34.cur: + * itk/win/rc/cursor36.cur: + * itk/win/rc/cursor38.cur: + * itk/win/rc/cursor3a.cur: + * itk/win/rc/cursor3c.cur: + * itk/win/rc/cursor3e.cur: + * itk/win/rc/cursor40.cur: + * itk/win/rc/cursor42.cur: + * itk/win/rc/cursor44.cur: + * itk/win/rc/cursor46.cur: + * itk/win/rc/cursor48.cur: + * itk/win/rc/cursor4a.cur: + * itk/win/rc/cursor4c.cur: + * itk/win/rc/cursor4e.cur: + * itk/win/rc/cursor50.cur: + * itk/win/rc/cursor52.cur: + * itk/win/rc/cursor54.cur: + * itk/win/rc/cursor56.cur: + * itk/win/rc/cursor58.cur: + * itk/win/rc/cursor5a.cur: + * itk/win/rc/cursor5c.cur: + * itk/win/rc/cursor5e.cur: + * itk/win/rc/cursor60.cur: + * itk/win/rc/cursor62.cur: + * itk/win/rc/cursor64.cur: + * itk/win/rc/cursor66.cur: + * itk/win/rc/cursor68.cur: + * itk/win/rc/cursor6a.cur: + * itk/win/rc/cursor6c.cur: + * itk/win/rc/cursor6e.cur: + * itk/win/rc/cursor70.cur: + * itk/win/rc/cursor72.cur: + * itk/win/rc/cursor74.cur: + * itk/win/rc/cursor76.cur: + * itk/win/rc/cursor78.cur: + * itk/win/rc/cursor7a.cur: + * itk/win/rc/cursor7c.cur: + * itk/win/rc/cursor7e.cur: + * itk/win/rc/cursor80.cur: + * itk/win/rc/cursor82.cur: + * itk/win/rc/cursor84.cur: + * itk/win/rc/cursor86.cur: + * itk/win/rc/cursor88.cur: + * itk/win/rc/cursor8a.cur: + * itk/win/rc/cursor8c.cur: + * itk/win/rc/cursor8e.cur: + * itk/win/rc/cursor90.cur: + * itk/win/rc/cursor92.cur: + * itk/win/rc/cursor94.cur: + * itk/win/rc/cursor96.cur: + * itk/win/rc/cursor98.cur: + * itk/win/rc/itk.ico: + Fixed binary files + +1998-09-08 stanton + * CHANGES: + *** empty log message *** + +1998-09-03 stanton + * CHANGES: + * README: + more changes + + * CHANGES: + * Makefile.in: + changes -1999-02-22 Syd Polk + * Makefile.in: + * Makefile.in: + * Makefile.in: + * Makefile.in: + * Makefile.in: + * Makefile.in: + * Makefile.in: + *** empty log message *** - * itcl/win/configure.in: Export ITCL_SH. - * itcl/win/configure: Regenerate. + * Makefile.in: + nothing - * itk/win/configure.in: Set all of the build components based on cygwin - vs. Visual C++. - Fix ITK_BUILD_LIB_SPEC, ITK_LIB_SPEC, ITK_LIB_FULL_PATH. - * itk/win/configure: Regenerate. + * CHANGES: + * Makefile.in: + changed back -1999-02-19 Syd Polk +1998-08-23 stanton + * itcl/doc/scope.n: + fixed section - * itk/win/rc/itk.rc: Fixed problem in .rc file that winres did not - like. +1998-08-20 welch + * itcl/generic/itcl.h: + Patchlevel 3.0.1 -1999-02-18 Syd Polk +1998-08-18 welch + * itk/win/pkgIndex.tcl: + Fixed loading .dll - * itcl/unix/Makefile.in: "make install" was failing - with itclConfig.sh. + * itcl/win/pkgIndex.tcl: + fixed loading .dll - * itcl/win/configure.in: Export ITCL_BUILD_LIB_SPEC and - ITCL_LIB_FULL_PATH. - * itcl/win/configure: Regnerate. - * itcl/win/Makefile.in: Minor corrections to dependencies. + * CHANGES: + *** empty log message *** - * itk/generic/itk_cmds.c: Fixed newline in constant. +1998-08-18 suresh + * itk/generic/itk_cmds.c: + Removed pedantic check for existance of "::itk" namespace. Changed code to + conditionally create the "::itk" namespace based on whether it already exists + or not. These changes were necessary to facilitate the wrapper dictating + where the [incr Tk] libraries are stored in a wrapped application via the + variable '::itk::library". - * itk/win/configure.in: Added AC_OBJEXT. - * itk/win/configure: Regenerated. +1998-08-12 welch + * itk/win/makefile.bc: + * itk/win/makefile.vc: + Fixes for tkConsole - * itk/win/Makefile.in: Added OBJEXT. Overhauled for MSVC - build. +1998-08-11 welch + * CHANGES: + * README: + * itcl/doc/class.n: + * itcl/doc/scope.n: + * itcl/generic/itcl.h: + * itcl/generic/itclInt.h: + * itcl/generic/itcl_bicmds.c: + * itcl/generic/itcl_class.c: + * itcl/generic/itcl_cmds.c: + * itcl/generic/itcl_methods.c: + * itcl/generic/itcl_objects.c: + * itcl/library/itcl.tcl: + * itcl/mac/itclMacApplication.r: + * itcl/mac/itclMacLibrary.r: + * itcl/mac/itclMacResource.r: + * itcl/mac/pkgIndex.tcl: + * itcl/mac/tclMacAppInit.c: + * itcl/tests/info.test: + * itcl/unix/Makefile.in: + * itcl/unix/configure.in: + * itcl/unix/tclAppInit.c: + * itcl/win/itcl.rc: + * itcl/win/itclsh.rc: + * itcl/win/makefile.vc: + * itcl/win/pkgIndex.tcl: + * itcl/win/tclAppInit.c: + * itk/doc/Toplevel.n: + * itk/generic/itk.h: + * itk/generic/itk_cmds.c: + * itk/mac/MW_ItkHeader.pch: + * itk/mac/itkMacApplication.r: + * itk/mac/itkMacLibrary.r: + * itk/mac/itkMacResource.r: + * itk/mac/pkgIndex.tcl: + * itk/mac/tclIndex: + * itk/mac/tkMacAppInit.c: + * itk/unix/Makefile.in: + * itk/unix/configure.in: + * itk/unix/tkAppInit.c: + * itk/win/makefile.vc: + * itk/win/pkgIndex.tcl: + * itk/win/rc/itk.rc: + * itk/win/rc/itkwish.rc: + * itk/win/winMain.c: + * makefile.vc: + 3.0 final from Michael -1999-02-18 James Ingham +1998-08-07 stanton + * itcl/generic/itcl_methods.c: + changed to reflect new CompiledLocal structure + changed to reflect changes in resolver api + changed to use TclInitCompiledLocals interface - * itcl/unix/Makefile.in itk/unix/Makefile.in: fix the install - target so it points to itclConfig.sh in the itcl or itk, rather - than in the itcl/unix or itk/unix directories. - * itcl/win/configure.in: use the ITCLCYGRC & ITCLCYGSHRC variables - in the name of the windres output file. - * itcl.rc: For some reason, windres is choking on STRINGIFY of the - Itcl version numbers. Some day we should figure out why. For - now, I just put in the version numbers by hand. + * itcl/generic/itclInt.h: + changed to reflect new resolver api -1999-02-10 Syd Polk + * itcl/generic/itcl_bicmds.c: + * itcl/generic/itcl_ensemble.c: + changed to reflect new CompiledLocal structure - * Makefile.in: Propogate make errors from subdirectories - back to the top level. + * itcl/generic/itcl_class.c: + changed to reflect changes in resolver api - * itcl/win/configure.in: Moved itclConfig.sh. Fixed problems - finding tclConfig.sh and tkConfig.sh. - Figure out all of the appropriate directories at this level - so that cygwin and msvc differences can be accounted for. - * itcl/win/configure: Regenerate. - * itcl/win/Makefile.in: Use OBJEXT. - Set build directories correctly. - Set -DDLL_BUILD, -DSTATIC_BUILD, and -DBUILD_itcl correctly. + * itcl/doc/scope.n: + fixed section name - * itk/win/configure.in: Moved itkConfig.sh. Look for itclConfig.sh - in new place. Fixed problems finding tclConfig.sh and tkConfig.sh. - * itk/win/configure: Regnerate. + * itcl/doc/scope.n: + *** empty log message *** - * itcl/generic/itcl_cmds.c (initScript): Fixed broken new line. + * itcl/generic/itcl_cmds.c: + * itcl/generic/itcl_util.c: + * itk/doc/Toplevel.n: + lint - * itcl/win/dllEntryPoint.c: DllMain was not setup correctly for - Microsoft. +1998-08-04 escoffon + * itcl/generic/itcl.h: + * itcl/generic/itclInt.h: + * itk/generic/itk.h: + EXPORT is now TCL_STORAGE_CLASS -1999-02-09 James Ingham +1998-07-29 escoffon + * itcl/generic/itcl.h: + added setting of EXPORT to DLLEXPORT if we are building the + itcl lib. - * itcl/itcl/unix/configure.in: - * itcl/itk/unix/configure.in: - LD_SEARCH_FLAGS should NOT be passed to the library build line. + * itk/generic/itk.h: + - dropped the EXPORT macro, it is now part of EXTERN + - added setting of EXPORT to DLLEXPORT if we are building the itk lib. - * itcl/itcl/unix/configure: - * itcl/itk/unix/configure: - regenerate. + * itcl/generic/itclInt.h: + - added setting of EXPORT to DLLEXPORT if we are building the itcl lib. + - use EXTERN instead of extern for Itcl_Assert - * itcl/itk/generic/itk_archetype.c: Put a few CYGNUS LOCAL markers - in around the 8.1 Fixups that I had left out. - -1992-02-08 Syd Polk - - * itcl/itcl/unix/configure.in: Moved itclConfig.sh.in up a level - so that building on Windows will work. - Added exporting of itclsh so that other parts of the build - tree can call it. - Added exporting of TCL_CFLAGS. - Added exporting of TCL_LIB_FULL_PATH. - Generate and export ITCL_LIB_FULL_PATH. - * itcl/itcl/unix/configure: Regenerated - * itcl/itcl/unix/Makefile.in: Use TCL_CFLAGS so that - -fwritable-strings is enabled. - Add dependency for TCL_LIB_FULL_PATH. - * itcl/itclConfig.sh.in: Moved from lower directory. - * itcl/itk/unix/configure.in: Moved itkConfig.sh.in up a level. - Added export of TCL_CFLAGS. - Added export of TCL_LIB_FULL_PATH, TK_LIB_FULL_PATH, - ITCL_LIB_FULL_PATH, and ITK_LIB_FULL_PATH. - * itcl/itk/unix/Makefile.in: Use TCL_CFLAGS so that - -fwritable-strings is enabled. - Add dependencies for TCL_LIB_FULL_PATH and TK_LIB_FULL_PATH. - * itcl/itk/unix/configure: Regenerated. - * itcl/itkConfig.sh.in: Moved from a lwoer directory. - * itcl/iwidgets3.0.0/configure.in: Look for itclConfig.sh and - itkConfig.sh in different places. - -1999-02-05 James Ingham - - * itcl/itk/generic/itk_archetype.c (Itk_ArchCompAddCmd): - * itcl/itcl/generic/itcl_cmds.c (Itcl_ProtectionCmd): - itcl/itcl/generic/itcl_ensemble.c (Itcl_EnsembleCmd): - itcl/itcl/generic/itcl_methods.c (Itcl_EvalMemberCode): - (Itcl_ConstructBase): - itcl/itcl/generic/itcl_obsolete.c (ItclOldClassCmd): - itcl/itcl/generic/itcl_parse.c (Itcl_ClassCmd): - (Itcl_ClassProtectionCmd): - Fix up calls to Tcl_EvalObj for Tcl8.1. - - * itcl/itcl/unix/configure.in: - * itcl/itk/unix/configure.in: - Pick up CFLAGS from AC_PROG_CC rather than hard coding them. - * itcl/itcl/unix/configure: - * itcl/itk/unix/configure: - regenerate. - -1999-01-30 Brendan Kehoe - - * Makefile.in (install-info info install-check): Add these null - rules, for the standard build process to work.. - -1999-01-28 James Ingham - - * itcl/itcl/unix/configure.in: Check the TCL_LIB_VERSIONS_OK - variable, and strip out dots if it is nodots. - * itcl/itk/unix/configure.in: Check the TCL_LIB_VERSIONS_OK - variable, and strip out dots if it is nodots. - * itcl/itcl/unix/configure: regenerate. - * itcl/itk/unix/configure: regenerate. - -1999-01-21 James Ingham - - * itcl/library/init.tcl (auto_import): Comment out this function. - It does not work, because it can not populate the source - namespace's export list. There is no easy way to fix this, and - since it is just an optimization over the original Tcl proc, we - will just use Tcl one for now. - -1999-01-20 James Ingham - - * itcl/library/init.tcl: updated to Itcl 3.0.1. Does not force - the addition of class to the auto_mkindex_parser namespace, but - uses the namespace import instead. - -1998-12-15 Martin M. Hunt - - * iwidgets3.0.0/generic/panedwindow.itk: Reverted back to original - distribution. The new panedwindow widget is now in libgui. - - * iwidgets3.0.0/generic/pane.itk: Reverted. - -1998-12-11 Martin M. Hunt - - * iwidgets3.0.0/generic/panedwindow.itk: Major changes to - support panes that are fixed (non-resizable). This allows - the panedwindow to be used as a more general purpose - container widget where individual parts may or may not be - resizable. - - * iwidgets3.0.0/generic/pane.itk (iwidgets::Pane): Added - -resizable option to support non-resizable panes. - -1998-12-08 Martin M. Hunt - - * iwidgets3.0.0/generic/panedwindow.itk: Major changes to - the default look and resizing method to be more modern, more - windows-like, and work better when widgets are placed in childsites. +1998-07-28 stanton + * itcl/generic/itcl_cmds.c: + * itk/generic/itk_cmds.c: + changed search order diff --git a/itcl/Makefile.in b/itcl/Makefile.in index 65f8de65dc..64bc20ab3b 100644 --- a/itcl/Makefile.in +++ b/itcl/Makefile.in @@ -33,7 +33,7 @@ all: done; test check: - for dir in itcl itk iwidgets3.0.0 ; do \ + for dir in itcl itk iwidgets ; do \ if test -d $$dir ; then \ echo "$$dir: $(MAKE) $@" ;\ if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \ diff --git a/itcl/configure b/itcl/configure index 742a924e11..4fd3b578b2 100755 --- a/itcl/configure +++ b/itcl/configure @@ -29,7 +29,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -144,7 +143,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -315,11 +313,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -485,16 +478,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -559,7 +548,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:563: checking host system type" >&5 +echo "configure:552: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -601,7 +590,7 @@ ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:605: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:594: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -642,7 +631,7 @@ echo $ac_n "checking for prefix by $ac_c" 1>&6 # Extract the first word of "itclsh", so it can be a program name with args. set dummy itclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:646: checking for $ac_word" >&5 +echo "configure:635: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ITCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -686,7 +675,7 @@ subdirs= if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then subdirs="itcl itk" else - subdirs="itcl itk iwidgets3.0.0" + subdirs="itcl itk iwidgets" fi subdirs="$subdirs" @@ -757,15 +746,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. @@ -851,7 +859,7 @@ cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. diff --git a/itcl/configure.in b/itcl/configure.in index ec53b3b109..14394b817e 100644 --- a/itcl/configure.in +++ b/itcl/configure.in @@ -30,7 +30,7 @@ subdirs= if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then subdirs="itcl itk" else - subdirs="itcl itk iwidgets3.0.0" + subdirs="itcl itk iwidgets" fi AC_CONFIG_SUBDIRS($subdirs) diff --git a/itcl/cygtcl.m4 b/itcl/cygtcl.m4 index b74c2be7ac..72b8d9cf3d 100644 --- a/itcl/cygtcl.m4 +++ b/itcl/cygtcl.m4 @@ -213,28 +213,12 @@ AC_DEFUN(TCL_TOOL_LIB_SHORTNAME, [ libname=$2 version=$3 - if test "$TCL_LIB_SUFFIX" = "" ; then - AC_MSG_ERROR([The TCL_LIB_SUFFIX variable is not defined]) - fi - # If the . character is not allowed in lib name, remove it from version if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then version=`echo $version | tr -d .` fi - case "${host}" in - *windows32* | *mingw32*) - if test "$GCC" != yes; then - eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" - else - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" - fi - ;; - *) - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" - ;; - esac - + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" $1=$short_libname ]) diff --git a/itcl/itcl/configure b/itcl/itcl/configure index 31c237447c..018c8dad1a 100755 --- a/itcl/itcl/configure +++ b/itcl/itcl/configure @@ -36,7 +36,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -151,7 +150,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -322,11 +320,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -492,16 +485,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -574,7 +563,7 @@ PACKAGE=itcl MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=.0 +PATCHLEVEL=.1 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} @@ -616,7 +605,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:620: checking for $ac_word" >&5 +echo "configure:609: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -646,7 +635,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:650: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -697,7 +686,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:701: checking for $ac_word" >&5 +echo "configure:690: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -729,7 +718,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -740,12 +729,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 744 "configure" +#line 733 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -771,12 +760,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:775: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:780: checking whether we are using GNU C" >&5 +echo "configure:769: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -785,7 +774,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -804,7 +793,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:808: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:797: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +837,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:852: checking for a BSD compatible install" >&5 +echo "configure:841: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -906,7 +895,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' #-------------------------------------------------------------------- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:910: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:899: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -940,7 +929,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:944: checking for $ac_word" >&5 +echo "configure:933: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -973,12 +962,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:977: checking for Cygwin environment" >&5 +echo "configure:966: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1011,13 +1000,13 @@ test "$ac_cv_cygwin" = yes && CYGWIN=yes #-------------------------------------------------------------------- echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1015: checking for object suffix" >&5 +echo "configure:1004: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1035,19 +1024,19 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1039: checking for mingw32 environment" >&5 +echo "configure:1028: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1066,7 +1055,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1070: checking for executable suffix" >&5 +echo "configure:1059: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1076,10 +1065,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1119,7 +1108,7 @@ case "${host}" in # Extract the first word of "cygpath", so it can be a program name with args. set dummy cygpath; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1123: checking for $ac_word" >&5 +echo "configure:1112: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1206,7 +1195,7 @@ if test "${with_tcl+set}" = set; then fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 -echo "configure:1210: checking for Tcl configuration" >&5 +echo "configure:1199: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1284,7 +1273,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1288: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1277: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1332,7 +1321,7 @@ echo "configure:1288: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 #SC_PUBLIC_TCL_HEADERS echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6 -echo "configure:1336: checking for Tcl private include files" >&5 +echo "configure:1325: checking for Tcl private include files" >&5 case "${host}" in *mingw32* | *windows32*) @@ -1418,7 +1407,7 @@ esac echo $ac_n "checking for building with threads""... $ac_c" 1>&6 -echo "configure:1422: checking for building with threads" >&5 +echo "configure:1411: checking for building with threads" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -1445,7 +1434,7 @@ EOF ;; *) echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1449: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:1438: checking for pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1453,7 +1442,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1510,7 +1499,7 @@ fi echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:1514: checking how to build libraries" >&5 +echo "configure:1503: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -1581,7 +1570,7 @@ SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS} esac echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1585: checking for build with symbols" >&5 +echo "configure:1574: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -1823,56 +1812,24 @@ fi libname=${PACKAGE} version=${VERSION} - if test "$TCL_LIB_SUFFIX" = "" ; then - { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } - fi - # If the . character is not allowed in lib name, remove it from version if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then version=`echo $version | tr -d .` fi - case "${host}" in - *windows32* | *mingw32*) - if test "$GCC" != yes; then - eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" - else - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" - fi - ;; - *) - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" - ;; - esac - + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" ITCL_LIB_FLAG=$short_libname libname=${PACKAGE}stub version=${VERSION} - if test "$TCL_LIB_SUFFIX" = "" ; then - { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } - fi - # If the . character is not allowed in lib name, remove it from version if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then version=`echo $version | tr -d .` fi - case "${host}" in - *windows32* | *mingw32*) - if test "$GCC" != yes; then - eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" - else - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" - fi - ;; - *) - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" - ;; - esac - + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" ITCL_STUB_LIB_FLAG=$short_libname @@ -2366,15 +2323,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/itcl/itcl/configure.in b/itcl/itcl/configure.in index c33a8ffa90..38a7ccb6d9 100644 --- a/itcl/itcl/configure.in +++ b/itcl/itcl/configure.in @@ -29,7 +29,7 @@ PACKAGE=itcl MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=.0 +PATCHLEVEL=.1 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} diff --git a/itcl/itcl/doc/Resolvers.3 b/itcl/itcl/doc/Resolvers.3 deleted file mode 100644 index aa44f2cd64..0000000000 --- a/itcl/itcl/doc/Resolvers.3 +++ /dev/null @@ -1,222 +0,0 @@ -'\" -'\" Copyright (c) 1998 Lucent Technologies, Inc. -'\" -'\" See the file "license.terms" for information on usage and redistribution -'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. -'\" -'\" SCCS: %W% -'\" -.so man.macros -.TH Tcl_AddInterpResolvers 3 8.0 Tcl "Tcl Library Procedures" -.BS -.SH NAME -Tcl_AddInterpResolvers, Tcl_GetInterpResolvers, Tcl_RemoveInterpResolvers, Tcl_SetNamespaceResolvers, Tcl_GetNamespaceResolvers \- change the name resolution rules for commands/variables -.SH SYNOPSIS -.nf -\fB#include \fR -.sp -void -\fBTcl_AddInterpResolvers\fR(\fIinterp, name, cmdProc, varProc, compiledVarProc\fR) -.sp -int -\fBTcl_GetInterpResolvers\fR(\fIinterp, name, resInfoPtr\fR) -.sp -int -\fBTcl_RemoveInterpResolvers\fR(\fIinterp, name\fR) -.sp -void -\fBTcl_SetNamespaceResolvers\fR(\fInamespacePtr, cmdProc, varProc, compiledVarProc\fR) -.sp -int -\fBTcl_GetNamespaceResolvers\fR(\fInamespacePtr, resInfoPtr\fR) -.SH ARGUMENTS -.AS Tcl_ResolveCompiledVarProc *compiledVarProc -.AP Tcl_Interp *interp in -Interpreter whose name resolution rules are being queried or modified. -.AP char *name in -Name for a group of name resolution procedures. -.AP Tcl_ResolveCmdProc *cmdProc in -Procedure which will be used to resolve command names. -.AP Tcl_ResolveVarProc *varProc in -Procedure which will be used to resolve variable names at run time. -.AP Tcl_ResolveCompiledVarProc *compiledVarProc in -Procedure which will be used to resolve variable names at compile time. -.AP Tcl_ResolverInfo *resInfoPtr out -Returns the resolution procedures that are currently in effect for -a particular namespace or for a particular name resolution scheme -in the interpreter. -.AP Tcl_Namespace *namespacePtr in -Namespace whose name resolution rules are being queried or modified. -.BE - -.SH DESCRIPTION -.PP -These procedures make it possible to change the way that Tcl -resolves command/variable names. The name resolution rules are -changed by supplying three procedures: \fIcmdProc\fR, \fIvarProc\fR, and -\fIcompiledVarProc\fR. See the section \fBHOW NAME RESOLUTION PROCEDURES -WORK\fR for details about these procedures. -.PP -The name resolution rules can be changed for a particular namespace, -for an entire interpreter, or both. When a name needs to be resolved, -Tcl handles it as follows. The name resolution scheme for the -current namespace is consulted first. Each of the name resolution -schemes for the interpreter are consulted next. Finally, Tcl uses -the default rules for name resolution as described for the -\fBnamespace\fR command. -.PP -\fBTcl_AddInterpResolver\fR adds a set of name resolution procedures -to an interpreter. The procedures are identified by a string \fIname\fR, -so they can be queried or deleted later on. All of the name resolution -schemes for the interpreter are kept on a list, and they are consulted -in order from most- to least-recently added. For example, suppose one -extension adds a name resolution scheme called "fred", and another -extension adds another scheme called "barney". When a name is resolved, -the "barney" scheme will be consulted first, followed by the "fred" -scheme, if necessary. -.PP -\fBTcl_GetInterpResolver\fR looks for a particular name resolution -scheme in an interpreter. If the \fIname\fR is recognized, this -procedure returns a non-zero value along with pointers to the -name resolution procedures in the \fIresInfoPtr\fR structure. Otherwise, -the procedure returns 0. -.PP -\fBTcl_RemoveInterpResolver\fR looks for a particular name resolution -scheme in an interpreter. If the \fIname\fR is recognized, this -procedure deletes the scheme and returns a non-zero value. Otherwise, -it returns 0. -.PP -\fBTcl_SetNamespaceResolver\fR sets the name resolution procedures -for a particular namespace. Unlike an interpreter, a namespace can -have only one name resolution scheme in effect at any given time. -.PP -\fBTcl_GetNamespaceResolver\fR returns the name resolution procedures -for a particular namespace. If the namespace has a special name -resolution scheme, this procedure returns a non-zero value along -with pointers to the name resolution procedures in the \fIresInfoPtr\fR -structure. Otherwise, the procedure returns 0. -.SH "HOW NAME RESOLUTION PROCEDURES WORK" -A name resolution scheme is enforced by three name resolution procedures. -The \fIcmdProc\fR procedure is used to resolve command names. It must -conform to the following type: -.CS -typedef int Tcl_ResolveCmdProc(Tcl_Interp* \fIinterp\fR, - char* \fIname\fR, Tcl_Namespace* \fIcontext\fR, int \fIflags\fR, - Tcl_Command* \fIrPtr\fR); -.CE -The \fIinterp\fR argument is the interpreter performing the resolution; -\fIname\fR is the command name being resolved; \fIcontext\fR is the -namespace context containing the command reference; and \fIflags\fR -may contain TCL_LEAVE_ERR_MSG. -.PP -If this procedure recognizes the command \fIname\fR, it should -store the Tcl_Command token for that command in the \fIrPtr\fR -argument and return TCL_OK. If this procedure doesn't recognize -the command \fIname\fR, it should return TCL_CONTINUE, and the -name resolution will continue with another procedure or with the -default Tcl resolution scheme. If this procedure recognizes -the command \fIname\fR, but for some reason the command is -invalid, the procedure should return TCL_ERROR. If the \fIflags\fR -argument contains TCL_LEAVE_ERR_MSG, the procedure should leave -an error message in the interpreter, explaining why the command -is invalid. -.PP -The \fIvarProc\fR procedure is similar to \fIcmdProc\fR, but it is -used to resolve variable names encountered at run time. It must -conform to the following type: -.CS -typedef int Tcl_ResolveVarProc(Tcl_Interp* \fIinterp\fR, - char* \fIname\fR, Tcl_Namespace* \fIcontext\fR, int \fIflags\fR, - Tcl_Var* \fIrPtr\fR); -.CE -The \fIinterp\fR argument is the interpreter performing the resolution; -\fIname\fR is the variable name being resolved; \fIcontext\fR is the -namespace context containing the variable reference; and \fIflags\fR -may contain TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY, or TCL_LEAVE_ERR_MSG. -.PP -If this procedure recognizes the variable \fIname\fR, it should -store the Tcl_Var token for that variable in the \fIrPtr\fR -argument and return TCL_OK. If this procedure doesn't recognize -the variable \fIname\fR, it should return TCL_CONTINUE, and the -name resolution will continue with another procedure or with the -default Tcl resolution scheme. If this procedure recognizes -the variable \fIname\fR, but for some reason the variable is -not accessible, the procedure should return TCL_ERROR. If the -\fIflags\fR argument contains TCL_LEAVE_ERR_MSG, the procedure -should leave an error message in the interpreter, explaining why -the variable reference is invalid. -.PP -Note that this procedure should look for the TCL_GLOBAL_ONLY and -TCL_NAMESPACE_ONLY flags. It should handle them appropriately, or -return TCL_CONTINUE and let Tcl handle the reference. But it should -not ignore the flags. -.PP -Tcl also resolves variables when a body of code is compiled; the -\fIcompiledVarProc\fR procedure handles that case. It must -conform to the following type: -.CS -typedef int Tcl_ResolveCompiledVarProc(Tcl_Interp* \fIinterp\fR, - char* \fIname\fR, int \fIlength\fR, Tcl_Namespace* \fIcontext\fR, - Tcl_ResolvedVarInfo* \fIrPtr\fR); -.CE -The \fIinterp\fR argument is the interpreter performing the resolution; -\fIname\fR is the variable name being resolved; \fIlength\fR is the -number of bytes in \fIname\fR, which is not a null-terminated -string; and \fIcontext\fR is the namespace context containing the -variable reference. -.PP -If this procedure recognizes the variable \fIname\fR, it should -return some information characterizing the variable in the -\fIrPtr\fR structure. This structure is defined as follows: -.CS -typedef struct Tcl_ResolvedVarInfo { - ClientData \fIidentity\fR; - Tcl_ResolveRuntimeVarProc *\fIfetchProc\fR; - Tcl_ResolveVarDeleteProc *\fIdeleteProc\fR; -} Tcl_ResolvedVarInfo; -.CE -The \fIidentity\fR field is an arbitrary value that characterizes -the variable. Each variable should have a unique identity. Each -time the compiled code is executed, Tcl will call the \fIfetchProc\fR -procedure to get the actual variable for a particular \fIidentity\fR -value. This callback procedure must conform to the following type: -.CS -typedef Tcl_Var Tcl_ResolveRuntimeVarProc(Tcl_Interp* \fIinterp\fR, - ClientData \fIidentity\fR); -.CE -The \fIfetchProc\fR procedure takes the \fIinterp\fR interpreter -and the \fIidentity\fR from compile time and returns a Tcl_Var -token representing the variable. If for some reason the variable -can't be found, this procedure should return NULL, and Tcl will -create a local variable within the call frame of the procedure -being executed. -.PP -When the compiled code is discarded, Tcl calls the \fIdeleteProc\fR -procedure to release the \fIidentity\fR data. The delete procedure -must conform to the following type: -.CS -typedef void Tcl_ResolveVarDeleteProc(ClientData \fIidentity\fR); -.CE -.PP -In general, the \fIvarProc\fR and \fIcompiledVarProc\fR procedures -should \fIboth\fR be defined. If the \fIcompiledVarProc\fR is not -defined, then Tcl will create local variables for any variable -names that are not recognized within a procedure. If the \fIvarProc\fR -is not defined, then Tcl will not recognize variables that are -encountered at runtime. For example, consider the following procedure: -.CS -proc foo {args} { - set anotherRef "1" - set name "another" - set ${name}Ref "2" -} -.CE -Suppose that the \fIcompiledVarProc\fR resolves the name -\fBanotherRef\fR at compile time. The name \fB${name}Ref\fR -can't be resolved at compile time, so the resolution of that -name is deferred to run time. If the \fIvarProc\fR procedure -must intercept the name \fBanotherRef\fR at run time and -supply the appropriate variable. - -.SH KEYWORDS -interpreter, namespace, resolution diff --git a/itcl/itcl/generic/itcl.h b/itcl/itcl/generic/itcl.h index 4e0ad39a2d..665744e5a7 100644 --- a/itcl/itcl/generic/itcl.h +++ b/itcl/itcl/generic/itcl.h @@ -61,15 +61,16 @@ # ifdef USE_ITCL_STUBS # define TCL_STORAGE_CLASS # else -# define TCL_STORAGE_CLASS DLLIMPORT +/* FIXME. We only build static itcl, otherwise this would be DLLIMPORT */ +# define TCL_STORAGE_CLASS # endif #endif #define ITCL_VERSION "3.2" -#define ITCL_PATCH_LEVEL "3.2.0" +#define ITCL_PATCH_LEVEL "3.2.1" #define ITCL_MAJOR_VERSION 3 #define ITCL_MINOR_VERSION 2 -#define ITCL_RELEASE_LEVEL 0 +#define ITCL_RELEASE_LEVEL 1 /* * A special definition used to allow this header file to be included @@ -78,7 +79,7 @@ * and procedure declarations, that occur below. */ -#ifndef RESOURCE_INCLUDED +#ifndef RC_INVOKED /* * Protection levels: @@ -152,7 +153,10 @@ typedef struct Itcl_InterpState_ *Itcl_InterpState; #ifdef USE_ITCL_STUBS -char * Itcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, +#ifdef __cplusplus +extern "C" +#endif +CONST char * Itcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, char *version, int exact)); #else #define Itcl_InitStubs(interp, version, exact) \ @@ -164,7 +168,7 @@ char * Itcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, */ -#endif /* RESOURCE_INCLUDED */ +#endif /* RC_INVOKED */ #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/itcl/itcl/generic/itclInt.decls b/itcl/itcl/generic/itclInt.decls index 50d1676478..466af9ba2b 100644 --- a/itcl/itcl/generic/itclInt.decls +++ b/itcl/itcl/generic/itclInt.decls @@ -152,7 +152,7 @@ declare 34 generic { int objc, Tcl_Obj *CONST objv[]) } declare 35 generic { - int Itcl_ClassCmdResolver (Tcl_Interp *interp, char* name, \ + int Itcl_ClassCmdResolver (Tcl_Interp *interp, CONST char* name, \ Tcl_Namespace *context, int flags, Tcl_Command *rPtr) } declare 36 generic { diff --git a/itcl/itcl/generic/itclInt.h b/itcl/itcl/generic/itclInt.h index a3bb712729..6bde298972 100644 --- a/itcl/itcl/generic/itclInt.h +++ b/itcl/itcl/generic/itclInt.h @@ -238,6 +238,13 @@ typedef struct ItclContext { Var localStorage[20]; /* default storage for compiled locals */ } ItclContext; +/* + * Compatibility flags. Used to support small "hacks". These are stored + * in the global variable named itclCompatFlags. + */ +#define ITCL_COMPAT_USECMDFLAGS 0x0001 /* Tcl8.4a1 introduced a different Command + * structure, and we need to adapt + * dynamically */ #include "itclIntDecls.h" diff --git a/itcl/itcl/generic/itclIntDecls.h b/itcl/itcl/generic/itclIntDecls.h index fa4989a80a..9658a3e569 100644 --- a/itcl/itcl/generic/itclIntDecls.h +++ b/itcl/itcl/generic/itclIntDecls.h @@ -150,7 +150,7 @@ EXTERN int Itcl_HandleClass _ANSI_ARGS_((ClientData clientData, Tcl_Obj *CONST objv[])); /* 35 */ EXTERN int Itcl_ClassCmdResolver _ANSI_ARGS_(( - Tcl_Interp * interp, char* name, + Tcl_Interp * interp, CONST char* name, Tcl_Namespace * context, int flags, Tcl_Command * rPtr)); /* 36 */ @@ -485,7 +485,7 @@ typedef struct ItclIntStubs { int (*itcl_DeleteClass) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefnPtr)); /* 32 */ Tcl_Namespace* (*itcl_FindClassNamespace) _ANSI_ARGS_((Tcl_Interp* interp, char* path)); /* 33 */ int (*itcl_HandleClass) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 34 */ - int (*itcl_ClassCmdResolver) _ANSI_ARGS_((Tcl_Interp * interp, char* name, Tcl_Namespace * context, int flags, Tcl_Command * rPtr)); /* 35 */ + int (*itcl_ClassCmdResolver) _ANSI_ARGS_((Tcl_Interp * interp, CONST char* name, Tcl_Namespace * context, int flags, Tcl_Command * rPtr)); /* 35 */ int (*itcl_ClassVarResolver) _ANSI_ARGS_((Tcl_Interp * interp, char* name, Tcl_Namespace * context, int flags, Tcl_Var * rPtr)); /* 36 */ int (*itcl_ClassCompiledVarResolver) _ANSI_ARGS_((Tcl_Interp * interp, char* name, int length, Tcl_Namespace * context, Tcl_ResolvedVarInfo ** rPtr)); /* 37 */ void (*itcl_BuildVirtualTables) _ANSI_ARGS_((ItclClass* cdefnPtr)); /* 38 */ diff --git a/itcl/itcl/generic/itclStubLib.c b/itcl/itcl/generic/itclStubLib.c index 80fe17a2fe..2888812882 100644 --- a/itcl/itcl/generic/itclStubLib.c +++ b/itcl/itcl/generic/itclStubLib.c @@ -57,13 +57,13 @@ ItclIntStubs *itclIntStubsPtr; *---------------------------------------------------------------------- */ -char * +CONST char * Itcl_InitStubs (interp, version, exact) Tcl_Interp *interp; char *version; int exact; { - char *actualVersion; + CONST char *actualVersion; actualVersion = Tcl_PkgRequireEx(interp, "Itcl", version, exact, (ClientData *) &itclStubsPtr); diff --git a/itcl/itcl/generic/itcl_bicmds.c b/itcl/itcl/generic/itcl_bicmds.c index 0340dc8bc3..a200f6508b 100644 --- a/itcl/itcl/generic/itcl_bicmds.c +++ b/itcl/itcl/generic/itcl_bicmds.c @@ -847,7 +847,9 @@ Itcl_BiInfoClassCmd(dummy, interp, objc, objv) contextNs = contextClass->namesp; } - if (contextNs->parentPtr == activeNs) { + if (!contextNs) { + name = activeNs->fullName; + } else if (contextNs->parentPtr == activeNs) { name = contextNs->name; } else { name = contextNs->fullName; diff --git a/itcl/itcl/generic/itcl_class.c b/itcl/itcl/generic/itcl_class.c index 5661ad3f78..c3a332885a 100644 --- a/itcl/itcl/generic/itcl_class.c +++ b/itcl/itcl/generic/itcl_class.c @@ -51,6 +51,8 @@ static void ItclFreeClass _ANSI_ARGS_((char* cdata)); static Tcl_Var ItclClassRuntimeVarResolver _ANSI_ARGS_(( Tcl_Interp *interp, Tcl_ResolvedVarInfo *vinfoPtr)); +extern int itclCompatFlags; + /* * ------------------------------------------------------------------------ @@ -294,12 +296,24 @@ Itcl_DeleteClass(interp, cdefnPtr) entry = Tcl_FirstHashEntry(&cdefnPtr->info->objects, &place); while (entry) { contextObj = (ItclObject*)Tcl_GetHashValue(entry); + if (contextObj->classDefn == cdefnPtr) { if (Itcl_DeleteObject(interp, contextObj) != TCL_OK) { cdPtr = cdefnPtr; goto deleteClassFail; } + + /* + * Fix 227804: Whenever an object to delete was found we + * have to reset the search to the beginning as the + * current entry in the search was deleted and accessing it + * is therefore not allowed anymore. + */ + + entry = Tcl_FirstHashEntry(&cdefnPtr->info->objects, &place); + continue; } + entry = Tcl_NextHashEntry(&place); } @@ -398,6 +412,15 @@ ItclDestroyClassNamesp(cdata) contextObj = (ItclObject*)Tcl_GetHashValue(entry); if (contextObj->classDefn == cdefnPtr) { Tcl_DeleteCommandFromToken(cdefnPtr->interp, contextObj->accessCmd); + /* + * Fix 227804: Whenever an object to delete was found we + * have to reset the search to the beginning as the + * current entry in the search was deleted and accessing it + * is therefore not allowed anymore. + */ + + entry = Tcl_FirstHashEntry(&cdefnPtr->info->objects, &place); + continue; } entry = Tcl_NextHashEntry(&place); } @@ -837,6 +860,8 @@ Itcl_HandleClass(clientData, interp, objc, objv) * incrementing a counter until a valid name is found. */ do { + Tcl_CmdInfo dummy; + sprintf(unique,"%.200s%d", cdefnPtr->name, cdefnPtr->unique++); unique[0] = tolower(unique[0]); @@ -847,10 +872,16 @@ Itcl_HandleClass(clientData, interp, objc, objv) Tcl_DStringAppend(&buffer, start+5, -1); objName = Tcl_DStringValue(&buffer); - if (Itcl_FindObject(interp, objName, &newObj) != TCL_OK) { + + /* + * [Fix 227811] Check for any command with the + * given name, not only objects. + */ + + if (Tcl_GetCommandInfo (interp, objName, &dummy) == 0) { break; /* if an error is found, bail out! */ } - } while (newObj != NULL); + } while (1); *start = tmp; /* undo null-termination */ objName = Tcl_DStringValue(&buffer); @@ -903,7 +934,7 @@ Itcl_HandleClass(clientData, interp, objc, objv) int Itcl_ClassCmdResolver(interp, name, context, flags, rPtr) Tcl_Interp *interp; /* current interpreter */ - char* name; /* name of the command being accessed */ + CONST char* name; /* name of the command being accessed */ Tcl_Namespace *context; /* namespace performing the resolution */ int flags; /* TCL_LEAVE_ERR_MSG => leave error messages * in interp if anything goes wrong */ @@ -914,6 +945,7 @@ Itcl_ClassCmdResolver(interp, name, context, flags, rPtr) Tcl_HashEntry *entry; ItclMemberFunc *mfunc; Command *cmdPtr; + int isCmdDeleted; /* * If the command is a member function, and if it is @@ -960,16 +992,39 @@ Itcl_ClassCmdResolver(interp, name, context, flags, rPtr) * it--as it is being resolved again by the compiler. */ cmdPtr = (Command*)mfunc->accessCmd; - if (!cmdPtr || cmdPtr->deleted) { - mfunc->accessCmd = NULL; - - if ((flags & TCL_LEAVE_ERR_MSG) != 0) { - Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), - "can't access \"", name, "\": deleted or redefined\n", - "(use the \"body\" command to redefine methods/procs)", - (char*)NULL); - } - return TCL_ERROR; /* disallow access! */ + + /* + * The following #if is needed so itcl can be compiled with + * all versions of Tcl. The integer "deleted" was renamed to + * "flags" in tcl8.4a2. This #if is also found in itcl_ensemble.c . + * We're using a runtime check with itclCompatFlags to adjust for + * the behavior of this change, too. + * + */ +#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 4) +# define CMD_IS_DELETED 0x1 /* If someone ever changes this from tcl.h, + * we must change our logic here, too */ + isCmdDeleted = (!cmdPtr || + (itclCompatFlags & ITCL_COMPAT_USECMDFLAGS ? + (cmdPtr->deleted & CMD_IS_DELETED) : + cmdPtr->deleted)); +#else + isCmdDeleted = (!cmdPtr || + (itclCompatFlags & ITCL_COMPAT_USECMDFLAGS ? + (cmdPtr->flags & CMD_IS_DELETED) : + cmdPtr->flags)); +#endif + + if (isCmdDeleted) { + mfunc->accessCmd = NULL; + + if ((flags & TCL_LEAVE_ERR_MSG) != 0) { + Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), + "can't access \"", name, "\": deleted or redefined\n", + "(use the \"body\" command to redefine methods/procs)", + (char*)NULL); + } + return TCL_ERROR; /* disallow access! */ } *rPtr = mfunc->accessCmd; diff --git a/itcl/itcl/generic/itcl_cmds.c b/itcl/itcl/generic/itcl_cmds.c index 773e3098af..dff4a46890 100644 --- a/itcl/itcl/generic/itcl_cmds.c +++ b/itcl/itcl/generic/itcl_cmds.c @@ -103,6 +103,9 @@ static char safeInitScript[] = extern ItclStubs itclStubs; + +int itclCompatFlags = -1; + /* * ------------------------------------------------------------------------ @@ -140,6 +143,26 @@ Initialize(interp) } /* + * Set the compatability options. Stubs allows us to load into many + * version of the Tcl core. Some problems have crept-in, and we need + * to adapt dynamically regarding use of some internal structures that + * have changed since 8.1.0 + * + * TODO: make a TIP for exporting a Tcl_CommandIsDeleted function in the core. + */ + if (itclCompatFlags == -1) { + int maj, min, ptch, type; + + itclCompatFlags = 0; + Tcl_GetVersion(&maj, &min, &ptch, &type); + + if ((maj == 8) && (min >= 4)) { + itclCompatFlags = ITCL_COMPAT_USECMDFLAGS; + } + } + + + /* * Initialize the ensemble package first, since we need this * for other parts of [incr Tcl]. */ @@ -392,7 +415,15 @@ ItclDelObjectInfo(cdata) while (entry) { contextObj = (ItclObject*)Tcl_GetHashValue(entry); Tcl_DeleteCommandFromToken(info->interp, contextObj->accessCmd); - entry = Tcl_NextHashEntry(&place); + /* + * Fix 227804: Whenever an object to delete was found we + * have to reset the search to the beginning as the + * current entry in the search was deleted and accessing it + * is therefore not allowed anymore. + */ + + entry = Tcl_FirstHashEntry(&info->objects, &place); + /*entry = Tcl_NextHashEntry(&place);*/ } Tcl_DeleteHashTable(&info->objects); @@ -438,8 +469,8 @@ Itcl_FindClassesCmd(clientData, interp, objc, objv) int forceFullNames = 0; char *pattern; - char *name; - int i, newEntry, handledActiveNs; + CONST char *name; + int newEntry, handledActiveNs; Tcl_HashTable unique; Tcl_HashEntry *entry; Tcl_HashSearch place; @@ -568,7 +599,8 @@ Itcl_FindObjectsCmd(clientData, interp, objc, objv) ItclClass *isaDefn = NULL; char *name, *token; - int i, pos, newEntry, match, handledActiveNs; + CONST char *cmdName; + int pos, newEntry, match, handledActiveNs; ItclObject *contextObj; Tcl_HashTable unique; Tcl_HashEntry *entry; @@ -679,8 +711,8 @@ Itcl_FindObjectsCmd(clientData, interp, objc, objv) Tcl_GetCommandFullName(interp, cmd, objPtr); name = Tcl_GetStringFromObj(objPtr, (int*)NULL); } else { - name = Tcl_GetCommandName(interp, cmd); - objPtr = Tcl_NewStringObj(name, -1); + cmdName = Tcl_GetCommandName(interp, cmd); + objPtr = Tcl_NewStringObj(cmdName, -1); } Tcl_CreateHashEntry(&unique, (char*)cmd, &newEntry); @@ -772,13 +804,7 @@ Itcl_ProtectionCmd(clientData, interp, objc, objv) oldLevel = Itcl_Protection(interp, pLevel); if (objc == 2) { - /* CYGNUS LOCAL - Fix for 8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, objv[1], 0); -#else result = Tcl_EvalObj(interp, objv[1]); -#endif - /* END CYGNUS LOCAL */ } else { result = Itcl_EvalArgs(interp, objc-1, objv+1); } diff --git a/itcl/itcl/generic/itcl_ensemble.c b/itcl/itcl/generic/itcl_ensemble.c index fb5f802ad7..a60b487ec1 100644 --- a/itcl/itcl/generic/itcl_ensemble.c +++ b/itcl/itcl/generic/itcl_ensemble.c @@ -91,11 +91,6 @@ Tcl_ObjType itclEnsInvocType = { SetEnsInvocFromAny /* setFromAnyProc */ }; -/* - * Boolean flag indicating whether or not the "ensemble" object - * type has been registered with the Tcl compiler. - */ -static int ensInitialized = 0; /* * Forward declarations for the procedures used in this file. @@ -166,9 +161,8 @@ int Itcl_EnsembleInit(interp) Tcl_Interp *interp; /* interpreter being initialized */ { - if (!ensInitialized) { + if (Tcl_GetObjType(itclEnsInvocType.name) == NULL) { Tcl_RegisterObjType(&itclEnsInvocType); - ensInitialized = 1; } Tcl_CreateObjCommand(interp, "::itcl::ensemble", @@ -819,7 +813,11 @@ CreateEnsemble(interp, parentEnsData, ensName) cmdPtr->clientData = NULL; cmdPtr->deleteProc = DeleteEnsemble; cmdPtr->deleteData = cmdPtr->objClientData; - cmdPtr->deleted = 0; + #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 4) + cmdPtr->deleted = 0; + #else + cmdPtr->flags = 0; + #endif cmdPtr->importRefPtr = NULL; ensPart->cmdPtr = cmdPtr; @@ -896,7 +894,11 @@ AddEnsemblePart(interp, ensData, partName, usageInfo, cmdPtr->clientData = NULL; cmdPtr->deleteProc = deleteProc; cmdPtr->deleteData = (ClientData)clientData; +#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 4) cmdPtr->deleted = 0; +#else + cmdPtr->flags = 0; +#endif cmdPtr->importRefPtr = NULL; ensPart->cmdPtr = cmdPtr; @@ -1689,22 +1691,12 @@ Itcl_EnsembleCmd(clientData, interp, objc, objv) ensInfo->ensData = ensData; if (objc == 3) { - /* CYGNUS LOCAL - fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - status = Tcl_EvalObj(ensInfo->parser, objv[2], 0); -#else status = Tcl_EvalObj(ensInfo->parser, objv[2]); -#endif } else if (objc > 3) { objPtr = Tcl_NewListObj(objc-2, objv+2); Tcl_IncrRefCount(objPtr); /* stop Eval trashing it */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - status = Tcl_EvalObj(ensInfo->parser, objPtr, 0); -#else status = Tcl_EvalObj(ensInfo->parser, objPtr); -#endif - /* END CYGNUS LOCAL */ Tcl_DecrRefCount(objPtr); /* we're done with the object */ } diff --git a/itcl/itcl/generic/itcl_methods.c b/itcl/itcl/generic/itcl_methods.c index 2ea41100a2..0236d3c66f 100644 --- a/itcl/itcl/generic/itcl_methods.c +++ b/itcl/itcl/generic/itcl_methods.c @@ -31,7 +31,6 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "itclInt.h" -#include "tclCompile.h" /* * FORWARD DECLARATIONS @@ -1001,13 +1000,7 @@ Itcl_EvalMemberCode(interp, mfunc, member, contextObj, objc, objv) ckfree((char*)argv); } else if ((mcode->flags & ITCL_IMPLEMENT_TCL) != 0) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, mcode->procPtr->bodyPtr, 0); -#else - result = Tcl_EvalObj(interp, mcode->procPtr->bodyPtr); -#endif - /* END CYGNUS LOCAL */ + result = Tcl_EvalObj(interp, mcode->procPtr->bodyPtr); } else { panic("itcl: bad implementation flag for %s", member->fullname); @@ -1345,7 +1338,7 @@ Itcl_GetMemberFuncUsage(mfunc, contextObj, objPtr) Tcl_Obj *objPtr; /* returns: string showing usage */ { int argcount; - char *name; + CONST char *name; CompiledLocal *arglist, *argPtr; Tcl_HashEntry *entry; ItclMemberFunc *mf; @@ -2302,14 +2295,8 @@ Itcl_ConstructBase(interp, contextObj, contextClass) * now--just before the body of the constructor is executed. */ if (contextClass->initCode) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - if (Tcl_EvalObj(interp, contextClass->initCode, 0) != TCL_OK) { -#else - if (Tcl_EvalObj(interp, contextClass->initCode) != TCL_OK) { -#endif - /* END CYGNUS LOCAL */ - return TCL_ERROR; + if (Tcl_EvalObj(interp, contextClass->initCode) != TCL_OK) { + return TCL_ERROR; } } diff --git a/itcl/itcl/generic/itcl_objects.c b/itcl/itcl/generic/itcl_objects.c index 0b976832b2..fbcbc97121 100644 --- a/itcl/itcl/generic/itcl_objects.c +++ b/itcl/itcl/generic/itcl_objects.c @@ -238,9 +238,16 @@ Itcl_CreateObject(interp, name, cdefn, objc, objv, roPtr) if (result != TCL_OK) { istate = Itcl_SaveInterpState(interp, result); - Tcl_DeleteCommandFromToken(interp, newObj->accessCmd); - newObj->accessCmd = NULL; - + /* Bug 227824. + * The constructor may destroy the object, possibly indirectly + * through the destruction of the main widget in the iTk + * megawidget it tried to construct. If this happens we must + * not try to destroy the access command a second time. + */ + if (newObj->accessCmd != (Tcl_Command) NULL) { + Tcl_DeleteCommandFromToken(interp, newObj->accessCmd); + newObj->accessCmd = NULL; + } result = Itcl_RestoreInterpState(interp, istate); } @@ -259,10 +266,10 @@ Itcl_CreateObject(interp, name, cdefn, objc, objv, roPtr) * object deleted itself inside its own constructor. * In that case, we don't want to add the object to * the list of valid objects. We can determine that - * the object deleted itself by checking to see if its - * accessCmd member is NULL. + * the object deleted itself by checking to see if + * its accessCmd member is NULL. */ - if ((result == TCL_OK) && (newObj->accessCmd != NULL)) { + if (result == TCL_OK && (newObj->accessCmd != NULL)) { entry = Tcl_CreateHashEntry(&cdefnPtr->info->objects, (char*)newObj->accessCmd, &newEntry); @@ -665,6 +672,16 @@ Itcl_HandleInstance(clientData, interp, objc, objv) framePtr = &context.frame; Itcl_PushStack((ClientData)framePtr, &info->transparentFrames); + /* Bug 227824 + * The tcl core will blow up in 'TclLookupVar' if we don't reset + * the 'isProcCallFrame'. This happens because without the + * callframe refered to by 'framePtr' will be inconsistent + * ('isProcCallFrame' set, but 'procPtr' not set). + */ + if (*token == 'i' && strcmp(token,"info") == 0) { + framePtr->isProcCallFrame = 0; + } + result = Itcl_EvalArgs(interp, objc-1, objv+1); Itcl_PopStack(&info->transparentFrames); diff --git a/itcl/itcl/generic/itcl_obsolete.c b/itcl/itcl/generic/itcl_obsolete.c index 6d7b2dcf1e..9aa20552eb 100644 --- a/itcl/itcl/generic/itcl_obsolete.c +++ b/itcl/itcl/generic/itcl_obsolete.c @@ -479,14 +479,8 @@ ItclOldClassCmd(clientData, interp, objc, objv) /* isProcCallFrame */ 0); if (result == TCL_OK) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, objv[2], 0); -#else - result = Tcl_EvalObj(interp, objv[2]); -#endif - /* END CYGNUS LOCAL */ - Tcl_PopCallFrame(interp); + result = Tcl_EvalObj(interp, objv[2]); + Tcl_PopCallFrame(interp); } Itcl_PopStack(&info->cdefnStack); diff --git a/itcl/itcl/generic/itcl_parse.c b/itcl/itcl/generic/itcl_parse.c index 23d4510bc1..eb792e704b 100644 --- a/itcl/itcl/generic/itcl_parse.c +++ b/itcl/itcl/generic/itcl_parse.c @@ -255,14 +255,8 @@ Itcl_ClassCmd(clientData, interp, objc, objv) /* isProcCallFrame */ 0); if (result == TCL_OK) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, objv[2], 0); -#else - result = Tcl_EvalObj(interp, objv[2]); -#endif - /* END CYGNUS LOCAL */ - Tcl_PopCallFrame(interp); + result = Tcl_EvalObj(interp, objv[2]); + Tcl_PopCallFrame(interp); } Itcl_PopStack(&info->cdefnStack); @@ -580,13 +574,7 @@ Itcl_ClassProtectionCmd(clientData, interp, objc, objv) oldLevel = Itcl_Protection(interp, pInfo->pLevel); if (objc == 2) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, objv[1], 0); -#else - result = Tcl_EvalObj(interp, objv[1]); -#endif - /* END CYGNUS LOCAL */ + result = Tcl_EvalObj(interp, objv[1]); } else { result = Itcl_EvalArgs(interp, objc-1, objv+1); } diff --git a/itcl/itcl/generic/itcl_util.c b/itcl/itcl/generic/itcl_util.c index e6eed63217..40c7803ee1 100644 --- a/itcl/itcl/generic/itcl_util.c +++ b/itcl/itcl/generic/itcl_util.c @@ -29,7 +29,6 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "itclInt.h" -#include "tclCompile.h" /* * POOL OF LIST ELEMENTS FOR LINKED LIST @@ -52,7 +51,7 @@ typedef struct ItclPreservedData { } ItclPreservedData; static Tcl_HashTable *ItclPreservedList = NULL; - +TCL_DECLARE_MUTEX(ItclPreservedListLock) /* * This structure is used to take a snapshot of the interpreter @@ -556,6 +555,7 @@ Itcl_EventuallyFree(cdata, fproc) * If a list has not yet been created to manage bits of * preserved data, then create it. */ + Tcl_MutexLock(&ItclPreservedListLock); if (!ItclPreservedList) { ItclPreservedList = (Tcl_HashTable*)ckalloc( (unsigned)sizeof(Tcl_HashTable) @@ -585,12 +585,15 @@ Itcl_EventuallyFree(cdata, fproc) * If the usage count is zero, then delete the data now. */ if (chunk->usage == 0) { - chunk->usage = -1; /* cannot preserve/release anymore */ + chunk->usage = -1; /* cannot preserve/release anymore */ - (*chunk->fproc)((char*)chunk->data); - Tcl_DeleteHashEntry(entry); - ckfree((char*)chunk); + Tcl_MutexUnlock(&ItclPreservedListLock); + (*chunk->fproc)((char*)chunk->data); + Tcl_MutexLock(&ItclPreservedListLock); + Tcl_DeleteHashEntry(entry); + ckfree((char*)chunk); } + Tcl_MutexUnlock(&ItclPreservedListLock); } /* @@ -624,6 +627,7 @@ Itcl_PreserveData(cdata) * If a list has not yet been created to manage bits of * preserved data, then create it. */ + Tcl_MutexLock(&ItclPreservedListLock); if (!ItclPreservedList) { ItclPreservedList = (Tcl_HashTable*)ckalloc( (unsigned)sizeof(Tcl_HashTable) @@ -657,6 +661,7 @@ Itcl_PreserveData(cdata) if (chunk->usage >= 0) { chunk->usage++; } + Tcl_MutexUnlock(&ItclPreservedListLock); } /* @@ -688,10 +693,12 @@ Itcl_ReleaseData(cdata) * decrement its usage count. */ entry = NULL; + Tcl_MutexLock(&ItclPreservedListLock); if (ItclPreservedList) { entry = Tcl_FindHashEntry(ItclPreservedList,(char*)cdata); } if (!entry) { + Tcl_MutexUnlock(&ItclPreservedListLock); panic("Itcl_ReleaseData can't find reference for 0x%x", cdata); } @@ -705,14 +712,17 @@ Itcl_ReleaseData(cdata) chunk = (ItclPreservedData*)Tcl_GetHashValue(entry); if (chunk->usage > 0 && --chunk->usage == 0) { - if (chunk->fproc) { - chunk->usage = -1; /* cannot preserve/release anymore */ - (*chunk->fproc)((char*)chunk->data); + if (chunk->fproc) { + chunk->usage = -1; /* cannot preserve/release anymore */ + Tcl_MutexUnlock(&ItclPreservedListLock); + (*chunk->fproc)((char*)chunk->data); + Tcl_MutexLock(&ItclPreservedListLock); } Tcl_DeleteHashEntry(entry); ckfree((char*)chunk); } + Tcl_MutexUnlock(&ItclPreservedListLock); } diff --git a/itcl/itcl/itclConfig.sh.in b/itcl/itcl/itclConfig.sh.in index 2e094a1875..f8a0ebe33f 100644 --- a/itcl/itcl/itclConfig.sh.in +++ b/itcl/itcl/itclConfig.sh.in @@ -28,10 +28,7 @@ ITCL_BUILD_LIB_SPEC='@ITCL_BUILD_LIB_SPEC@' # installed directory. ITCL_LIB_SPEC='@ITCL_LIB_SPEC@' -# Full path to itcl library for dependency checking. -ITCL_LIB_FULL_PATH='@ITCL_LIB_FULL_PATH@' - -# The name of the Itcl stub library +# The name of the Itcl stub library (a .a file): ITCL_STUB_LIB_FILE=@ITCL_STUB_LIB_FILE@ # String to pass to linker to pick up the Itcl stub library from its @@ -42,15 +39,9 @@ ITCL_BUILD_STUB_LIB_SPEC='@ITCL_BUILD_STUB_LIB_SPEC@' # installed directory. ITCL_STUB_LIB_SPEC='@ITCL_STUB_LIB_SPEC@' -# Full path to itcl library for dependency checking. -ITCL_STUB_LIB_FULL_PATH='@ITCL_STUB_LIB_FULL_PATH@' - # Location of the top-level source directories from which [incr Tcl] # was built. This is the directory that contains generic, unix, etc. # If [incr Tcl] 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 Tcl] was compiled. ITCL_SRC_DIR='@ITCL_SRC_DIR@' - -# Name and location of the incr tcl shell. Used during the build process. -ITCL_SH='@ITCL_SH@' diff --git a/itcl/itcl/library/itcl.tcl b/itcl/itcl/library/itcl.tcl index fdd3a7ff3b..78cb48abe9 100644 --- a/itcl/itcl/library/itcl.tcl +++ b/itcl/itcl/library/itcl.tcl @@ -16,6 +16,10 @@ # See the file "license.terms" for information on usage and # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. +proc ::itcl::delete_helper { name args } { + ::itcl::delete object $name +} + # ---------------------------------------------------------------------- # USAGE: local ? ...? # @@ -31,7 +35,7 @@ proc ::itcl::local {class name args} { uplevel [list set itcl-local-$ptr $ptr] set cmd [uplevel namespace which -command $ptr] uplevel [list trace variable itcl-local-$ptr u \ - "itcl::delete object $cmd; list"] + "::itcl::delete_helper $cmd"] return $ptr } @@ -42,12 +46,11 @@ proc ::itcl::local {class name args} { # parser in Tcl... # -# RED HAT LOCAL: don't require namespace qualifier # # USAGE: itcl::class name body # Adds an entry for the given class declaration. # -foreach cmd {itcl::class itcl_class class} { +foreach cmd {itcl::class itcl_class} { auto_mkindex_parser::command $cmd {name body} { variable index variable scriptFile @@ -62,50 +65,39 @@ foreach cmd {itcl::class itcl_class class} { } } -# RED HAT LOCAL: don't require namespace qualifier # # USAGE: itcl::body name arglist body # Adds an entry for the given method/proc body. # -foreach cmd {itcl::body body} { - auto_mkindex_parser::command $cmd {name arglist body} { - variable index - variable scriptFile - append index "set [list auto_index([fullname $name])]" - append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" - } +auto_mkindex_parser::command itcl::body {name arglist body} { + variable index + variable scriptFile + append index "set [list auto_index([fullname $name])]" + append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" } -# RED HAT LOCAL: don't require namespace qualifier # # USAGE: itcl::configbody name arglist body # Adds an entry for the given method/proc body. # -foreach cmd {itcl::configbody configbody} { - auto_mkindex_parser::command $cmd {name body} { - variable index - variable scriptFile - append index "set [list auto_index([fullname $name])]" - append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" - } +auto_mkindex_parser::command itcl::configbody {name body} { + variable index + variable scriptFile + append index "set [list auto_index([fullname $name])]" + append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" } -# RED HAT LOCAL: don't require namespace qualifier # # USAGE: ensemble name ?body? # Adds an entry to the auto index list for the given ensemble name. # -foreach cmd {itcl::ensemble ensemble} { - auto_mkindex_parser::command $cmd {name {body ""}} { - variable index - variable scriptFile - append index "set [list auto_index([fullname $name])]" - append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" - } +auto_mkindex_parser::command itcl::ensemble {name {body ""}} { + variable index + variable scriptFile + append index "set [list auto_index([fullname $name])]" + append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" } -# RED HAT LOCAL: treat public differently, since we do care about -# public procs # # USAGE: public arg ?arg arg...? # protected arg ?arg arg...? @@ -114,36 +106,13 @@ foreach cmd {itcl::ensemble ensemble} { # Evaluates the arguments as commands, so we can recognize proc # declarations within classes. # -foreach cmd {protected private} { +foreach cmd {public protected private} { auto_mkindex_parser::command $cmd {args} { variable parser $parser eval $args } } -# RED HAT LOCAL: When the user has used "public {...}" (llength $args == 1), -# we must eval $args again into its component statements so -# that we look at every line in the "body". Otherwise, -# we'll be looking for the contents of the "{...}" as a -# command, which is funny business. -auto_mkindex_parser::command public {args} { - variable parser - if {[llength $args] == 1} { - eval $parser eval $args - } else { - $parser eval $args - } -} - -# RED HAT LOCAL -# This version of auto_import does not work, because it relies -# WHOLLY on the tclIndex files, but the tclIndex files have no -# notion of what the export list for a namespace is. So at the -# time you do "namespace import" the export list is empty, and -# so nothing is imported. -# Until that is fixed, it is best just to go back to the original -# Tcl version of auto_import... - # ---------------------------------------------------------------------- # auto_import # ---------------------------------------------------------------------- @@ -157,19 +126,19 @@ auto_mkindex_parser::command public {args} { # pattern The pattern of commands being imported (like "foo::*") # a canonical namespace as returned by [namespace current] -#proc auto_import {pattern} { -# global auto_index +proc auto_import {pattern} { + global auto_index -# set ns [uplevel namespace current] -# set patternList [auto_qualify $pattern $ns] + set ns [uplevel namespace current] + set patternList [auto_qualify $pattern $ns] -# auto_load_index + auto_load_index -# foreach pattern $patternList { -# foreach name [array names auto_index $pattern] { -# if {"" == [info commands $name]} { -# ::itcl::import::stub create $name -# } -# } -# } -# } + foreach pattern $patternList { + foreach name [array names auto_index $pattern] { + if {"" == [info commands $name]} { + ::itcl::import::stub create $name + } + } + } +} diff --git a/itcl/itcl/tests/interp.test b/itcl/itcl/tests/interp.test index e6c6479382..8b0015203a 100644 --- a/itcl/itcl/tests/interp.test +++ b/itcl/itcl/tests/interp.test @@ -72,5 +72,20 @@ test interp-1.4 {one namespace can cause another to be destroyed} { interp delete slave } {} +test interp-1.5 {cleanup interp object list, this should not + include an object that deletes itself in ctor} { + interp create slave + load "" Itcl slave + slave eval { + itcl::class DeleteSelf { + constructor {} { + itcl::delete object $this + } + } + DeleteSelf ds + } + interp delete slave +} {} + ::tcltest::cleanupTests return diff --git a/itcl/itcl/unix/Makefile.in b/itcl/itcl/unix/Makefile.in deleted file mode 100644 index 824550623a..0000000000 --- a/itcl/itcl/unix/Makefile.in +++ /dev/null @@ -1,321 +0,0 @@ -# -# This file is a Makefile for [incr Tcl]. 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. -# -# RCS: $Id$ - -# Current [incr Tcl] version; used in various names. - -MAJOR_VERSION = @ITCL_MAJOR_VERSION@ -MINOR_VERSION = @ITCL_MINOR_VERSION@ -RELEASE_LEVEL = @ITCL_RELEASE_LEVEL@ -VERSION = @ITCL_VERSION@ - -#---------------------------------------------------------------- -# Things you can change to personalize the Makefile for your own -# site (you can make these changes in either Makefile.in or -# Makefile, but changes to Makefile will get lost if you re-run -# the configuration script). -#---------------------------------------------------------------- - -# Default top-level directories in which to install architecture- -# specific files (exec_prefix) and machine-independent files such -# as scripts (prefix). The values specified here may be overridden -# at configure-time with the --exec-prefix and --prefix options -# to the "configure" script. - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -# The following definition can be set to non-null for special systems -# like AFS with replication. It allows the pathnames used for installation -# to be different than those used for actually reference files at -# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix -# when installing files. -INSTALL_ROOT = - -# Directory from which applications will reference the library of -# [incr Tcl] scripts (note: you can set the ITCL_LIBRARY environment -# variable at run-time to override this value): -# CYGNUS LOCAL: we use "share" rather than "lib" as the prefix for our -# Tcl files -ITCL_LIBRARY = $(prefix)/share/itcl$(VERSION) -# END CYGNUS LOCAL - -# Path name to use when installing library scripts: -SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(ITCL_LIBRARY) - -# Directory in which to install the archive libtcl.a: -LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib - -# Path to use at runtime to refer to LIB_INSTALL_DIR: -LIB_RUNTIME_DIR = $(exec_prefix)/lib - -# Directory in which to install the program tclsh: -BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin - -# Directory in which to install the include file itcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include - -# Top-level directory in which to install manual entries: -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man - -# Directory in which to install manual entry for itclsh: -MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1 - -# Directory in which to install manual entries for [incr Tcl]'s -# C library procedures: -MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3 - -# Directory in which to install manual entries for the built-in -# [incr Tcl] commands: -MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann - -# Tcl source directory is included in this distribution. Use this to -# get the correct path: -TCL_SRC_DIR = @TCL_SRC_DIR@ - -# The directory containing the Tcl library archive file appropriate -# for this version of Tk: -TCL_LIB_DIR = @TCL_LIB_DIR@ - -# Library flags for Tcl library -TCL_LIB_FLAG = @TCL_LIB_FLAG@ - -# Tcl libraries built with optimization switches have this additional extension -DBGX = @TCL_DBGX@ - -# Additional libraries to use when linking. The "LIBS" part will be -# replaced (or has already been replaced) with relevant libraries as -# determined by the configure script. -LIBS = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@ @DL_LIBS@ -lc - -# To change the compiler switches, for example to change from -O -# to -g, change the following line: -CFLAGS = @CFLAGS@ - -# To disable ANSI-C procedure prototypes reverse the comment characters -# on the following lines: -PROTO_FLAGS = -#PROTO_FLAGS = -DNO_PROTOTYPE - -# To enable memory debugging reverse the comment characters on the following -# lines. Warning: if you enable memory debugging, you must do it -# *everywhere*, including all the code that calls Tcl, and you must use -# ckalloc and ckfree everywhere instead of malloc and free. -MEM_DEBUG_FLAGS = -#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG - -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh - -# Tcl used to let the configure script choose which program to use -# for installing, but there are just too many different versions of -# "install" around; better to use the install-sh script that comes -# with the distribution, which is slower but guaranteed to work. - -INSTALL = $(TOP_DIR)/../config/install-sh -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} -m 644 -MKINSTALLDIRS = $(TOP_DIR)/../config/mkinstalldirs - -# The symbols below provide support for dynamic loading and shared -# libraries. The values of the symbols are normally set by the -# configure script. You shouldn't normally need to modify any of -# these definitions by hand. - -SHLIB_CFLAGS = @SHLIB_CFLAGS@ -TCL_CFLAGS = @TCL_CFLAGS@ - -LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ - -ITCL_LIB_FILE = @ITCL_LIB_FILE@ -#ITCL_LIB_FILE = libitcl.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. - -SHLIB_LD = @SHLIB_LD@ - -#---------------------------------------------------------------- -# The information below is modified by the configure script when -# Makefile is generated from Makefile.in. You shouldn't normally -# modify any of this stuff by hand. -#---------------------------------------------------------------- - -AC_FLAGS = @TCL_DEFS@ -RANLIB = @RANLIB@ -TOP_DIR = @ITCL_SRC_DIR@ -GENERIC_DIR = $(TOP_DIR)/generic -UNIX_DIR = $(TOP_DIR)/unix -VPATH = @srcdir@ - -#---------------------------------------------------------------- -# The information below should be usable as is. The configure -# script won't modify it and you shouldn't need to modify it -# either. -#---------------------------------------------------------------- - -CC = @CC@ -CC_SWITCHES = $(CFLAGS) $(TCL_CFLAGS) $(SHLIB_CFLAGS) \ --I$(UNIX_DIR) -I$(GENERIC_DIR) \ --I$(TCL_SRC_DIR)/generic $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) \ --DITCL_LIBRARY=\"$(ITCL_LIBRARY)\" - -SRCS = $(GENERIC_DIR)/itcl_bicmds.c \ - $(GENERIC_DIR)/itcl_class.c \ - $(GENERIC_DIR)/itcl_cmds.c \ - $(GENERIC_DIR)/itcl_ensemble.c \ - $(GENERIC_DIR)/itcl_linkage.c \ - $(GENERIC_DIR)/itcl_methods.c \ - $(GENERIC_DIR)/itcl_migrate.c \ - $(GENERIC_DIR)/itcl_objects.c \ - $(GENERIC_DIR)/itcl_obsolete.c \ - $(GENERIC_DIR)/itcl_parse.c \ - $(GENERIC_DIR)/itcl_util.c \ - $(GENERIC_DIR)/tclAppInit.c - -OBJS = itcl_bicmds.o itcl_class.o itcl_cmds.o itcl_ensemble.o \ - itcl_linkage.o itcl_methods.o itcl_migrate.o itcl_objects.o \ - itcl_obsolete.o itcl_parse.o itcl_util.o - -SOBJS = itcl_bicmds.so itcl_class.so itcl_cmds.so itcl_ensemble.so \ - itcl_linkage.so itcl_methods.so itcl_migrate.so itcl_objects.so \ - itcl_obsolete.so itcl_parse.so itcl_util.so - -all: $(ITCL_LIB_FILE) itclsh - -@ITCL_LIB_FILE@: $(OBJS) - rm -f $(ITCL_LIB_FILE) - @MAKE_LIB@ - $(RANLIB) $(ITCL_LIB_FILE) - -itclsh: tclAppInit.o $(ITCL_LIB_FILE) @TCL_LIB_FULL_PATH@ - $(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itclsh - -test: itclsh - LD_LIBRARY_PATH="$(TCL_LIB_DIR):`pwd`:$(LD_LIBRARY_PATH)"; \ - export LD_LIBRARY_PATH; \ - TCL_LIBRARY="$(TCL_SRC_DIR)/library"; export TCL_LIBRARY; \ - ITCL_LIBRARY=$(TOP_DIR)/library; export ITCL_LIBRARY; \ - TCLLIBPATH=$(TOP_DIR)/unix; export TCLLIBPATH; \ - ( echo cd $(TOP_DIR)/tests\; source all ) | ./itclsh - -install: install-binaries install-libraries install-man - -install-binaries: $(ITCL_LIB_FILE) itclsh - @$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) - @echo "Installing $(ITCL_LIB_FILE)" - @$(INSTALL_DATA) $(ITCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE) - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITCL_LIB_FILE)) - chmod 555 $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE) - @echo "Installing itclsh" - $(INSTALL_PROGRAM) itclsh $(BIN_INSTALL_DIR)/itclsh$(VERSION) - @echo "Installing itclConfig.sh" - @$(INSTALL_DATA) ../itclConfig.sh $(LIB_INSTALL_DIR)/itclConfig.sh - -install-libraries: - @$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) - @echo "Installing itcl.h" - @$(INSTALL_DATA) $(GENERIC_DIR)/itcl.h $(INCLUDE_INSTALL_DIR) - @for i in $(TOP_DIR)/library/*.* $(UNIX_DIR)/tclAppInit.c; \ - do \ - echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \ - done; - @echo "Installing pkgIndex.tcl" - @$(INSTALL_DATA) pkgIndex.tcl $(SCRIPT_INSTALL_DIR) - -install-man: - @$(MKINSTALLDIRS) $(MAN1_INSTALL_DIR) $(MANN_INSTALL_DIR) - @cd $(TOP_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ - echo "Installing doc/$$i"; \ - rm -f $(MANN_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MANN_INSTALL_DIR)/$$i; \ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - -# CYGNUS LOCAL: install-minimal target. -install-minimal: - -Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status - -clean: - rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors \ - rm -f itclsh* libitcl* *pure* *% ../tests/core - -distclean: clean - rm -f Makefile config.status config.cache config.log - rm -f ../itclConfig.sh pkgIndex.tcl - -pure: tclAppInit.o $(ITCL_LIB_FILE) @TCL_LIB_FULL_PATH@ - purify $(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itclsh.pure - -profile: tclAppInit.o $(ITCL_LIB_FILE) @TCL_LIB_FULL_PATH@ - quantify $(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itclsh.pure - -depend: - makedepend -- $(CC_SWITCHES) -- $(SRCS) - -configure: configure.in - autoconf - -.c.o: - $(CC) -c $(CC_SWITCHES) $< - -tclAppInit.o: $(UNIX_DIR)/tclAppInit.c - $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclAppInit.c - -itcl_bicmds.o: $(GENERIC_DIR)/itcl_bicmds.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_bicmds.c - -itcl_class.o: $(GENERIC_DIR)/itcl_class.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_class.c - -itcl_cmds.o: $(GENERIC_DIR)/itcl_cmds.c Makefile - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_cmds.c - -itcl_ensemble.o: $(GENERIC_DIR)/itcl_ensemble.c Makefile - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_ensemble.c - -itcl_linkage.o: $(GENERIC_DIR)/itcl_linkage.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_linkage.c - -itcl_methods.o: $(GENERIC_DIR)/itcl_methods.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_methods.c - -itcl_migrate.o: $(GENERIC_DIR)/itcl_migrate.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_migrate.c - -itcl_objects.o: $(GENERIC_DIR)/itcl_objects.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_objects.c - -itcl_obsolete.o: $(GENERIC_DIR)/itcl_obsolete.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_obsolete.c - -itcl_parse.o: $(GENERIC_DIR)/itcl_parse.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_parse.c - -itcl_util.o: $(GENERIC_DIR)/itcl_util.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itcl_util.c - -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/itcl/itcl/unix/configure b/itcl/itcl/unix/configure deleted file mode 100755 index f8e24db65f..0000000000 --- a/itcl/itcl/unix/configure +++ /dev/null @@ -1,1521 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_default_prefix=/usr/local -ac_help="$ac_help - --with-tcl=DIR use Tcl 8.0 binaries from DIR" -ac_help="$ac_help - --with-cflags=FLAGS set compiler flags to FLAGS" -ac_help="$ac_help - --enable-shared build libitcl as a shared library" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=../generic/itcl.h - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - -# RCS: $Id$ - -ITCL_VERSION=3.0 -ITCL_MAJOR_VERSION=3 -ITCL_MINOR_VERSION=0 -ITCL_RELEASE_LEVEL=0 -VERSION=${ITCL_VERSION} - -ac_aux_dir= -for ac_dir in ../../config $srcdir/../../config; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in ../../config $srcdir/../../config" 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - - -# ----------------------------------------------------------------------- -# Set up a new default --prefix. If a previous installation of -# [incr Tcl] can be found searching $PATH use that directory. -# ----------------------------------------------------------------------- - - -if test "x$prefix" = xNONE; then -echo $ac_n "checking for prefix by $ac_c" 1>&6 -# Extract the first word of "tclsh", so it can be a program name with args. -set dummy tclsh; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:572: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$TCLSH" in - /*) - ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_TCLSH="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -TCLSH="$ac_cv_path_TCLSH" -if test -n "$TCLSH"; then - echo "$ac_t""$TCLSH" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -n "$ac_cv_path_TCLSH"; then - prefix=`echo $ac_cv_path_TCLSH|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` - fi -fi - - -if test "${prefix}" = "NONE"; then - prefix=/usr/local -fi -if test "${exec_prefix}" = "NONE"; then - exec_prefix=$prefix -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:629: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:684: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -# ----------------------------------------------------------------------- -BUILD_DIR=`pwd` -ITCL_SRC_DIR=`cd $srcdir/..; pwd` -cd ${BUILD_DIR} - - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:720: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:750: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:801: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:833: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 844 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:880: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:908: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tcl is; if -# not, assume that its top-level directory is a sibling of ours. -# CYGNUS LOCAL - Actually, tcl is one level higher - a sibling of the -# itcl directory that contains itcl proper, itk & iwidgets. -#-------------------------------------------------------------------- - -# Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - itcl_search=$withval -else - itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix` -fi - - -TCL_LIB_DIR="" -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tclConfig.sh; then - TCL_LIB_DIR=$dir - break - fi -done - -if test -z "$TCL_LIB_DIR"; then - { echo "configure: error: Can't find Tcl libraries. Use --with-tcl to specify the directory containing tclConfig.sh on your system." 1>&2; exit 1; } -fi - -#-------------------------------------------------------------------- -# Read in configuration information generated by Tcl for shared -# libraries, and arrange for it to be substituted into our -# Makefile. -#-------------------------------------------------------------------- - -file=$TCL_LIB_DIR/tclConfig.sh -. $file -CFLAGS=$TCL_CFLAGS -SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS -SHLIB_LD=$TCL_SHLIB_LD -SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX -DL_LIBS=$TCL_DL_LIBS -LD_FLAGS=$TCL_LD_FLAGS -LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS - -#-------------------------------------------------------------------- -# Make sure that we can find the Tcl sources, so we can include -# the "tclInt.h" file. -#-------------------------------------------------------------------- - -if test ! -d "$TCL_SRC_DIR"; then - { echo "configure: error: Can't find Tcl source directory "$TCL_SRC_DIR". Itcl can't be built without this directory." 1>&2; exit 1; } -fi - -#-------------------------------------------------------------------- -# If this is gcc, add some extra compile flags. -#-------------------------------------------------------------------- - -echo $ac_n "checking whether C compiler is gcc""... $ac_c" 1>&6 -echo "configure:999: checking whether C compiler is gcc" >&5 -if eval "test \"`echo '$''{'itcl_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1005: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -cat > conftest.$ac_ext <&5 | - egrep "_cc_is_gcc_" >/dev/null 2>&1; then - rm -rf conftest* - itcl_cv_prog_gcc=yes -else - rm -rf conftest* - itcl_cv_prog_gcc=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$itcl_cv_prog_gcc" 1>&6 - -# CYGNUS LOCAL - CFLAGS for gcc should include -g -O2 -if test -z "$CFLAGS" ; then -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="-g -O2" -else - CFLAGS="-O" -fi -fi -# CYGNUS LOCAL - use -fwritable-strings with gcc, needed for Tcl8.1 -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall" -fi - -echo $ac_n "checking default compiler flags""... $ac_c" 1>&6 -echo "configure:1121: checking default compiler flags" >&5 -# Check whether --with-cflags or --without-cflags was given. -if test "${with_cflags+set}" = set; then - withval="$with_cflags" - CFLAGS="$with_cflags" -fi - - -echo "$ac_t""$CFLAGS" 1>&6 - -if test "$TCL_CC" != "$CC" ; then - echo "" - echo "WARNING: Compiler is $CC but Tcl was compiled with $TCL_CC" - echo "" -fi - -#-------------------------------------------------------------------- -# The statements below define a collection of symbols related to -# building libitcl as a shared library instead of a static library. -#-------------------------------------------------------------------- - -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - ok=$enableval -else - ok=no -fi - -if test "$ok" = "yes"; then - if test ${TCL_SHARED_BUILD} = 0; then - { echo "configure: error: Tcl was not built with --enable-shared" 1>&2; exit 1; } - fi - SHLIB_CFLAGS="${SHLIB_CFLAGS}" - eval "ITCL_LIB_FILE=libitcl${VERSION}${SHLIB_SUFFIX}" - ITCL_PKG_FILE="[file join [file dirname \$dir] ${ITCL_LIB_FILE}]" - MAKE_LIB="\$(SHLIB_LD) -o ${ITCL_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} " - RANLIB=":" -else - SHLIB_CFLAGS="" - # CYGNUS LOCAL - Strip dots from library name for SunOS4, etc... - if test ${TCL_LIB_VERSIONS_OK} = "nodots"; then - ITCL_LIB_FILE="libitcl`echo ${VERSION} | tr -d .`.a" - else - eval "ITCL_LIB_FILE=libitcl${VERSION}.a" - fi - ITCL_PKG_FILE="" - MAKE_LIB="ar cr ${ITCL_LIB_FILE} \${OBJS}" -fi - -ITCL_SH="`pwd`/itclsh" - -# 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 -# up the Tcl library. - -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - ITCL_BUILD_LIB_SPEC="-L`pwd` -litcl${VERSION}" - ITCL_LIB_SPEC="-L${exec_prefix}/lib -litcl${VERSION}" -else - ITCL_BUILD_LIB_SPEC="-L`pwd` -litcl`echo ${VERSION} | tr -d .`" - ITCL_LIB_SPEC="-L${exec_prefix}/lib -litcl`echo ${VERSION} | tr -d .`" -fi - -ITCL_LIB_FULL_PATH="`pwd`/${ITCL_LIB_FILE}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile pkgIndex.tcl ../itclConfig.sh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@TCLSH@%$TCLSH%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@RANLIB@%$RANLIB%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@DL_LIBS@%$DL_LIBS%g -s%@LD_FLAGS@%$LD_FLAGS%g -s%@MAKE_LIB@%$MAKE_LIB%g -s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g -s%@SHLIB_LD@%$SHLIB_LD%g -s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g -s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g -s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g -s%@TCL_VERSION@%$TCL_VERSION%g -s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g -s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g -s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g -s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g -s%@TCL_DBGX@%$TCL_DBGX%g -s%@TCL_DEFS@%$TCL_DEFS%g -s%@TCL_LIBS@%$TCL_LIBS%g -s%@TCL_SHLIB_LD_LIBS@%$TCL_SHLIB_LD_LIBS%g -s%@TCL_SHLIB_SUFFIX@%$TCL_SHLIB_SUFFIX%g -s%@TCL_COMPAT_OBJS@%$TCL_COMPAT_OBJS%g -s%@TCL_CFLAGS@%$TCL_CFLAGS%g -s%@TCL_LIB_FULL_PATH@%$TCL_LIB_FULL_PATH%g -s%@ITCL_VERSION@%$ITCL_VERSION%g -s%@ITCL_MAJOR_VERSION@%$ITCL_MAJOR_VERSION%g -s%@ITCL_MINOR_VERSION@%$ITCL_MINOR_VERSION%g -s%@ITCL_RELEASE_LEVEL@%$ITCL_RELEASE_LEVEL%g -s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g -s%@ITCL_LIB_FILE@%$ITCL_LIB_FILE%g -s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g -s%@ITCL_PKG_FILE@%$ITCL_PKG_FILE%g -s%@ITCL_SRC_DIR@%$ITCL_SRC_DIR%g -s%@ITCL_SH@%$ITCL_SH%g -s%@ITCL_LIB_FULL_PATH@%$ITCL_LIB_FULL_PATH%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/itcl/itcl/unix/configure.in b/itcl/itcl/unix/configure.in deleted file mode 100644 index c83e5f26a7..0000000000 --- a/itcl/itcl/unix/configure.in +++ /dev/null @@ -1,224 +0,0 @@ -dnl This file is an input file used by the GNU "autoconf" program to -dnl generate the file "configure", which is run during [incr Tcl] -dnl installation to configure the system for the local environment. - -AC_INIT(../generic/itcl.h) -# RCS: $Id$ - -ITCL_VERSION=3.0 -ITCL_MAJOR_VERSION=3 -ITCL_MINOR_VERSION=0 -ITCL_RELEASE_LEVEL=0 -VERSION=${ITCL_VERSION} - -AC_CONFIG_AUX_DIR(../../config) -AC_PREREQ(2.0) - -# ----------------------------------------------------------------------- -# Set up a new default --prefix. If a previous installation of -# [incr Tcl] can be found searching $PATH use that directory. -# ----------------------------------------------------------------------- - -AC_PREFIX_DEFAULT(/usr/local) -AC_PREFIX_PROGRAM(tclsh) - -if test "${prefix}" = "NONE"; then - prefix=/usr/local -fi -if test "${exec_prefix}" = "NONE"; then - exec_prefix=$prefix -fi - -AC_PROG_INSTALL -AC_PROG_RANLIB - -# ----------------------------------------------------------------------- -BUILD_DIR=`pwd` -ITCL_SRC_DIR=`cd $srcdir/..; pwd` -cd ${BUILD_DIR} - -dnl CYGNUS LOCAL: allow gcc without a special flag -dnl AC_ARG_ENABLE(gcc, [ --enable-gcc allow use of gcc if available], -dnl [itcl_ok=$enableval], [itcl_ok=no]) -dnl if test "$itcl_ok" = "yes"; then - AC_PROG_CC -dnl else -dnl CC=${CC-cc} -dnl AC_SUBST(CC) -dnl fi -dnl END CYGNUS LOCAL - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tcl is; if -# not, assume that its top-level directory is a sibling of ours. -# CYGNUS LOCAL - Actually, tcl is one level higher - a sibling of the -# itcl directory that contains itcl proper, itk & iwidgets. -#-------------------------------------------------------------------- - -dnl CYGNUS LOCAL: We just call the Tcl directory "tcl", not "tcl8.0" -AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.0 binaries from DIR], - itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix`) -dnl END CYGNUS LOCAL - -TCL_LIB_DIR="" -dnl CYGNUS LOCAL: Look in the local tree FIRST, not the install directory... -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tclConfig.sh; then - TCL_LIB_DIR=$dir - break - fi -done - -if test -z "$TCL_LIB_DIR"; then - AC_MSG_ERROR(Can't find Tcl libraries. Use --with-tcl to specify the directory containing tclConfig.sh on your system.) -fi - -#-------------------------------------------------------------------- -# Read in configuration information generated by Tcl for shared -# libraries, and arrange for it to be substituted into our -# Makefile. -#-------------------------------------------------------------------- - -file=$TCL_LIB_DIR/tclConfig.sh -. $file -CFLAGS=$TCL_CFLAGS -SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS -SHLIB_LD=$TCL_SHLIB_LD -SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX -DL_LIBS=$TCL_DL_LIBS -LD_FLAGS=$TCL_LD_FLAGS -LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS - -#-------------------------------------------------------------------- -# Make sure that we can find the Tcl sources, so we can include -# the "tclInt.h" file. -#-------------------------------------------------------------------- - -if test ! -d "$TCL_SRC_DIR"; then - AC_MSG_ERROR(Can't find Tcl source directory "$TCL_SRC_DIR". Itcl can't be built without this directory.) -fi - -#-------------------------------------------------------------------- -# If this is gcc, add some extra compile flags. -#-------------------------------------------------------------------- - -AC_MSG_CHECKING([whether C compiler is gcc]) -AC_CACHE_VAL(itcl_cv_prog_gcc, [ - AC_EGREP_CPP(_cc_is_gcc_, [ -#ifdef __GNUC__ -_cc_is_gcc_ -#endif -], [itcl_cv_prog_gcc=yes], [itcl_cv_prog_gcc=no])]) -AC_MSG_RESULT([$itcl_cv_prog_gcc]) - -# CYGNUS LOCAL - CFLAGS for gcc should include -g -O2 -if test -z "$CFLAGS" ; then -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="-g -O2" -else - CFLAGS="-O" -fi -fi -# CYGNUS LOCAL - use -fwritable-strings with gcc, needed for Tcl8.1 -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall" -fi - -AC_MSG_CHECKING([default compiler flags]) -AC_ARG_WITH(cflags, [ --with-cflags=FLAGS set compiler flags to FLAGS], - [CFLAGS="$with_cflags"]) - -AC_MSG_RESULT([$CFLAGS]) - -if test "$TCL_CC" != "$CC" ; then - echo "" - echo "WARNING: Compiler is $CC but Tcl was compiled with $TCL_CC" - echo "" -fi - -#-------------------------------------------------------------------- -# The statements below define a collection of symbols related to -# building libitcl as a shared library instead of a static library. -#-------------------------------------------------------------------- - -AC_ARG_ENABLE(shared, - [ --enable-shared build libitcl as a shared library], - [ok=$enableval], [ok=no]) -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}" - eval "ITCL_LIB_FILE=libitcl${VERSION}${SHLIB_SUFFIX}" - ITCL_PKG_FILE="[[file join [file dirname \$dir] ${ITCL_LIB_FILE}]]" - MAKE_LIB="\$(SHLIB_LD) -o ${ITCL_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} " - RANLIB=":" -else - SHLIB_CFLAGS="" - # CYGNUS LOCAL - Strip dots from library name for SunOS4, etc... - if test ${TCL_LIB_VERSIONS_OK} = "nodots"; then - ITCL_LIB_FILE="libitcl`echo ${VERSION} | tr -d .`.a" - else - eval "ITCL_LIB_FILE=libitcl${VERSION}.a" - fi - ITCL_PKG_FILE="" - MAKE_LIB="ar cr ${ITCL_LIB_FILE} \${OBJS}" -fi - -ITCL_SH="`pwd`/itclsh" - -# 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 -# up the Tcl library. - -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - ITCL_BUILD_LIB_SPEC="-L`pwd` -litcl${VERSION}" - ITCL_LIB_SPEC="-L${exec_prefix}/lib -litcl${VERSION}" -else - ITCL_BUILD_LIB_SPEC="-L`pwd` -litcl`echo ${VERSION} | tr -d .`" - ITCL_LIB_SPEC="-L${exec_prefix}/lib -litcl`echo ${VERSION} | tr -d .`" -fi - -ITCL_LIB_FULL_PATH="`pwd`/${ITCL_LIB_FILE}" - -AC_SUBST(CFLAGS) -AC_SUBST(DL_LIBS) -AC_SUBST(LD_FLAGS) -AC_SUBST(MAKE_LIB) -AC_SUBST(SHLIB_CFLAGS) -AC_SUBST(SHLIB_LD) -AC_SUBST(SHLIB_LD_LIBS) -AC_SUBST(SHLIB_SUFFIX) -AC_SUBST(LD_SEARCH_FLAGS) - -AC_SUBST(TCL_VERSION) -AC_SUBST(TCL_SRC_DIR) -AC_SUBST(TCL_LIB_DIR) -AC_SUBST(TCL_LIB_SPEC) -AC_SUBST(TCL_BUILD_LIB_SPEC) -AC_SUBST(TCL_LIB_FLAG) -AC_SUBST(TCL_DBGX) -AC_SUBST(TCL_DEFS) -AC_SUBST(TCL_LIBS) -AC_SUBST(TCL_SHLIB_LD_LIBS) -AC_SUBST(TCL_SHLIB_SUFFIX) -AC_SUBST(TCL_COMPAT_OBJS) -AC_SUBST(TCL_CFLAGS) -AC_SUBST(TCL_LIB_FULL_PATH) - -AC_SUBST(ITCL_VERSION) -AC_SUBST(ITCL_MAJOR_VERSION) -AC_SUBST(ITCL_MINOR_VERSION) -AC_SUBST(ITCL_RELEASE_LEVEL) - -AC_SUBST(ITCL_BUILD_LIB_SPEC) -AC_SUBST(ITCL_LIB_FILE) -AC_SUBST(ITCL_LIB_SPEC) -AC_SUBST(ITCL_PKG_FILE) -AC_SUBST(ITCL_SRC_DIR) -AC_SUBST(ITCL_SH) -AC_SUBST(ITCL_LIB_FULL_PATH) - -AC_OUTPUT(Makefile pkgIndex.tcl ../itclConfig.sh) diff --git a/itcl/itcl/unix/pkgIndex.tcl.in b/itcl/itcl/unix/pkgIndex.tcl.in deleted file mode 100644 index 33808f1d41..0000000000 --- a/itcl/itcl/unix/pkgIndex.tcl.in +++ /dev/null @@ -1,3 +0,0 @@ -# Tcl package index file, version 1.0 - -package ifneeded Itcl @ITCL_VERSION@ [list load "@ITCL_PKG_FILE@" Itcl] diff --git a/itcl/itcl/win/configure b/itcl/itcl/win/configure index fa3d1cc86a..9e7d736ee0 100755 --- a/itcl/itcl/win/configure +++ b/itcl/itcl/win/configure @@ -2515,15 +2515,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/itcl/itcl/win/itcl.rc b/itcl/itcl/win/itcl.rc deleted file mode 100644 index d9cc97ec72..0000000000 --- a/itcl/itcl/win/itcl.rc +++ /dev/null @@ -1,42 +0,0 @@ -// SCCS: @(#) tcl.rc 1.20 96/09/12 14:57:51 -// -// Version -// - -#define VS_VERSION_INFO 1 -#define RESOURCE_INCLUDED -#include - - -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", "Itcl language extension for Tcl\0" - VALUE "Authors", "Michael McLennan\0" - VALUE "OriginalFilename", "itcl" 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 Tcl] " STRINGIFY(ITCL_MAJOR_VERSION) "." STRINGIFY(ITCL_MINOR_VERSION) " for Windows\0" - VALUE "ProductVersion", ITCL_PATCH_LEVEL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - - - diff --git a/itcl/itcl/win/itclsh.rc b/itcl/itcl/win/itclsh.rc deleted file mode 100644 index 6921c1d9b4..0000000000 --- a/itcl/itcl/win/itclsh.rc +++ /dev/null @@ -1,37 +0,0 @@ -// SCCS: @(#) tclsh.rc 1.14 96/09/12 14:59:29 -// -// Version -// - -#define RESOURCE_INCLUDED -#include - -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 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "[incr Tcl] Object-Oriented Tcl Application\0" - VALUE "Authors", "Michael McLennan\0" - VALUE "OriginalFilename", "itclsh.exe\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 Tcl] "STRINGIFY(ITCL_MAJOR_VERSION)"."STRINGIFY(ITCL_MINOR_VERSION)" for Windows\0" - VALUE "ProductVersion", ITCL_PATCH_LEVEL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - diff --git a/itcl/itcl/win/makefile.bc b/itcl/itcl/win/makefile.bc index b8983a218e..fd63b7e1c8 100644 --- a/itcl/itcl/win/makefile.bc +++ b/itcl/itcl/win/makefile.bc @@ -1,212 +1,213 @@ -# Borland C++ 4.52 makefile -# -# Copyright (c) 1993-1996 Lucent Technologies -# based on original from -# Copyright (c) 1995-1996 Sun Microsystems, Inc. -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. - -!include "..\..\Makefile.bc" - -# -# Project directories -# -# ROOT = top of source tree -# TMPDIR = location where .obj files should be stored during build - -ROOT = .. -TMPDIR = . -TARGET_LIB_ITCL = $(TARGET_LIB)\Itcl2.2 -TARGET_DOC_ITCL = $(TARGET_DOC)\Itcl - -# uncomment the following line to compile with symbols -#DEBUG=1 - -# uncomment the following two lines to compile with TCL_MEM_DEBUG -#DEBUGDEFINES =TCL_MEM_DEBUG - -INCLUDES =$(BORLAND)\include;$(ROOT)\generic;$(ROOT)\win;$(TCLDIR)\generic -LIBDIRS =$(BORLAND)\lib;$(ROOT)\win - -!ifndef DEBUG - -# these macros cause maximum optimization and no symbols -DEBUGLDFLAGS = -DEBUGCCFLAGS = -v- -vi- -O2 -DEBUGLDFLAGS16 = -Oc -Oi -Oa -Or -!else - -# these macros enable debugging -DEBUGLDFLAGS = -v -DEBUGCCFLAGS = -k -Od -v -DEBUGLDFLAGS16 = -!endif - -DEFINES = _RTLDLL;USE_TCLALLOC=0;$(DEBUGDEFINES);NO_DLFCN_H=1;ITCL_NAMESPACES=1 -PROJECTCCFLAGS = $(DEBUGCCFLAGS) -w-par -w-stu - -CFLAGS16_dll = $(PROJECTCCFLAGS) -I$(INCLUDES) -D$(DEFINES) -WD -ml -c -3 -d -w - -LNFLAGS_exe = -Tpe -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0w32 -LNFLAGS_CONSOLE_exe = -Tpe -ap -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0x32 -LNFLAGS_dll = -Tpd -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0d32 -LNFLAGS16_dll = -Twd -c -C -A=16 $(DEBUGLDFLAGS16) $(BORLAND)\lib\c0dl.obj - -LNLIBS_exe = $(ITCLLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i -LNLIBS_dll = $(TCLLIBDIR)\$(TCLLIB) import32 cw32i -LNLIBS16_dll = import cwl - -# -# Global makefile settings -# - -.AUTODEPEND -.CACHEAUTODEPEND - -.suffixes: .c .dll .lib .obj .exe - -.path.c=$(ROOT)\win;$(ROOT)\generic -.path.obj=$(TMPDIR) -.path.dll=$(ROOT)\win;$(WINDIR);$(WINDIR)\SYSTEM32;$(WINDIR)\SYSTEM - -ITCLSHOBJS = \ - $(TMPDIR)\tclAppInit.obj - -ITCLOBJS = \ - $(TMPDIR)\itcl_bicmds.obj \ - $(TMPDIR)\itcl_class.obj \ - $(TMPDIR)\itcl_cmds.obj \ - $(TMPDIR)\itcl_linkage.obj \ - $(TMPDIR)\itcl_methods.obj \ - $(TMPDIR)\itcl_objects.obj \ - $(TMPDIR)\itcl_obsolete.obj \ - $(TMPDIR)\itcl_parse.obj \ - $(TMPDIR)\itcl_util.obj \ - $(TMPDIR)\dllEntryPoint.obj - - -DUMPEXTS = $(TCLLIBDIR)\dumpexts.exe -ITCLSH = itclsh.exe - -# -# Targets -# - -all: cfgcln cfgdll $(ITCLDLL) cfgexe $(ITCLSH) cfgcln -test: $(ITCLSH) - $(CP) $(TCLLIBDIR)\*.dll - $(ITCLSH) <<| - cd ../tests - source all -| - -install: all - $(MKDIR) "$(TARGET_ROOT)" - $(MKDIR) "$(TARGET_BIN)" - $(MKDIR) "$(TARGET_LIB_ROOT)" - $(MKDIR) "$(TARGET_LIB)" - $(MKDIR) "$(TARGET_LIB_ITCL)" - $(MKDIR) "$(TARGET_INCLUDE_ROOT)" - $(MKDIR) "$(TARGET_INCLUDE)" - $(MKDIR) "$(TARGET_DOC)" - $(MKDIR) "$(TARGET_DOC_ITCL)" - $(CP) $(TMPDIR)\$(ITCLSH) "$(TARGET_BIN)" - $(CP) $(TMPDIR)\$(ITCLDLL) "$(TARGET_BIN)" - $(CP) $(ROOT)\generic\itcl.h "$(TARGET_INCLUDE)" - $(CP) $(ROOT)\library\*.* "$(TARGET_LIB_ITCL)" - $(CP) $(ROOT)\win\*.tcl "$(TARGET_LIB_ITCL)" - $(CP) $(ROOT)\..\html\Itcl\*.* "$(TARGET_DOC_ITCL)" - -# Implicit Targets - -.c.obj: - @$(BCC32) {$< } - -.dll.lib: - $(IMPLIB) -c $@ $< - -#.rc.res: -# $(RC) -i$(INCLUDES) -d__WIN32__;$(DEFINES) $< - -.rc.res: - $(RC) -i$(INCLUDES) -d__WIN32__; $< - - -# -# Configuration file targets - these files are implicitly used by the compiler -# - -cfgdll: - @$(CP) &&| - -n$(TMPDIR) -I$(INCLUDES) -c -WD - -D$(DEFINES) -3 -d -w $(PROJECTCCFLAGS) -| bcc32.cfg >NUL - -cfgexe: - @$(CP) &&| - -n$(TMPDIR) -I$(INCLUDES) -c -W - -D$(DEFINES) -3 -d -w $(PROJECTCCFLAGS) -| bcc32.cfg >NUL - -cfgcln: - -@$(RM) *.cfg - -# -# Executable targets -# - -$(ITCLDLL): $(ITCLOBJS) itcl.def itcl.res - $(TLINK32) $(LNFLAGS_dll) @&&| - $(ITCLOBJS) -$@ --x -$(LNLIBS_dll) -|, itcl.def, itcl.res - -$(ITCLSH): $(ITCLSHOBJS) $(ITCLLIB) itclsh.res - $(TLINK32) $(LNFLAGS_CONSOLE_exe) @&&| - $(ITCLSHOBJS) -$@ --x -$(LNLIBS_exe) -|, &&| -EXETYPE WINDOWS -CODE PRELOAD MOVEABLE DISCARDABLE -DATA PRELOAD MOVEABLE MULTIPLE -|, itclsh.res - - -# The following rule automatically generates a tcl.def file containing -# an export entry for every public symbol in the tcl.dll library. - -itcl.def: $(ITCLOBJS) - $(DUMPEXTS) -o itcl.def $(ITCLDLL) @&&| - $(ITCLOBJS) -| - - -# debugging rules, the .dll and .exe files must be in the same -# directory as the object files for debugging purposes - -$(TMPDIR)\$(ITCLDLL): $(ITCLDLL) - $(CP) $(ITCLDLL) $(TMPDIR) - -$(TMPDIR)\$(TCLDLL): $(TCLLIBDIR)\$(TCLDLL) - $(CP) $(TCLLIBDIR)\$(TCLDLL) $(TMPDIR) - -$(TMPDIR)\$(ITCLSH): $(ITCLSH) - $(CP) $(ITCLSH) $(TMPDIR) - -debug: $(TMPDIR)\$(ITCLDLL) $(TMPDIR)\$(TCLDLL) - -# remove all generated files - -clean: - -@$(RM) *.exe - -@$(RM) *.lib - -@$(RM) *.dll - -@$(RM) *.res - -@$(RM) itcl.def - -@$(RM) $(TMPDIR)\*.obj - -@$(RM) *.cfg +# Borland C++ 4.52 makefile +# +# Copyright (c) 1993-1996 Lucent Technologies +# based on original from +# Copyright (c) 1995-1996 Sun Microsystems, Inc. +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +!include "..\..\Makefile.bc" + +# +# Project directories +# +# ROOT = top of source tree +# TMPDIR = location where .obj files should be stored during build + +ROOT = .. +TMPDIR = . +TARGET_LIB_ITCL = $(TARGET_LIB)\Itcl2.2 +TARGET_DOC_ITCL = $(TARGET_DOC)\Itcl + +# uncomment the following line to compile with symbols +#DEBUG=1 + +# uncomment the following two lines to compile with TCL_MEM_DEBUG +#DEBUGDEFINES =TCL_MEM_DEBUG + +INCLUDES =$(BORLAND)\include;$(ROOT)\generic;$(ROOT)\win;$(TCLDIR)\generic +LIBDIRS =$(BORLAND)\lib;$(ROOT)\win + +!ifndef DEBUG + +# these macros cause maximum optimization and no symbols +DEBUGLDFLAGS = +DEBUGCCFLAGS = -v- -vi- -O2 +DEBUGLDFLAGS16 = -Oc -Oi -Oa -Or +!else + +# these macros enable debugging +DEBUGLDFLAGS = -v +DEBUGCCFLAGS = -k -Od -v +DEBUGLDFLAGS16 = +!endif + +DEFINES = _RTLDLL;USE_TCLALLOC=0;$(DEBUGDEFINES);NO_DLFCN_H=1;ITCL_NAMESPACES=1 +PROJECTCCFLAGS = $(DEBUGCCFLAGS) -w-par -w-stu + +CFLAGS16_dll = $(PROJECTCCFLAGS) -I$(INCLUDES) -D$(DEFINES) -WD -ml -c -3 -d -w + +LNFLAGS_exe = -Tpe -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0w32 +LNFLAGS_CONSOLE_exe = -Tpe -ap -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0x32 +LNFLAGS_dll = -Tpd -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0d32 +LNFLAGS16_dll = -Twd -c -C -A=16 $(DEBUGLDFLAGS16) $(BORLAND)\lib\c0dl.obj + +LNLIBS_exe = $(ITCLLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i +LNLIBS_dll = $(TCLLIBDIR)\$(TCLLIB) import32 cw32i +LNLIBS16_dll = import cwl + +# +# Global makefile settings +# + +.AUTODEPEND +.CACHEAUTODEPEND + +.suffixes: .c .dll .lib .obj .exe + +.path.c=$(ROOT)\win;$(ROOT)\generic +.path.obj=$(TMPDIR) +.path.dll=$(ROOT)\win;$(WINDIR);$(WINDIR)\SYSTEM32;$(WINDIR)\SYSTEM + +ITCLSHOBJS = \ + $(TMPDIR)\tclAppInit.obj + +ITCLOBJS = \ + $(TMPDIR)\itcl_bicmds.obj \ + $(TMPDIR)\itcl_class.obj \ + $(TMPDIR)\itcl_cmds.obj \ + $(TMPDIR)\itcl_linkage.obj \ + $(TMPDIR)\itcl_methods.obj \ + $(TMPDIR)\itcl_objects.obj \ + $(TMPDIR)\itcl_obsolete.obj \ + $(TMPDIR)\itcl_parse.obj \ + $(TMPDIR)\itcl_util.obj \ + $(TMPDIR)\dllEntryPoint.obj + + +DUMPEXTS = $(TCLLIBDIR)\dumpexts.exe +ITCLSH = itclsh.exe + +# +# Targets +# + +all: cfgcln cfgdll $(ITCLDLL) cfgexe $(ITCLSH) cfgcln +test: $(ITCLSH) + $(CP) $(TCLLIBDIR)\*.dll + $(ITCLSH) <<| + cd ../tests + source all +| + +install: all + $(MKDIR) "$(TARGET_ROOT)" + $(MKDIR) "$(TARGET_BIN)" + $(MKDIR) "$(TARGET_LIB_ROOT)" + $(MKDIR) "$(TARGET_LIB)" + $(MKDIR) "$(TARGET_LIB_ITCL)" + $(MKDIR) "$(TARGET_INCLUDE_ROOT)" + $(MKDIR) "$(TARGET_INCLUDE)" + $(MKDIR) "$(TARGET_DOC)" + $(MKDIR) "$(TARGET_DOC_ITCL)" + $(CP) $(TMPDIR)\$(ITCLSH) "$(TARGET_BIN)" + $(CP) $(TMPDIR)\$(ITCLDLL) "$(TARGET_BIN)" + $(CP) $(ROOT)\generic\itcl.h "$(TARGET_INCLUDE)" + $(CP) $(ROOT)\library\*.* "$(TARGET_LIB_ITCL)" + $(CP) $(ROOT)\win\*.tcl "$(TARGET_LIB_ITCL)" + $(CP) $(ROOT)\..\html\Itcl\*.* "$(TARGET_DOC_ITCL)" + +# Implicit Targets + +.c.obj: + @$(BCC32) {$< } + +.dll.lib: + $(IMPLIB) -c $@ $< + +#.rc.res: +# $(RC) -i$(INCLUDES) -d__WIN32__;$(DEFINES) $< + +.rc.res: + $(RC) -i$(INCLUDES) -d__WIN32__; $< + + +# +# Configuration file targets - these files are implicitly used by the compiler +# + +cfgdll: + @$(CP) &&| + -n$(TMPDIR) -I$(INCLUDES) -c -WD + -D$(DEFINES) -3 -d -w $(PROJECTCCFLAGS) +| bcc32.cfg >NUL + +cfgexe: + @$(CP) &&| + -n$(TMPDIR) -I$(INCLUDES) -c -W + -D$(DEFINES) -3 -d -w $(PROJECTCCFLAGS) +| bcc32.cfg >NUL + +cfgcln: + -@$(RM) *.cfg + +# +# Executable targets +# + +$(ITCLDLL): $(ITCLOBJS) itcl.def itcl.res + $(TLINK32) $(LNFLAGS_dll) @&&| + $(ITCLOBJS) +$@ +-x +$(LNLIBS_dll) +|, itcl.def, itcl.res + +$(ITCLSH): $(ITCLSHOBJS) $(ITCLLIB) itclsh.res + $(TLINK32) $(LNFLAGS_CONSOLE_exe) @&&| + $(ITCLSHOBJS) +$@ +-x +$(LNLIBS_exe) +|, &&| +EXETYPE WINDOWS +CODE PRELOAD MOVEABLE DISCARDABLE +DATA PRELOAD MOVEABLE MULTIPLE +|, itclsh.res + + +# The following rule automatically generates a tcl.def file containing +# an export entry for every public symbol in the tcl.dll library. + +itcl.def: $(ITCLOBJS) + $(DUMPEXTS) -o itcl.def $(ITCLDLL) @&&| + $(ITCLOBJS) +| + + +# debugging rules, the .dll and .exe files must be in the same +# directory as the object files for debugging purposes + +$(TMPDIR)\$(ITCLDLL): $(ITCLDLL) + $(CP) $(ITCLDLL) $(TMPDIR) + +$(TMPDIR)\$(TCLDLL): $(TCLLIBDIR)\$(TCLDLL) + $(CP) $(TCLLIBDIR)\$(TCLDLL) $(TMPDIR) + +$(TMPDIR)\$(ITCLSH): $(ITCLSH) + $(CP) $(ITCLSH) $(TMPDIR) + +debug: $(TMPDIR)\$(ITCLDLL) $(TMPDIR)\$(TCLDLL) + +# remove all generated files + +clean: + -@$(RM) *.exe + -@$(RM) *.lib + -@$(RM) *.dll + -@$(RM) *.res + -@$(RM) itcl.def + -@$(RM) $(TMPDIR)\*.obj + -@$(RM) *.cfg + diff --git a/itcl/itcl/win/makefile.vc b/itcl/itcl/win/makefile.vc index 92a0827d0c..92fb39c2ea 100644 --- a/itcl/itcl/win/makefile.vc +++ b/itcl/itcl/win/makefile.vc @@ -1,301 +1,297 @@ -# Visual C++ 2.x and 4.0 makefile -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# Copyright (c) 1993-1998 Lucent Technologies, Inc. -# RCS: $Id$ - -# Does not depend on the presence of any environment variables in -# order to compile itcl; all needed information is derived from -# location of the compiler directories. -# -# NOTE: Be sure to modify the "makefile.vc" file in the toplevel directory -# for the itcl distribution. Include the location of your VC++ development -# tools and the installation directory. - -!include "..\..\makefile.vc" - - -# ROOT = top of source tree -# TMPDIR = location where .obj files should be stored during build - -ROOT = .. - -###################################################################### -# Do not modify below this line -###################################################################### - -NAMEPREFIX = itcl -DOTVERSION = 3.1 -VERSION = 31 -STUBPREFIX = $(NAMEPREFIX)stub - -BINROOT = . -!IF "$(NODEBUG)" == "1" -TMPNAME = Release -DBGX = -!ELSE -TMPNAME = Debug -DBGX = d -!ENDIF -TMPDIR = $(BINROOT)\$(TMPNAME) -OUTDIR = $(TMPDIR) - -PKGINDEX = $(TMPDIR)\pkgIndex.tcl - -ITCLLIB = $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib -ITCLDLLNAME = $(NAMEPREFIX)$(VERSION)$(DBGX).dll -ITCLDLL = $(OUTDIR)\$(ITCLDLLNAME) -ITCLSH = $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe -DUMPEXTS = $(TMPDIR)\dumpexts.exe - -TCLLIB = $(TCLDIR)\win\$(OUTDIR)\tcl81$(DBGX).lib -TCLSTUBLIB = $(TCLDIR)\win\$(OUTDIR)\tclstub81$(DBGX).lib -TCLDLL = $(TCLDIR)\win\$(OUTDIR)\tcl81$(DBGX).dll - -ITCLSTUBLIBNAME = $(STUBPREFIX)$(VERSION)$(DBGX).lib -ITCLSTUBLIB = $(OUTDIR)\$(ITCLSTUBLIBNAME) - -LIB_INSTALL_DIR = $(INSTALLDIR)\lib -BIN_INSTALL_DIR = $(INSTALLDIR)\bin -SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\itcl$(DOTVERSION) -INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include - -ITCLSHOBJS = \ - $(TMPDIR)\tclAppInit.obj - -ITCLOBJS = \ - $(TMPDIR)\itclStubInit.obj \ - $(TMPDIR)\itcl_bicmds.obj \ - $(TMPDIR)\itcl_class.obj \ - $(TMPDIR)\itcl_cmds.obj \ - $(TMPDIR)\itcl_ensemble.obj \ - $(TMPDIR)\itcl_linkage.obj \ - $(TMPDIR)\itcl_migrate.obj \ - $(TMPDIR)\itcl_methods.obj \ - $(TMPDIR)\itcl_objects.obj \ - $(TMPDIR)\itcl_obsolete.obj \ - $(TMPDIR)\itcl_parse.obj \ - $(TMPDIR)\itcl_util.obj \ - $(TMPDIR)\dllEntryPoint.obj - -ITCLSTUBOBJS = \ - $(TMPDIR)\itclStubLib.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 - -ITCL_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(TCLDIR)\generic -ITCL_DEFINES = -D__WIN32__ -DBUILD_itcl $(DEBUGDEFINES) - -ITCL_EXE_CFLAGS = $(cdebug) $(cflags) $(cvarsdll) $(include32) \ - $(ITCL_INCLUDES) $(ITCL_DEFINES) - -ITCL_CFLAGS = $(ITCL_EXE_CFLAGS) -DUSE_TCL_STUBS - -###################################################################### -# Link flags -###################################################################### - -!IF "$(NODEBUG)" == "1" -ldebug = /RELEASE -!ELSE -ldebug = -debug:full -debugtype:cv -!ENDIF - -# declarations common to all linker options -lcommon = /NODEFAULTLIB /RELEASE /NOLOGO - -# declarations for use on Intel i386, i486, and Pentium systems -!IF "$(MACHINE)" == "IX86" -DLLENTRY = @12 -lflags = $(lcommon) /MACHINE:$(MACHINE) -!ELSE -lflags = $(lcommon) /MACHINE:$(MACHINE) -!ENDIF - -conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup -guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup -dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll - -!IF "$(MACHINE)" == "PPC" -libc = libc.lib -libcdll = crtdll.lib -!ELSE -libc = libc.lib oldnames.lib -libcdll = msvcrt.lib oldnames.lib -!ENDIF - -baselibs = kernel32.lib $(optlibs) advapi32.lib user32.lib -winlibs = $(baselibs) gdi32.lib comdlg32.lib winspool.lib - -guilibs = $(libc) $(winlibs) -conlibs = $(libc) $(baselibs) -guilibsdll = $(libcdll) $(winlibs) -conlibsdll = $(libcdll) $(baselibs) - -###################################################################### -# Compile flags -###################################################################### - -!IF "$(NODEBUG)" == "1" -!IF "$(MACHINE)" == "ALPHA" -# MSVC on Alpha doesn't understand -Ot -cdebug = -O2i -Gs -GD -!ELSE -cdebug = -Oti -Gs -GD -!ENDIF -!ELSE -cdebug = -Z7 -Od -WX -!ENDIF - -# declarations common to all compiler options -ccommon = -c -W3 -nologo -YX -Fp$(TMPDIR)\ -Dtry=__try -Dexcept=__except - -!IF "$(MACHINE)" == "IX86" -cflags = $(ccommon) -D_X86_=1 -!ELSE -!IF "$(MACHINE)" == "MIPS" -cflags = $(ccommon) -D_MIPS_=1 -!ELSE -!IF "$(MACHINE)" == "PPC" -cflags = $(ccommon) -D_PPC_=1 -!ELSE -!IF "$(MACHINE)" == "ALPHA" -cflags = $(ccommon) -D_ALPHA_=1 -!ENDIF -!ENDIF -!ENDIF -!ENDIF - -cvars = -DWIN32 -D_WIN32 -cvarsmt = $(cvars) -D_MT -cvarsdll = $(cvarsmt) -D_DLL - -!IF "$(NODEBUG)" == "1" -cvarsdll = $(cvars) -MD -!ELSE -cvarsdll = $(cvars) -MDd -!ENDIF - -CON_CFLAGS = $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE - -###################################################################### -# Project specific targets -###################################################################### - -release: setup $(ITCLDLL) $(ITCLSTUBLIB) $(ITCLSH) -all: setup $(ITCLDLL) $(ITCLSTUBLIB) $(ITCLSH) -test: setup $(ITCLDLL) $(ITCLSTUBLIB) $(PKGINDEX) - -@copy $(TCLDLL) $(TMPDIR) - $(TCLSH) << - cd ../tests - lappend auto_path ../win/$(TMPNAME) - set env(ITCL_LIBRARY) ../library - source all -<< - -$(PKGINDEX): - -@copy pkgIndex.tcl $@ - -setup: - if not exist $(TMPDIR) mkdir $(TMPDIR) - if not exist $(OUTDIR) mkdir $(OUTDIR) - -$(ITCLLIB): $(ITCLDLL) - -$(ITCLDLL): $(ITCLOBJS) $(TMPDIR)\itclvc.def $(TMPDIR)\itcl.res - set LIB=$(TOOLS32)\lib - $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\itclvc.def \ - -out:$@ $(TMPDIR)\itcl.res $(guilibsdll) $(TCLSTUBLIB) @<< - $(ITCLOBJS) -<< - -$(ITCLSTUBLIB): $(ITCLSTUBOBJS) - $(lib32) -nologo -out:$@ $(ITCLSTUBOBJS) - -$(ITCLSH): $(ITCLSHOBJS) $(ITCLSTUBLIB) $(TCLSTUBLIB) $(TMPDIR)\itclsh.res - set LIB=$(TOOLS32)\lib - $(link32) $(ldebug) $(conlflags) $(TMPDIR)\itclsh.res -stack:2300000 \ - -out:$@ $(conlibsdll) $(ITCLLIB) $(TCLLIB) $(ITCLSHOBJS) - -$(TMPDIR)\itclvc.def: $(DUMPEXTS) $(ITCLOBJS) - $(DUMPEXTS) -o $@ $(ITCLDLLNAME) @<< -$(ITCLOBJS) -<< - -$(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c - $(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $? - set LIB=$(TOOLS32)\lib - $(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \ - $(TMPDIR)\winDumpExts.obj - -install: all - if not exist $(INSTALLDIR) mkdir $(INSTALLDIR) - if not exist $(BIN_INSTALL_DIR) mkdir $(BIN_INSTALL_DIR) - if not exist $(LIB_INSTALL_DIR) mkdir $(LIB_INSTALL_DIR) - if not exist $(SCRIPT_INSTALL_DIR) mkdir $(SCRIPT_INSTALL_DIR) - if not exist $(INCLUDE_INSTALL_DIR) mkdir $(INCLUDE_INSTALL_DIR) - copy $(ITCLSH) "$(BIN_INSTALL_DIR)" - copy $(ITCLDLL) "$(BIN_INSTALL_DIR)" - copy $(ROOT)\generic\itcl.h "$(INCLUDE_INSTALL_DIR)" - 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)\itcl.decls $(GENERICDIR)\itclInt.decls - -# -# Special case object file targets -# - -$(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c - $(cc32) $(ITCL_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)\itclStubLib.obj : $(GENERICDIR)\itclStubLib.c - $(cc32) -DSTATIC_BUILD $(ITCL_CFLAGS) -Fo$@ $? - -# -# Implicit rules -# - -{$(WINDIR)}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITCL_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(GENERICDIR)}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITCL_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(ROOT)\compat}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITCL_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(WINDIR)}.rc{$(TMPDIR)}.res: - $(rc32) -fo $@ -r -i $(GENERICDIR) -i $(WINDIR) -i $(TCLDIR)\generic -D__WIN32__ \ - $(ITCL_DEFINES) $< - -clean: - -@del $(OUTDIR)\*.exp - -@del $(OUTDIR)\*.lib - -@del $(OUTDIR)\*.dll - -@del $(OUTDIR)\*.exe - -@del $(OUTDIR)\*.pdb - -@del $(TMPDIR)\*.pch - -@del $(TMPDIR)\*.obj - -@del $(TMPDIR)\*.res - -@del $(TMPDIR)\*.def - -@del $(TMPDIR)\*.exe - -@rmdir $(OUTDIR) - -@rmdir $(TMPDIR) +###################################################################### +# Visual C++ 5.0+ makefile for [Incr Tcl] +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# Copyright (c) 1993-1998 Lucent Technologies, Inc. +# RCS: $Id$ +###################################################################### +# All needed information is derived from running vcvars32.bat +# +# NOTE: Be sure to modify the "config.vc" file in the toplevel directory +# before running this makefile. +###################################################################### +# Do not modify this file! modify config.vc to effect the build. +###################################################################### + +!include "..\..\rules.vc" +!include "..\..\config.vc" +!include "..\..\pkg.vc" + +BINROOT = . +ROOT = .. +NAMEPREFIX = itcl +STUBPREFIX = $(NAMEPREFIX)stub + +!if $(DEBUG) +TMPNAME = Debug +DBGX = d +!else +TMPNAME = Release +DBGX = +!endif + +TMP_DIR = $(BINROOT)\$(TMPNAME) + +!ifndef OUT_DIR +OUT_DIR = $(TMP_DIR) +!endif + +PKGINDEX = "$(TMP_DIR)\pkgIndex.tcl" + +!if $(STATIC_BUILD) +ITCLOUTNAME = $(NAMEPREFIX)$(ITCL_VERSION)s$(DBGX) +ITCLTARGET = "$(OUT_DIR)\$(ITCLOUTNAME).lib" +!else +ITCLOUTNAME = $(NAMEPREFIX)$(ITCL_VERSION)$(DBGX) +ITCLIMPLIB = "$(OUT_DIR)\$(ITCLOUTNAME).lib" +ITCLTARGET = "$(OUT_DIR)\$(ITCLOUTNAME).dll" +!endif + +!if $(ISTCLINSTALL) +TCLSTUBLIB = "$(TCLROOT)\lib\tclstub$(TCL_VERSION).lib" +TCLIMPLIB = "$(TCLROOT)\lib\tcl$(TCL_VERSION)$(DBGX).lib" +TCLSH = "$(TCLROOT)\bin\tclsh$(TCL_VERSION)$(DBGX).exe" +!else +TCLSTUBLIB = "$(TCLROOT)\win\Release\tclstub$(TCL_VERSION).lib" +TCLIMPLIB = "$(TCLROOT)\win\$(OUT_DIR)\tcl$(TCL_VERSION)$(DBGX).lib" +TCLSH = "$(TCLROOT)\win\$(OUT_DIR)\tclsh$(TCL_VERSION)$(DBGX).exe" +!endif + +ITCLSTUBLIBNAME = $(STUBPREFIX)$(ITCL_VERSION)$(DBGX).lib +ITCLSTUBLIB = "$(OUT_DIR)\$(ITCLSTUBLIBNAME)" + +LIB_INSTALL_DIR = $(INSTALLDIR)\lib +BIN_INSTALL_DIR = $(INSTALLDIR)\bin +SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\itcl$(ITCL_DOTVERSION) +INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include + +ITCLSHOBJS = \ + $(TMP_DIR)\tclAppInit.obj + +ITCLOBJS = \ + $(TMP_DIR)\itcl_bicmds.obj \ + $(TMP_DIR)\itcl_class.obj \ + $(TMP_DIR)\itcl_cmds.obj \ + $(TMP_DIR)\itcl_ensemble.obj \ + $(TMP_DIR)\itcl_linkage.obj \ + $(TMP_DIR)\itcl_migrate.obj \ + $(TMP_DIR)\itcl_methods.obj \ + $(TMP_DIR)\itcl_objects.obj \ + $(TMP_DIR)\itcl_obsolete.obj \ + $(TMP_DIR)\itcl_parse.obj \ + $(TMP_DIR)\itcl_util.obj \ +!if $(STATIC_BUILD) == 0 + $(TMP_DIR)\dllEntryPoint.obj \ + $(TMP_DIR)\dllResource.obj \ +!endif + $(TMP_DIR)\itclStubInit.obj + +ITCLSTUBOBJS = \ + $(TMP_DIR)\itclStubLib.obj + +WINDIR = $(ROOT)\win +GENERICDIR = $(ROOT)\generic +RCDIR = $(ROOT)\win\rc + +###################################################################### +# Link flags +###################################################################### + +!if $(DEBUG) +ldebug = -debug:full -debugtype:cv -pdb:none +!else +ldebug = -release -opt:ref +!endif + +# declarations common to all linker options +lcommon = -nologo -link50compat -machine:$(MACHINE) + +ITCL_LFLAGS = $(lcommon) -subsystem:windows -dll + +!if $(USE_TCL_STUBS) == 0 +ITCL_LLIBS = $(TCLIMPLIB) +!else +ITCL_LLIBS = $(TCLSTUBLIB) +!endif + +###################################################################### +# Compile flags +###################################################################### + +!IF $(DEBUG) == 0 +!IF "$(MACHINE)" == "ALPHA" +# MSVC on Alpha doesn't understand -Ot +cdebug = -O2i +!ELSE +cdebug = -Ox +!ENDIF +!ELSE +!if $(MSDEV_VER) < 6 +cdebug = -Zi -Od -WX +!else +cdebug = -ZI -Od -WX +!endif +!ENDIF + +!if $(STATIC_BUILD) +cdll = +!else +cdll = -GD +!endif + +# declarations common to all compiler options +ccommon = -nologo -c -W3 -YX -Fp$(TMP_DIR)\ + +!if $(STATIC_BUILD) && $(NOMSVCRT) +crt = -MT$(DBGX) +!else +crt = -MD$(DBGX) +!endif + +!if $(ISTCLINSTALL) +TCL_INCLUDES = -I"$(TCLROOT)\include" +!else +TCL_INCLUDES = -I"$(TCLROOT)\generic" +!endif + +ITCL_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) +ITCL_DEFINES = -DBUILD_itcl -DTCL_THREADS=1 +ITCL_EXE_CFLAGS = $(ccommon) $(cdebug) $(crt) $(cdll) $(ITCL_INCLUDES) \ + $(ITCL_DEFINES) $(TCL_INCLUDES) + +!if $(USE_TCL_STUBS) +ITCL_CFLAGS = $(ITCL_EXE_CFLAGS) -DUSE_TCL_STUBS +!else +ITCL_CFLAGS = $(ITCL_EXE_CFLAGS) +!endif + +###################################################################### +# Project specific targets +###################################################################### + +all : setup $(ITCLTARGET) $(ITCLSTUBLIB) +release : setup $(ITCLTARGET) $(ITCLSTUBLIB) + +!if $(STATIC_BUILD) +test : + @echo test target not supported for a static library. +!else +#test : setup $(ITCLTARGET) $(ITCLSTUBLIB) $(PKGINDEX) +# -@copy $(TCLDLL) $(TMP_DIR) +# $(TCLSH) << +#cd ../tests +#lappend auto_path ../win/$(TMP_DIR) +#set env(ITCL_LIBRARY) ../library +#source all +#<< +!endif + +$(PKGINDEX) : + -@copy pkgIndex.tcl $@ + +setup : + @$(vcvars) > nul + @if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) &\ + echo Created directory '$(TMP_DIR)' + @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) &\ + echo Created directory '$(OUT_DIR)' + +$(ITCLTARGET): $(ITCLOBJS) +!if $(STATIC_BUILD) + $(lib32) -nologo -machine:$(MACHINE) -out:$@ @<< +!else + $(link32) $(ITCL_LFLAGS) -out:$@ $(ITCL_LLIBS) @<< +!endif + $(ITCLOBJS) +<< + +!if $(DEBUG) == 0 +$(ITCLSTUBLIB) : $(ITCLSTUBOBJS) + $(lib32) -nologo -out:$@ $(ITCLSTUBOBJS) +!else +$(ITCLSTUBLIB) : +!endif + +install : all + if not exist "$(INSTALLDIR)" mkdir "$(INSTALLDIR)" + if not exist "$(BIN_INSTALL_DIR)" mkdir "$(BIN_INSTALL_DIR)" + if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)" + if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)" + if not exist "$(INCLUDE_INSTALL_DIR)" mkdir "$(INCLUDE_INSTALL_DIR)" + copy $(ITCLTARGET) "$(SCRIPT_INSTALL_DIR)" + -copy $(ITCLSTUBLIB) "$(LIB_INSTALL_DIR)" + copy $(ROOT)\generic\itcl.h "$(INCLUDE_INSTALL_DIR)" + copy $(ROOT)\generic\itclDecls.h "$(INCLUDE_INSTALL_DIR)" + copy $(ROOT)\library\*.* "$(SCRIPT_INSTALL_DIR)" + echo package ifneeded Itcl $(ITCL_DOTVERSION) [list load [file join $$dir $(ITCLOUTNAME).dll] Itcl] > \ + "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" + +###################################################################### +# Regenerate the stubs files. +###################################################################### + +!if $(ISTCLINSTALL) == 0 +# Only from the sources of Tcl does genStubs.tcl exist. +genstubs: + $(TCLSH) $(TCLROOT)\tools\genStubs.tcl $(GENERICDIR) \ + $(GENERICDIR)\itcl.decls $(GENERICDIR)\itclInt.decls +!endif + +###################################################################### +# Special case object file targets +###################################################################### + +# 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 + +$(TMP_DIR)\itclStubLib.obj : $(GENERICDIR)\itclStubLib.c + $(cc32) -DSTATIC_BUILD $(ITCL_EXE_CFLAGS) -Zl -Fo$@ $? + +$(TMP_DIR)\dllResource.obj : $(TMP_DIR)\itcl.res + $(cvtres32) -nologo -machine:$(MACHINE) -out:$@ $? + +###################################################################### +# Inference rules. Use batch-mode when supported. +###################################################################### + +!if $(_NMAKE_VER) < 162 +{$(WINDIR)}.c{$(TMP_DIR)}.obj : +!else +{$(WINDIR)}.c{$(TMP_DIR)}.obj :: +!endif + $(cc32) -DDLL_BUILD $(ITCL_CFLAGS) -Fo$(TMP_DIR)\ @<< +$< +<< + +!if $(_NMAKE_VER) < 162 +{$(GENERICDIR)}.c{$(TMP_DIR)}.obj : +!else +{$(GENERICDIR)}.c{$(TMP_DIR)}.obj :: +!endif + $(cc32) -DDLL_BUILD $(ITCL_CFLAGS) -Fo$(TMP_DIR)\ @<< +$< +<< + +{$(RCDIR)}.rc{$(TMP_DIR)}.res : + $(rc32) -fo $@ -DDEBUG=$(DEBUG) $(ITCL_INCLUDES) $(TCL_INCLUDES) $(ITCL_DEFINES) $< + +###################################################################### +# Clean up +###################################################################### + +tidy : + -del $(TMP_DIR)\*.pch + -del $(TMP_DIR)\*.obj + -del $(TMP_DIR)\*.res + +clean : tidy + -del $(OUT_DIR)\*.exp + -del $(OUT_DIR)\*.lib + -del $(OUT_DIR)\*.dll + +hose : clean + -rmdir $(OUT_DIR) + -rmdir $(TMP_DIR) + diff --git a/itcl/itcl/win/pkgIndex.tcl b/itcl/itcl/win/pkgIndex.tcl deleted file mode 100644 index 28f0467bfb..0000000000 --- a/itcl/itcl/win/pkgIndex.tcl +++ /dev/null @@ -1,3 +0,0 @@ -# Tcl package index file, version 1.0 - -package ifneeded Itcl 3.1 [list load [file join $dir itcl31.dll] Itcl] diff --git a/itcl/itcl/win/tclAppInit.c b/itcl/itcl/win/tclAppInit.c deleted file mode 100644 index b105a215f9..0000000000 --- a/itcl/itcl/win/tclAppInit.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - * tclAppInit.c -- - * - * Provides a default version of the main program and Tcl_AppInit - * procedure for Tcl applications (without Tk). Note that this - * program must be built in Win32 console mode to work properly. - * - * Copyright (c) 1996 by Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * SCCS: @(#) tclAppInit.c 1.12 97/04/30 11:04:50 - */ - -/* include tclInt.h for access to namespace API */ -#include "tclInt.h" - -#include "itcl.h" -#include -#include - -#ifdef TCL_TEST -EXTERN int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -EXTERN int TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#endif /* TCL_TEST */ - -static void setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr)); - - -/* - *---------------------------------------------------------------------- - * - * main -- - * - * This is the main program for the application. - * - * Results: - * None: Tcl_Main never returns here, so this procedure never - * returns either. - * - * Side effects: - * Whatever the application does. - * - *---------------------------------------------------------------------- - */ - -int -main(argc, argv) - int argc; /* Number of command-line arguments. */ - char **argv; /* Values of command-line arguments. */ -{ - char *p; - char buffer[MAX_PATH]; - - /* - * Set up the default locale to be standard "C" locale so parsing - * is performed correctly. - */ - - setlocale(LC_ALL, "C"); - - setargv(&argc, &argv); - - /* - * Replace argv[0] with full pathname of executable, and forward - * slashes substituted for backslashes. - */ - - GetModuleFileName(NULL, buffer, sizeof(buffer)); - argv[0] = buffer; - for (p = buffer; *p != '\0'; p++) { - if (*p == '\\') { - *p = '/'; - } - } - - Tcl_Main(argc, argv, Tcl_AppInit); - return 0; /* Needed only to prevent compiler warning. */ -} - - -/* - *---------------------------------------------------------------------- - * - * Tcl_AppInit -- - * - * This procedure performs application-specific initialization. - * Most applications, especially those that incorporate additional - * packages, will have their own version of this procedure. - * - * Results: - * Returns a standard Tcl completion code, and leaves an error - * message in interp->result if an error occurs. - * - * Side effects: - * Depends on the startup script. - * - *---------------------------------------------------------------------- - */ - -int -Tcl_AppInit(interp) - Tcl_Interp *interp; /* Interpreter for application. */ -{ - if (Tcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - -#ifdef TCL_TEST - if (Tcltest_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, - (Tcl_PackageInitProc *) NULL); - if (TclObjTest_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } -#endif /* TCL_TEST */ - - /* - * Call the init procedures for included packages. Each call should - * look like this: - * - * if (Mod_Init(interp) == TCL_ERROR) { - * return TCL_ERROR; - * } - * - * where "Mod" is the name of the module. - */ - if (Itcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - Tcl_StaticPackage(interp, "Itcl", Itcl_Init, Itcl_SafeInit); - - /* - * This is itclsh, so import all [incr Tcl] commands by - * default into the global namespace. Fix up the autoloader - * to do the same. - */ - if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp), - "::itcl::*", /* allowOverwrite */ 1) != TCL_OK) { - return TCL_ERROR; - } - - if (Tcl_Eval(interp, "auto_mkindex_parser::slavehook { _%@namespace import -force ::itcl::* }") != TCL_OK) { - return TCL_ERROR; - } - - /* - * Call Tcl_CreateCommand for application-specific commands, if - * they weren't already created by the init procedures called above. - */ - - /* - * Specify a user-specific startup file to invoke if the application - * is run interactively. Typically the startup file is "~/.apprc" - * where "app" is the name of the application. If this line is deleted - * then no user-specific startup file will be run under any conditions. - */ - - Tcl_SetVar(interp, "tcl_rcFileName", "~/itclshrc.tcl", TCL_GLOBAL_ONLY); - return TCL_OK; -} - -/* - *------------------------------------------------------------------------- - * - * setargv -- - * - * Parse the Windows command line string into argc/argv. Done here - * because we don't trust the builtin argument parser in crt0. - * Windows applications are responsible for breaking their command - * line into arguments. - * - * 2N backslashes + quote -> N backslashes + begin quoted string - * 2N + 1 backslashes + quote -> literal - * N backslashes + non-quote -> literal - * quote + quote in a quoted string -> single quote - * quote + quote not in quoted string -> empty string - * quote -> begin quoted string - * - * Results: - * Fills argcPtr with the number of arguments and argvPtr with the - * array of arguments. - * - * Side effects: - * Memory allocated. - * - *-------------------------------------------------------------------------- - */ - -static void -setargv(argcPtr, argvPtr) - int *argcPtr; /* Filled with number of argument strings. */ - char ***argvPtr; /* Filled with argument strings (malloc'd). */ -{ - char *cmdLine, *p, *arg, *argSpace; - char **argv; - int argc, size, inquote, copy, slashes; - - cmdLine = GetCommandLine(); - - /* - * Precompute an overly pessimistic guess at the number of arguments - * in the command line by counting non-space spans. - */ - - size = 2; - for (p = cmdLine; *p != '\0'; p++) { - if (isspace(*p)) { - size++; - while (isspace(*p)) { - p++; - } - if (*p == '\0') { - break; - } - } - } - argSpace = (char *) ckalloc((unsigned) (size * sizeof(char *) - + strlen(cmdLine) + 1)); - argv = (char **) argSpace; - argSpace += size * sizeof(char *); - size--; - - p = cmdLine; - for (argc = 0; argc < size; argc++) { - argv[argc] = arg = argSpace; - while (isspace(*p)) { - p++; - } - if (*p == '\0') { - break; - } - - inquote = 0; - slashes = 0; - while (1) { - copy = 1; - while (*p == '\\') { - slashes++; - p++; - } - if (*p == '"') { - if ((slashes & 1) == 0) { - copy = 0; - if ((inquote) && (p[1] == '"')) { - p++; - copy = 1; - } else { - inquote = !inquote; - } - } - slashes >>= 1; - } - - while (slashes) { - *arg = '\\'; - arg++; - slashes--; - } - - if ((*p == '\0') || (!inquote && isspace(*p))) { - break; - } - if (copy != 0) { - *arg = *p; - arg++; - } - p++; - } - *arg = '\0'; - argSpace = arg + 1; - } - argv[argc] = NULL; - - *argcPtr = argc; - *argvPtr = argv; -} diff --git a/itcl/itk/configure b/itcl/itk/configure index 5813476267..ac4fe3c90d 100755 --- a/itcl/itk/configure +++ b/itcl/itk/configure @@ -42,7 +42,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -157,7 +156,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -328,11 +326,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -498,16 +491,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -580,7 +569,7 @@ PACKAGE=itk MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=.0 +PATCHLEVEL=.1 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} @@ -622,7 +611,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:626: checking for $ac_word" >&5 +echo "configure:615: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -652,7 +641,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:656: checking for $ac_word" >&5 +echo "configure:645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -703,7 +692,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:707: checking for $ac_word" >&5 +echo "configure:696: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -735,7 +724,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:739: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -746,12 +735,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 750 "configure" +#line 739 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -777,12 +766,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:781: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:786: checking whether we are using GNU C" >&5 +echo "configure:775: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -791,7 +780,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -810,7 +799,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:814: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:803: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -854,7 +843,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:858: checking for a BSD compatible install" >&5 +echo "configure:847: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -912,7 +901,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' #-------------------------------------------------------------------- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:916: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:905: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -946,7 +935,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:950: checking for $ac_word" >&5 +echo "configure:939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,12 +968,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:983: checking for Cygwin environment" >&5 +echo "configure:972: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1017,13 +1006,13 @@ test "$ac_cv_cygwin" = yes && CYGWIN=yes #-------------------------------------------------------------------- echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1021: checking for object suffix" >&5 +echo "configure:1010: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1041,19 +1030,19 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1045: checking for mingw32 environment" >&5 +echo "configure:1034: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1072,7 +1061,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1076: checking for executable suffix" >&5 +echo "configure:1065: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1082,10 +1071,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1121,7 +1110,7 @@ case "${host}" in # Extract the first word of "cygpath", so it can be a program name with args. set dummy cygpath; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1125: checking for $ac_word" >&5 +echo "configure:1114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1208,7 +1197,7 @@ if test "${with_tcl+set}" = set; then fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 -echo "configure:1212: checking for Tcl configuration" >&5 +echo "configure:1201: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1286,7 +1275,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1290: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1279: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1341,7 +1330,7 @@ if test "${with_tk+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:1345: checking for Tk configuration" >&5 +echo "configure:1334: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1417,7 +1406,7 @@ fi echo $ac_n "checking for existence of $TK_BIN_DIR/tkConfig.sh""... $ac_c" 1>&6 -echo "configure:1421: checking for existence of $TK_BIN_DIR/tkConfig.sh" >&5 +echo "configure:1410: checking for existence of $TK_BIN_DIR/tkConfig.sh" >&5 if test -f "$TK_BIN_DIR/tkConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1466,7 +1455,7 @@ if test "${with_itclconfig+set}" = set; then fi echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 -echo "configure:1470: checking for Itcl configuration" >&5 +echo "configure:1459: checking for Itcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1475,7 +1464,7 @@ else # First check to see if --with-itclconfig was specified. if test x"${with_itclconfig}" != x ; then if test -f "${with_itclconfig}/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)` + ac_cv_c_itclconfig=`(cd ${with_itclconfig}; ${PWDCMD-pwd})` else { echo "configure: error: ${with_itclconfig} directory doesn't contain itclConfig.sh" 1>&2; exit 1; } fi @@ -1491,7 +1480,7 @@ else ../../../itcl/itcl \ `ls -dr ../../../itcl/itcl[3]* 2>/dev/null` ; do if test -f "$i/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` + ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})` break fi done @@ -1500,7 +1489,7 @@ else if test x"${ac_cv_c_itclconfig}" = x ; then for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do if test -f "$i/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` + ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})` break fi done @@ -1511,7 +1500,7 @@ else ${srcdir}/../itcl/itcl \ `ls -dr ${srcdir}/../itcl/itcl[3]* 2>/dev/null` ; do if test -f "$i/itcl/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` + ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})` break fi done @@ -1521,7 +1510,7 @@ fi if test x"${ac_cv_c_itclconfig}" = x ; then ITCLCONFIG="# no itcl configs found" - { echo "configure: error: Can't find itcl configuration definitions" 1>&2; exit 1; } + echo "configure: warning: Can't find itcl configuration definitions" 1>&2 else no_itcl= ITCLCONFIG=${ac_cv_c_itclconfig}/itclConfig.sh @@ -1563,7 +1552,7 @@ tkstub_LIB_SPEC=${TK_STUB_LIB_SPEC} #SC_PUBLIC_TCL_HEADERS echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6 -echo "configure:1567: checking for Tcl private include files" >&5 +echo "configure:1556: checking for Tcl private include files" >&5 case "${host}" in *mingw32* | *windows32*) @@ -1604,7 +1593,7 @@ echo "configure:1567: checking for Tcl private include files" >&5 #SC_PUBLIC_TK_HEADERS echo $ac_n "checking for Tk private include files""... $ac_c" 1>&6 -echo "configure:1608: checking for Tk private include files" >&5 +echo "configure:1597: checking for Tk private include files" >&5 case "${host}" in *mingw32* | *windows32*) @@ -1684,7 +1673,7 @@ esac echo $ac_n "checking for building with threads""... $ac_c" 1>&6 -echo "configure:1688: checking for building with threads" >&5 +echo "configure:1677: checking for building with threads" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -1711,7 +1700,7 @@ EOF ;; *) echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1715: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:1704: checking for pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1719,7 +1708,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1776,7 +1765,7 @@ fi echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:1780: checking how to build libraries" >&5 +echo "configure:1769: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -1847,7 +1836,7 @@ SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS} esac echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1851: checking for build with symbols" >&5 +echo "configure:1840: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -2099,56 +2088,24 @@ fi libname=${PACKAGE} version=${VERSION} - if test "$TCL_LIB_SUFFIX" = "" ; then - { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } - fi - # If the . character is not allowed in lib name, remove it from version if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then version=`echo $version | tr -d .` fi - case "${host}" in - *windows32* | *mingw32*) - if test "$GCC" != yes; then - eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" - else - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" - fi - ;; - *) - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" - ;; - esac - + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" ITK_LIB_FLAG=$short_libname libname=${PACKAGE}stub version=${VERSION} - if test "$TCL_LIB_SUFFIX" = "" ; then - { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } - fi - # If the . character is not allowed in lib name, remove it from version if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then version=`echo $version | tr -d .` fi - case "${host}" in - *windows32* | *mingw32*) - if test "$GCC" != yes; then - eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" - else - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" - fi - ;; - *) - short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" - ;; - esac - + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" ITK_STUB_LIB_FLAG=$short_libname @@ -2634,15 +2591,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/itcl/itk/configure.in b/itcl/itk/configure.in index b39ace6d03..96cc15113c 100644 --- a/itcl/itk/configure.in +++ b/itcl/itk/configure.in @@ -29,7 +29,7 @@ PACKAGE=itk MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=.0 +PATCHLEVEL=.1 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} diff --git a/itcl/itk/demos/itkedit b/itcl/itk/demos/itkedit index b20aef7265..12c07e06e3 100644 --- a/itcl/itk/demos/itkedit +++ b/itcl/itk/demos/itkedit @@ -1,13 +1,13 @@ #!/bin/sh #\ -exec itkwish $0 +exec wish8.4 "$0" # ====================================================================== # Simple text editor built with [incr Widgets] # ---------------------------------------------------------------------- # AUTHOR: Michael J. McLennan # CLASS: Object-Oriented Programming with [incr Tcl] # ====================================================================== -package require Iwidgets 2.1 +package require Iwidgets 4.0 option add *edit.width 5i startupFile option add *edit.height 4i startupFile @@ -20,24 +20,24 @@ set FileWindows 0 # ---------------------------------------------------------------------- # Dialog boxes # ---------------------------------------------------------------------- -messagedialog .notice -title "itkedit: Notice" \ +iwidgets::messagedialog .notice -title "itkedit: Notice" \ -bitmap info -buttonboxpos e -modality application .notice hide OK .notice hide Help .notice buttonconfigure Cancel -text "Dismiss" -messagedialog .confirm -title "itkedit: Confirm" \ +iwidgets::messagedialog .confirm -title "itkedit: Confirm" \ -bitmap questhead -modality application .confirm hide Help .confirm buttonconfigure OK -text "Yes" .confirm buttonconfigure Cancel -text "No" -fileselectiondialog .files -title "itkedit: Files" \ +iwidgets::fileselectiondialog .files -title "itkedit: Files" \ -childsitepos s -modality application .files hide Help set PaneMenu "[.files childsite].panes" -optionmenu $PaneMenu -labeltext "Edit Window:" +iwidgets::optionmenu $PaneMenu -labeltext "Edit Window:" pack $PaneMenu -pady 6 # ---------------------------------------------------------------------- @@ -168,7 +168,7 @@ proc split_view {} { set FileName($win) untitled.txt set FileChanged($win) 0 - scrolledtext $win.text -wrap none -labeltext "file: $FileName($win)" \ + iwidgets::scrolledtext $win.text -wrap none -labeltext "file: $FileName($win)" \ -hscrollmode none -vscrollmode dynamic -visibleitems 1x1 pack $win.text -expand yes -fill both @@ -213,7 +213,7 @@ menu .mbar.view.menu # ---------------------------------------------------------------------- # Editor # ---------------------------------------------------------------------- -panedwindow .edit -orient horizontal +iwidgets::panedwindow .edit -orient horizontal pack .edit -expand yes -fill both split_view @@ -225,3 +225,5 @@ after idle { update idletasks wm minsize . [winfo reqwidth .] [winfo reqheight .] } + + diff --git a/itcl/itk/generic/itk.decls b/itcl/itk/generic/itk.decls index c0f2f814fb..0d24be045d 100644 --- a/itcl/itk/generic/itk.decls +++ b/itcl/itk/generic/itk.decls @@ -26,9 +26,9 @@ interface itk declare 0 generic { int Itk_Init (Tcl_Interp *interp) } -#declare 1 generic { -# int Itk_SafeInit (Tcl_Interp *interp) -#} +declare 1 generic { + int Itk_SafeInit (Tcl_Interp *interp) +} # diff --git a/itcl/itk/generic/itk.h b/itcl/itk/generic/itk.h index 6bfa73c92f..b306116887 100644 --- a/itcl/itk/generic/itk.h +++ b/itcl/itk/generic/itk.h @@ -55,14 +55,16 @@ * and procedure declarations, that occur below. */ -#ifndef RESOURCE_INCLUDED +#ifndef RC_INVOKED #include "itclInt.h" #include "tk.h" -#ifdef BUILD_itk # undef TCL_STORAGE_CLASS +#ifdef BUILD_itk # define TCL_STORAGE_CLASS DLLEXPORT +#else +# define TCL_STORAGE_CLASS #endif /* @@ -101,7 +103,7 @@ typedef struct ItkClassOption { #ifdef USE_ITK_STUBS -char * Itk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, +CONST char * Itk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, char *version, int exact)); #endif @@ -112,5 +114,5 @@ char * Itk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLIMPORT -#endif /* RESOURCE INCLUDED */ +#endif /* RC_INVOKED */ #endif /* ITK_H */ diff --git a/itcl/itk/generic/itkDecls.h b/itcl/itk/generic/itkDecls.h index 65c8522331..625ad39dfc 100644 --- a/itcl/itk/generic/itkDecls.h +++ b/itcl/itk/generic/itkDecls.h @@ -1,7 +1,7 @@ /* * itkDecls.h -- * - * Declarations of functions in the platform independent public Tcl API. + * Declarations of functions in the platform independent public Itk API. * * Copyright (c) 1998-1999 by XXXX * @@ -33,7 +33,8 @@ /* 0 */ EXTERN int Itk_Init _ANSI_ARGS_((Tcl_Interp * interp)); -/* Slot 1 is reserved */ +/* 1 */ +EXTERN int Itk_SafeInit _ANSI_ARGS_((Tcl_Interp * interp)); /* 2 */ EXTERN int Itk_ConfigBodyCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, @@ -91,7 +92,7 @@ typedef struct ItkStubs { struct ItkStubHooks *hooks; int (*itk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 0 */ - void *reserved1; + int (*itk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 1 */ 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 */ @@ -128,7 +129,10 @@ extern ItkStubs *itkStubsPtr; #define Itk_Init \ (itkStubsPtr->itk_Init) /* 0 */ #endif -/* Slot 1 is reserved */ +#ifndef Itk_SafeInit +#define Itk_SafeInit \ + (itkStubsPtr->itk_SafeInit) /* 1 */ +#endif #ifndef Itk_ConfigBodyCmd #define Itk_ConfigBodyCmd \ (itkStubsPtr->itk_ConfigBodyCmd) /* 2 */ diff --git a/itcl/itk/generic/itkStubInit.c b/itcl/itk/generic/itkStubInit.c index a4a0a55009..639d13a7fe 100644 --- a/itcl/itk/generic/itkStubInit.c +++ b/itcl/itk/generic/itkStubInit.c @@ -29,7 +29,7 @@ ItkStubs itkStubs = { TCL_STUB_MAGIC, NULL, Itk_Init, /* 0 */ - NULL, /* 1 */ + Itk_SafeInit, /* 1 */ Itk_ConfigBodyCmd, /* 2 */ Itk_UsualCmd, /* 3 */ Itk_ClassOptionDefineCmd, /* 4 */ diff --git a/itcl/itk/generic/itkStubLib.c b/itcl/itk/generic/itkStubLib.c index 1732ef780b..3d3e981400 100644 --- a/itcl/itk/generic/itkStubLib.c +++ b/itcl/itk/generic/itkStubLib.c @@ -53,13 +53,13 @@ ItkStubs *itkStubsPtr; *---------------------------------------------------------------------- */ -char * +CONST char * Itk_InitStubs (interp, version, exact) Tcl_Interp *interp; char *version; int exact; { - char *actualVersion; + CONST char *actualVersion; actualVersion = Tcl_PkgRequireEx(interp, "Itk", version, exact, (ClientData *) &itkStubsPtr); diff --git a/itcl/itk/generic/itk_archetype.c b/itcl/itk/generic/itk_archetype.c index 7e09c0b556..7356dba798 100644 --- a/itcl/itk/generic/itk_archetype.c +++ b/itcl/itk/generic/itk_archetype.c @@ -54,11 +54,6 @@ typedef struct ArchComponent { ItclMember *member; /* contains protection level for this comp */ Tcl_Command accessCmd; /* access command for component widget */ Tk_Window tkwin; /* Tk window for this component widget */ - char *pathName; /* Tk path name for this component widget. - We can't use the tkwin pointer after - the window has been destroyed so we - need to save a copy for use in - Itk_ArchCompDeleteCmd() */ } ArchComponent; /* @@ -795,13 +790,7 @@ Itk_ArchCompAddCmd(dummy, interp, objc, objv) uplevelFramePtr = _Tcl_GetCallFrame(interp, 1); oldFramePtr = _Tcl_ActivateCallFrame(interp, uplevelFramePtr); - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - if (Tcl_EvalObj(interp, objv[2], 0) != TCL_OK) { -#else if (Tcl_EvalObj(interp, objv[2]) != TCL_OK) { -#endif - /* END CYGNUS LOCAL */ goto compFail; } @@ -990,14 +979,8 @@ Itk_ArchCompAddCmd(dummy, interp, objc, objv) parserNs, /* isProcCallFrame */ 0); if (result == TCL_OK) { - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - result = Tcl_EvalObj(interp, objPtr, 0); -#else - result = Tcl_EvalObj(interp, objPtr); -#endif - /* END CYGNUS LOCAL */ - Tcl_PopCallFrame(interp); + result = Tcl_EvalObj(interp, objPtr); + Tcl_PopCallFrame(interp); } if (objPtr != objv[3]) { @@ -1158,7 +1141,7 @@ Itk_ArchCompDeleteCmd(dummy, interp, objc, objv) */ Tcl_DStringInit(&buffer); Tcl_DStringAppend(&buffer, "itk::remove_destroy_hook ", -1); - Tcl_DStringAppend(&buffer, archComp->pathName, -1); + Tcl_DStringAppend(&buffer, Tk_PathName(archComp->tkwin), -1); (void) Tcl_Eval(interp, Tcl_DStringValue(&buffer)); Tcl_ResetResult(interp); Tcl_DStringFree(&buffer); @@ -1585,13 +1568,7 @@ Itk_ArchOptUsualCmd(clientData, interp, objc, objv) entry = Tcl_FindHashEntry(&mergeInfo->usualCode, tag); if (entry) { codePtr = (Tcl_Obj*)Tcl_GetHashValue(entry); - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - return Tcl_EvalObj(interp, codePtr, 0); -#else return Tcl_EvalObj(interp, codePtr); -#endif - /* END CYGNUS LOCAL */ } Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), @@ -1832,6 +1809,11 @@ Itk_ArchInitCmd(dummy, interp, objc, objv) for (objc--,objv++; objc > 0; objc-=2, objv+=2) { token = Tcl_GetStringFromObj(objv[0], (int*)NULL); if (objc < 2) { + /* Bug 227814 + * Ensure that the interp result is unshared. + */ + + Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "value for \"", token, "\" missing", (char*)NULL); @@ -2894,6 +2876,11 @@ Itk_ArchConfigOption(interp, info, name, value) */ entry = Tcl_FindHashEntry(&info->options, name); if (!entry) { + /* Bug 227876 + * Ensure that the interp result is unshared. + */ + + Tcl_ResetResult (interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "unknown option \"", name, "\"", (char*)NULL); @@ -3098,7 +3085,8 @@ Itk_CreateArchComponent(interp, info, name, cdefn, accessCmd) ItclClass *cdefn; /* component created in this class */ Tcl_Command accessCmd; /* access command for component */ { - char *wname, *init; + char *init; + CONST char *wname; ArchComponent *archComp; ArchOption *archOpt; Tk_Window tkwin; @@ -3110,14 +3098,14 @@ Itk_CreateArchComponent(interp, info, name, cdefn, accessCmd) * Save this component in the itk_component() array. */ wname = Tcl_GetCommandName(interp, accessCmd); - Tcl_SetVar2(interp, "itk_component", name, wname, 0); + Tcl_SetVar2(interp, "itk_component", name, (char *)wname, 0); /* * If the symbolic name for the component is "hull", then this * is the toplevel or frame that embodies a mega-widget. Update * the Archtype info to include the window token. */ - tkwin = Tk_NameToWindow(interp, wname, Tk_MainWindow(interp)); + tkwin = Tk_NameToWindow(interp, (char *)wname, Tk_MainWindow(interp)); if (strcmp(name, "hull") == 0) { if (tkwin == NULL) { @@ -3176,8 +3164,6 @@ Itk_CreateArchComponent(interp, info, name, cdefn, accessCmd) archComp->member = memPtr; archComp->accessCmd = accessCmd; archComp->tkwin = tkwin; - archComp->pathName = (char *) ckalloc((unsigned)(strlen(wname)+1)); - strcpy(archComp->pathName, wname); return archComp; } @@ -3196,7 +3182,6 @@ Itk_DelArchComponent(archComp) ArchComponent *archComp; /* pointer to component data */ { ckfree((char*)archComp->member); - ckfree((char*)archComp->pathName); ckfree((char*)archComp); } @@ -4087,13 +4072,7 @@ Itk_CreateGenericOpt(interp, switchName, accessCmd) Tcl_AppendToObj(codePtr, " configure ", -1); Tcl_AppendToObj(codePtr, name, -1); - /* CYGNUS LOCAL - Fix for Tcl8.1 */ -#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 - if (Tcl_EvalObj(interp, codePtr, 0) != TCL_OK) { -#else - if (Tcl_EvalObj(interp, codePtr) != TCL_OK) { -#endif - /* END CYGNUS LOCAL */ + if (Tcl_EvalObj(interp, codePtr) != TCL_OK) { goto optionDone; } diff --git a/itcl/itk/generic/itk_cmds.c b/itcl/itk/generic/itk_cmds.c index 1e2fde7fcd..878c3ee7fa 100644 --- a/itcl/itk/generic/itk_cmds.c +++ b/itcl/itk/generic/itk_cmds.c @@ -25,11 +25,23 @@ */ #include "itk.h" +/* + * The following script is used to initialize Itcl in a safe interpreter. + */ + +static char safeInitScript[] = +"proc ::itcl::local {class name args} {\n\ + set ptr [uplevel [list $class $name] $args]\n\ + uplevel [list set itcl-local-$ptr $ptr]\n\ + set cmd [uplevel namespace which -command $ptr]\n\ + uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n\ + return $ptr\n\ +}"; + /* * FORWARD DECLARATIONS */ static int Initialize _ANSI_ARGS_((Tcl_Interp *interp)); - /* * The following string is the startup script executed in new * interpreters. It looks on disk in several different directories @@ -79,9 +91,6 @@ namespace eval ::itk {\n\ }\n\ _find_init\n\ }"; - -extern ItkStubs itkStubs; - /* * ------------------------------------------------------------------------ @@ -102,6 +111,7 @@ Initialize(interp) { Tcl_Namespace *itkNs, *parserNs; ClientData parserInfo; + extern ItkStubs itkStubs; if (Tcl_InitStubs(interp, "8.1", 0) == NULL) { return TCL_ERROR; @@ -109,7 +119,7 @@ Initialize(interp) if (Tk_InitStubs(interp, "8.1", 0) == NULL) { return TCL_ERROR; }; - if (Itcl_InitStubs(interp, ITCL_VERSION, 0) == NULL) { + if (Itcl_InitStubs(interp, ITCL_VERSION, 1) == NULL) { return TCL_ERROR; } @@ -193,7 +203,10 @@ Initialize(interp) Tcl_SetVar(interp, "::itk::patchLevel", ITCL_PATCH_LEVEL, 0); /* - * Signal that the package has been loaded. + * Signal that the package has been loaded and provide the Itk Stubs table + * for dependent modules. I know this is unlikely, but possible that + * someone could be extending Itk. Who is to say that Itk is the + * end-of-the-line? */ if (Tcl_PkgProvideEx(interp, "Itk", ITCL_VERSION, (ClientData) &itkStubs) != TCL_OK) { @@ -230,6 +243,31 @@ Itk_Init(interp) /* * ------------------------------------------------------------------------ + * Itk_SafeInit() + * + * Invoked whenever a new SAFE INTERPRETER is created to install + * the [incr Tcl] package. + * + * Creates the "::itk" namespace and installs access commands for + * creating classes and querying info. + * + * Returns TCL_OK on success, or TCL_ERROR (along with an error + * message in the interpreter) if anything goes wrong. + * ------------------------------------------------------------------------ + */ +int +Itk_SafeInit(interp) + Tcl_Interp *interp; /* interpreter to be updated */ +{ + if (Initialize(interp) != TCL_OK) { + return TCL_ERROR; + } + return Tcl_Eval(interp, safeInitScript); +} + + +/* + * ------------------------------------------------------------------------ * Itk_ConfigBodyCmd() * * Replacement for the usual "itcl::configbody" command. Recognizes diff --git a/itcl/itk/itkConfig.sh.in b/itcl/itk/itkConfig.sh.in index c0b21a9fe0..e9b1f026fc 100644 --- a/itcl/itk/itkConfig.sh.in +++ b/itcl/itk/itkConfig.sh.in @@ -27,23 +27,17 @@ ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@' # installed directory. ITK_LIB_SPEC='@ITK_LIB_SPEC@' -# Path to the library name. Used for dependencies. -ITK_LIB_FULL_PATH='@ITK_LIB_FULL_PATH@' - -# The name of the Itk stub library +# 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 Itcl stub library from its +# 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 Itcl stub library from its +# String to pass to linker to pick up the Itk stub library from its # installed directory. ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@' -# Full path to itcl library for dependency checking. -ITK_STUB_LIB_FULL_PATH='@ITK_STUB_LIB_FULL_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 diff --git a/itcl/itk/library/Toplevel.itk b/itcl/itk/library/Toplevel.itk index a1796221a9..cb01a6db79 100644 --- a/itcl/itk/library/Toplevel.itk +++ b/itcl/itk/library/Toplevel.itk @@ -63,12 +63,6 @@ itcl::class itk::Toplevel { } destroy $itk_hull } - itk_component delete hull - - # Any remaining components must be outside the hull - foreach component [component] { - destroy [component $component] - } } itk_option define -title title Title "" { diff --git a/itcl/itk/library/Widget.itk b/itcl/itk/library/Widget.itk index 1474e61d01..8c455e3211 100644 --- a/itcl/itk/library/Widget.itk +++ b/itcl/itk/library/Widget.itk @@ -64,12 +64,6 @@ itcl::class itk::Widget { } destroy $itk_hull } - itk_component delete hull - - # Any remaining components must be outside the hull - foreach component [component] { - destroy [component $component] - } } private variable itk_hull "" diff --git a/itcl/itk/library/itk.tcl b/itcl/itk/library/itk.tcl index 4e4ec004d4..dea0f669bb 100644 --- a/itcl/itk/library/itk.tcl +++ b/itcl/itk/library/itk.tcl @@ -37,7 +37,6 @@ if {$tcl_platform(os) == "MacOS"} { # Tcl than C. # ---------------------------------------------------------------------- proc ::itk::remove_destroy_hook {widget} { - if {![winfo exists $widget]} {return} set tags [bindtags $widget] set i [lsearch $tags "itk-destroy-$widget"] if {$i >= 0} { diff --git a/itcl/itk/tests/toplevel.test b/itcl/itk/tests/toplevel.test index ed254dd69b..d58a86dc45 100644 --- a/itcl/itk/tests/toplevel.test +++ b/itcl/itk/tests/toplevel.test @@ -79,45 +79,6 @@ test toplevel-1.6 {when a mega-widget is destroyed, its object is deleted} { itcl::find objects .testToplevel* } {} -test toplevel-1.7 {when an mega-widget object is deleted, its window and any - components are destroyed } { - TestToplevel .delme - set label [.delme component test1] - itcl::delete object .delme - list [winfo exists .delme] [winfo exists $label] -} {0 0} - -test toplevel-1.8 {when a mega-widget object is deleted, its window and any - components are destroyed (even if in another window) } { - itcl::class ButtonTop { - inherit itk::Toplevel - - constructor {args} { - eval itk_initialize $args - - itk_component add button { - button $itk_option(-container).b -text Button - } {} - pack $itk_component(button) - } - - itk_option define -container container Container {} - } - - toplevel .t1 - ButtonTop .t2 -container .t1 - - set button [.t2 component button] - - itcl::delete object .t2 - - set result [list $button [winfo exists $button]] - - itcl::delete class ButtonTop - - set result -} {.t1.b 0} - # ---------------------------------------------------------------------- # Clean up # ---------------------------------------------------------------------- diff --git a/itcl/itk/tests/widget.test b/itcl/itk/tests/widget.test index da91291f4a..bfc6233093 100644 --- a/itcl/itk/tests/widget.test +++ b/itcl/itk/tests/widget.test @@ -265,42 +265,6 @@ test widget-1.26 {when an internal component is deleted (but not destroyed) it i [.testWidget configure] } {{itk-destroy-.testWidget.t2 .testWidget.t2 Button . all} {namespace inscope ::itk::Archetype {::.testWidget itk_component delete test2}} 0 {.testWidget.t2 Button . all} {} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-status status Status {} {}}}} -test widget-1.27 {when a mega-widget object is deleted, its window and any - components are destroyed (even if in another window) } { - itcl::class ButtonWidget { - inherit itk::Widget - - constructor {args} { - eval itk_initialize $args - - itk_component add button { - button $itk_option(-container).b -text Button - } {} - pack $itk_component(button) - } - - itk_option define -container container Container {} - } - - toplevel .t1 - frame .t1.f - ButtonWidget .t1.bw -container .t1.f - - pack .t1.f - pack .t1.bw - - set button [.t1.bw component button] - - itcl::delete object .t1.bw - - set result [list $button [winfo exists $button]] - - itcl::delete class ButtonWidget - - set result -} {.t1.f.b 0} - - # ---------------------------------------------------------------------- # Clean up # ---------------------------------------------------------------------- diff --git a/itcl/itk/unix/Makefile.in b/itcl/itk/unix/Makefile.in deleted file mode 100644 index d7f227178b..0000000000 --- a/itcl/itk/unix/Makefile.in +++ /dev/null @@ -1,336 +0,0 @@ -# -# This file is a Makefile for [incr Tk]. 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. -# -# RCS: $Id$ - -# Current [incr Tcl] version; used in various names. - -MAJOR_VERSION = @ITCL_MAJOR_VERSION@ -MINOR_VERSION = @ITCL_MINOR_VERSION@ -RELEASE_LEVEL = @ITCL_RELEASE_LEVEL@ -VERSION = @ITCL_VERSION@ - -#---------------------------------------------------------------- -# Things you can change to personalize the Makefile for your own -# site (you can make these changes in either Makefile.in or -# Makefile, but changes to Makefile will get lost if you re-run -# the configuration script). -#---------------------------------------------------------------- - -# Default top-level directories in which to install architecture- -# specific files (exec_prefix) and machine-independent files such -# as scripts (prefix). The values specified here may be overridden -# at configure-time with the --exec-prefix and --prefix options -# to the "configure" script. - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -# The following definition can be set to non-null for special systems -# like AFS with replication. It allows the pathnames used for installation -# to be different than those used for actually reference files at -# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix -# when installing files. -INSTALL_ROOT = - -# Directory from which applications will reference the library of Tcl -# scripts (note: you can set the ITK_LIBRARY environment variable at -# run-time to override the compiled-in location): -# CYGNUS LOCAL: we use "share" rather than "lib" as the prefix for our -# Tcl files -ITK_LIBRARY = $(prefix)/share/itk$(VERSION) -# END CYGNUS LOCAL - -# Path name to use when installing library scripts: -SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(ITK_LIBRARY) - -# Directory in which to install the archive libitk.a: -LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib - -# Path to use at runtime to refer to LIB_INSTALL_DIR: -LIB_RUNTIME_DIR = $(exec_prefix)/lib - -# Directory in which to install the program wish: -BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin - -# Directory in which to install the include file itk.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include - -# Top-level directory for manual entries: -MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man - -# Directory in which to install manual entry for wish: -MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1 - -# Directory in which to install manual entries for Tk's C library -# procedures: -MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3 - -# Directory in which to install manual entries for the built-in -# Tcl commands implemented by Tk: -MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann - -# The directory containing the Tcl sources and headers appropriate -# for this version of [incr Tk]: -TCL_SRC_DIR = @TCL_SRC_DIR@ - -# The directory containing the Tcl library archive file appropriate -# for this version of [incr Tk]: -TCL_LIB_DIR = @TCL_LIB_DIR@ - -# Library flags for Tcl library -TCL_LIB_FLAG = @TCL_LIB_FLAG@ - -# Tcl libraries built with optimization switches have this additional extension -DBGX = @TCL_DBGX@ - -# The directory containing the Tk sources and headers appropriate -# for this version of [incr Tk]: -TK_SRC_DIR = @TK_SRC_DIR@ - -# The directory containing the Tk library archive file appropriate -# for this version of [incr Tk]: -TK_LIB_DIR = @TK_LIB_DIR@ - -# Library flags for Tk library -TK_LIB_FLAG = @TK_LIB_FLAG@ - -# The directory containing the [incr Tcl] sources and headers appropriate -# for this version of [incr Tk]: -ITCL_SRC_DIR = @ITCL_SRC_DIR@ - -# The directory containing the [incr Tcl] library archive file appropriate -# for this version of [incr Tk]: -ITCL_LIB_DIR = @ITCL_LIB_DIR@ - -# A "-I" switch that can be used when compiling to make all of the -# X11 include files accessible (the configure script will try to -# set this value, and will cause it to be an empty string if the -# include files are accessible via /usr/include). -X11_INCLUDES = @TK_XINCLUDES@ - -# Linker switch(es) to use to link with the X11 library archive (the -# configure script will try to set this value automatically, but you -# can override it). -X11_LIB_SWITCHES = @TK_XLIBSW@ - -# Libraries to use when linking: must include at least Tk, Tcl, Xlib, -# 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. -# CYGNUS LOCAL: Replace TCL_LIB_SPEC with TCL_BUILD_LIB_SPEC since we -# seldom build from an installed tree. - -LIBS = @TK_BUILD_LIB_SPEC@ $(X11_LIB_SWITCHES) \ - @ITCL_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \ - @TCL_LIBS@ @DL_LIBS@ -lc -# END CYGNUS LOCAL - -# To change the compiler switches, for example to change from -O -# to -g, change the following line: -CFLAGS = @CFLAGS@ - -# To disable ANSI-C procedure prototypes reverse the comment characters -# on the following lines: -PROTO_FLAGS = -#PROTO_FLAGS = -DNO_PROTOTYPE - -# To enable memory debugging reverse the comment characters on the following -# lines. Warning: if you enable memory debugging, you must do it -# *everywhere*, including all the code that calls Tcl, and you must use -# ckalloc and ckfree everywhere instead of malloc and free. -MEM_DEBUG_FLAGS = -#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG - -# If your X server is X11R4 or earlier, then you may wish to reverse -# the comment characters on the following two lines. This will enable -# extra code to speed up XStringToKeysym. In X11R5 and later releases -# XStringToKeysym is plenty fast, so you needn't define REDO_KEYSYM_LOOKUP. -KEYSYM_FLAGS = -#KEYSYM_FLAGS = -DREDO_KEYSYM_LOOKUP - -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh - -# Tk used to let the configure script choose which program to use -# for installing, but there are just too many different versions of -# "install" around; better to use the install-sh script that comes -# with the distribution, which is slower but guaranteed to work. - -INSTALL = $(TOP_DIR)/../config/install-sh -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} -m 644 -MKINSTALLDIRS = $(TOP_DIR)/../config/mkinstalldirs - -# The symbols below provide support for dynamic loading and shared -# libraries. The values of the symbols are normally set by the -# configure script. You shouldn't normally need to modify any of -# these definitions by hand. - -SHLIB_CFLAGS = @SHLIB_CFLAGS@ -TCL_CFLAGS = @TCL_CFLAGS@ - -LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ - -ITK_LIB_FILE = @ITK_LIB_FILE@ -#ITK_LIB_FILE = libitk.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. - -SHLIB_LD = @SHLIB_LD@ - -#---------------------------------------------------------------- -# The information below is modified by the configure script when -# Makefile is generated from Makefile.in. You shouldn't normally -# modify any of this stuff by hand. -#---------------------------------------------------------------- - -AC_FLAGS = @TCL_DEFS@ -RANLIB = @RANLIB@ -TOP_DIR = @ITK_SRC_DIR@ -GENERIC_DIR = $(TOP_DIR)/generic -UNIX_DIR = $(TOP_DIR)/unix - -#---------------------------------------------------------------- -# The information below should be usable as is. The configure -# script won't modify it and you shouldn't need to modify it -# either. -#---------------------------------------------------------------- - - -CC = @CC@ -CC_SWITCHES = $(CFLAGS) $(TCL_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 - -SRCS = $(GENERIC_DIR)/itk_cmds.c $(GENERIC_DIR)/itk_option.c \ - $(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c - -all: itkwish - -# The following target is configured by autoconf to generate either -# a shared library or non-shared library for [incr Tk]. - -@ITK_LIB_FILE@: ${OBJS} - rm -f $(ITK_LIB_FILE) - @MAKE_LIB@ - $(RANLIB) $(ITK_LIB_FILE) - -itkwish: tkAppInit.o $(ITK_LIB_FILE) @TCL_LIB_FULL_PATH@ @TK_LIB_FULL_PATH@ \ - @ITCL_LIB_FULL_PATH@ - $(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itkwish - -# 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 -# isn't the same as the source directory. - -test: itkwish - TCLLIBPATH="`pwd` $(TK_LIB_DIR) $(ITCL_LIB_DIR) $(TCL_LIB_DIR)"; export TCLLIBPATH; \ - LD_LIBRARY_PATH=`pwd`:$(ITCL_LIB_DIR):$(TK_LIB_DIR):$(TCL_LIB_DIR):$(LD_LIBRARY_PATH); export LD_LIBRARY_PATH; \ - TCL_LIBRARY=$(TCL_SRC_DIR)/library; export TCL_LIBRARY; \ - TK_LIBRARY=$(TK_SRC_DIR)/library; export TK_LIBRARY; \ - ITCL_LIBRARY=$(ITCL_SRC_DIR)/library; export ITCL_LIBRARY; \ - ITK_LIBRARY=$(TOP_DIR)/library; export ITK_LIBRARY; \ - ( echo cd $(TOP_DIR)/tests\; source all\; exit ) \ - | ./itkwish -geometry +0+0 - -install: install-binaries install-libraries install-man - -install-binaries: $(ITK_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 itkwish" - $(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION) - @echo "Installing itkConfig.sh" - @$(INSTALL_DATA) ../itkConfig.sh $(LIB_INSTALL_DIR)/itkConfig.sh - -install-libraries: - @$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) - @echo "Installing itk.h" - @$(INSTALL_DATA) $(GENERIC_DIR)/itk.h $(INCLUDE_INSTALL_DIR) - @for i in $(TOP_DIR)/library/*.* $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ - do \ - echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \ - done; - @echo "Installing pkgIndex.tcl" - @$(INSTALL_DATA) pkgIndex.tcl $(SCRIPT_INSTALL_DIR) - -install-man: - @$(MKINSTALLDIRS) $(MAN1_INSTALL_DIR) $(MANN_INSTALL_DIR) - @cd $(TOP_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ - echo "Installing doc/$$i"; \ - rm -f $(MANN_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MANN_INSTALL_DIR)/$$i; \ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - -Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status - -clean: - rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors \ - rm -f itkwish* libitk* *pure* *% ../tests/core - -distclean: clean - rm -f Makefile config.status config.log config.cache pkgIndex.tcl - -pure: tkAppInit.o $(ITK_LIB_FILE) @TCL_LIB_FULL_PATH@ @TK_LIB_FULL_PATH@ - purify $(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itkwish.pure - -profile: tkAppInit.o $(ITK_LIB_FILE) @TCL_LIB_FULL_PATH@ @TK_LIB_FULL_PATH@ - quantify $(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \ - $(LIBS) $(LD_SEARCH_FLAGS) -o itkwish.pure - -depend: - makedepend -- $(CC_SWITCHES) -- $(SRCS) - -configure: configure.in - autoconf - -.c.o: - $(CC) -c $(CC_SWITCHES) $< - -tkAppInit.o: $(UNIX_DIR)/tkAppInit.c Makefile - $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c - -itk_cmds.o: $(GENERIC_DIR)/itk_cmds.c Makefile - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_cmds.c - -itk_option.o: $(GENERIC_DIR)/itk_option.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_option.c - -itk_archetype.o: $(GENERIC_DIR)/itk_archetype.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_archetype.c - -itk_util.o: $(GENERIC_DIR)/itk_util.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_util.c - -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/itcl/itk/unix/configure b/itcl/itk/unix/configure deleted file mode 100755 index e3d43ca1d2..0000000000 --- a/itcl/itk/unix/configure +++ /dev/null @@ -1,1608 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_default_prefix=/usr/local -ac_help="$ac_help - --with-tcl=DIR use Tcl 8.0 binaries from DIR" -ac_help="$ac_help - --with-tk=DIR use Tk 8.0 binaries from DIR" -ac_help="$ac_help - --with-itcl=DIR use Itcl 3.0 binaries from DIR" -ac_help="$ac_help - --with-cflags=FLAGS set compiler flags to FLAGS" -ac_help="$ac_help - --enable-shared build libitk as a shared library" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=../generic/itk.h - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - -# RCS: $Id$ - -ITCL_VERSION=3.0 -ITCL_MAJOR_VERSION=3 -ITCL_MINOR_VERSION=0 -ITCL_RELEASE_LEVEL=0 -VERSION=${ITCL_VERSION} - -ac_aux_dir= -for ac_dir in ../../config $srcdir/../../config; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in ../../config $srcdir/../../config" 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - - -# ----------------------------------------------------------------------- -# Set up a new default --prefix. If a previous installation of -# [incr Tcl] can be found searching $PATH use that directory. -# ----------------------------------------------------------------------- - - -if test "x$prefix" = xNONE; then -echo $ac_n "checking for prefix by $ac_c" 1>&6 -# Extract the first word of "tclsh", so it can be a program name with args. -set dummy tclsh; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:576: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$TCLSH" in - /*) - ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_TCLSH="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -TCLSH="$ac_cv_path_TCLSH" -if test -n "$TCLSH"; then - echo "$ac_t""$TCLSH" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -n "$ac_cv_path_TCLSH"; then - prefix=`echo $ac_cv_path_TCLSH|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` - fi -fi - - -if test "${prefix}" = "NONE"; then - prefix=/usr/local -fi -if test "${exec_prefix}" = "NONE"; then - exec_prefix=$prefix -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:633: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:688: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -# ----------------------------------------------------------------------- -BUILD_DIR=`pwd` -ITK_SRC_DIR=`cd $srcdir/..; pwd` -cd ${BUILD_DIR} - - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:724: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:754: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:805: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 848 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:879: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:884: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:912: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - -# END CYGNUS LOCAL - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tcl is; if -# not, search for Tcl. -# not, assume that its top-level directory is a sibling of ours. -# CYGNUS LOCAL - Actually Tcl & Tk are just called "tcl" & "tk" without the 8.0 -#-------------------------------------------------------------------- - -# Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - itcl_search=$withval -else - itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix` -fi - - -TCL_LIB_DIR="" -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tclConfig.sh; then - TCL_LIB_DIR=$dir - break - fi -done - -if test -z "$TCL_LIB_DIR"; then - { echo "configure: error: Can't find Tcl libraries. Use --with-tcl to specify the directory containing tclConfig.sh on your system." 1>&2; exit 1; } -fi - -#-------------------------------------------------------------------- -# Read in configuration information generated by Tcl for shared -# libraries, and arrange for it to be substituted into our -# Makefile. -#-------------------------------------------------------------------- - -file=$TCL_LIB_DIR/tclConfig.sh -. $file -CFLAGS=$TCL_CFLAGS -SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS -SHLIB_LD=$TCL_SHLIB_LD -SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX -DL_LIBS=$TCL_DL_LIBS -LD_FLAGS=$TCL_LD_FLAGS -LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS - -#-------------------------------------------------------------------- -# Make sure that we can find the Tcl sources, so we can include -# the "tclInt.h" file. -#-------------------------------------------------------------------- - -if test ! -d "$TCL_SRC_DIR"; then - { echo "configure: error: Can't find Tcl source directory "$TCL_SRC_DIR". Itcl can't be built without this directory." 1>&2; exit 1; } -fi - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tk is; if -# not, search for Tk. -# CYGNUS LOCAL - Actually Tcl & Tk are just called "tcl" & "tk" without the 8.0 -#-------------------------------------------------------------------- - -# Check whether --with-tk or --without-tk was given. -if test "${with_tk+set}" = set; then - withval="$with_tk" - itcl_search=$withval -else - itcl_search=`cd ../../..; ls -d \`pwd\`/tk*/unix` -fi - - -TK_LIB_DIR="" -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tkConfig.sh; then - TK_LIB_DIR=$dir - break - fi -done - -if test -z "$TK_LIB_DIR"; then - { echo "configure: error: Can't find Tk libraries. Use --with-tk to specify the directory containing tkConfig.sh on your system." 1>&2; exit 1; } -fi - -file=$TK_LIB_DIR/tkConfig.sh -. $file - -#-------------------------------------------------------------------- -# See if there was a command-line option for where [incr Tcl] is. -# If not, assume that its top-level directory is a sibling of ours. -#-------------------------------------------------------------------- - -# Check whether --with-itcl or --without-itcl was given. -if test "${with_itcl+set}" = set; then - withval="$with_itcl" - ITCL_LIB_DIR=$withval -else - ITCL_LIB_DIR=`cd ../../itcl; pwd` -fi - - -if test ! -r "$ITCL_LIB_DIR/itclConfig.sh"; then - { echo "configure: error: Can't find Itcl libraries. Have you built Itcl yet? Use --with-itcl to specify the directory containing itclConfig.sh on your system." 1>&2; exit 1; } -fi - -file=$ITCL_LIB_DIR/itclConfig.sh -. $file - -#-------------------------------------------------------------------- -# If this is gcc, add some extra compile flags. -#-------------------------------------------------------------------- - -echo $ac_n "checking whether C compiler is gcc""... $ac_c" 1>&6 -echo "configure:1055: checking whether C compiler is gcc" >&5 -if eval "test \"`echo '$''{'itcl_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1061: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -cat > conftest.$ac_ext <&5 | - egrep "_cc_is_gcc_" >/dev/null 2>&1; then - rm -rf conftest* - itcl_cv_prog_gcc=yes -else - rm -rf conftest* - itcl_cv_prog_gcc=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$itcl_cv_prog_gcc" 1>&6 - -# CYGNUS LOCAL - set CFLAGS to -g -O2 for gcc. -if test -z "$CFLAGS" ; then -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="-g -O2" -else - CFLAGS="-O" -fi -fi - -if test "$itcl_cv_prog_gcc" = "yes" ; then - # leave -Wimplicit-int out, the X libs generate so many of these warnings - # that they obscure everything else. - # CYGNUS LOCAL - add -fwritable-strings to CFLAGS for gcc. Needed - # with Tcl8.1 - CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall -Wno-implicit-int" -fi - -echo $ac_n "checking default compiler flags""... $ac_c" 1>&6 -echo "configure:1181: checking default compiler flags" >&5 -# Check whether --with-cflags or --without-cflags was given. -if test "${with_cflags+set}" = set; then - withval="$with_cflags" - CFLAGS="$with_cflags" -fi - - -echo "$ac_t""$CFLAGS" 1>&6 - -if test "$TCL_CC" != "$CC" ; then - echo "" - echo "WARNING: Compiler is $CC but Tcl was compiled with $TCL_CC" - echo "" -fi - -#-------------------------------------------------------------------- -# The statements below define a collection of symbols related to -# building libitk as a shared library instead of a static library. -#-------------------------------------------------------------------- - -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - ok=$enableval -else - ok=no -fi - -if test "$ok" = "yes"; then - if test ${TCL_SHARED_BUILD} = 0; then - { echo "configure: error: Tcl was not built with --enable-shared" 1>&2; exit 1; } - fi - SHLIB_CFLAGS="${SHLIB_CFLAGS}" - eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}" - ITK_PKG_FILE="[file join [file dirname \$dir] ${ITK_LIB_FILE}]" - # CYGNUS LOCAL - don't pass LD_SEARCH_FLAGS to libraries - MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) " - # END CYGNUS LOCAL - RANLIB=":" -else - SHLIB_CFLAGS="" - # CYGNUS LOCAL - Strip dots from library name for SunOS4, etc... - if test ${TCL_LIB_VERSIONS_OK} = "nodots"; then - ITK_LIB_FILE="libitk`echo ${VERSION} | tr -d .`.a" - else - eval "ITK_LIB_FILE=libitk${VERSION}.a" - fi - ITK_PKG_FILE="" - MAKE_LIB="ar cr ${ITK_LIB_FILE} \${OBJS}" -fi - -# 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 -# up the Tcl library. - -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - ITK_BUILD_LIB_SPEC="-L`pwd` -litk${VERSION}" - ITK_LIB_SPEC="-L${exec_prefix}/lib -litk${VERSION}" -else - ITK_BUILD_LIB_SPEC="-L`pwd` -litk`echo ${VERSION} | tr -d .`" - ITK_LIB_SPEC="-L${exec_prefix}/lib -litk`echo ${VERSION} | tr -d .`" -fi - -ITK_LIB_FULL_PATH="`pwd`/${ITK_LIB_FILE}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile pkgIndex.tcl ../itkConfig.sh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@TCLSH@%$TCLSH%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@RANLIB@%$RANLIB%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@DL_LIBS@%$DL_LIBS%g -s%@LD_FLAGS@%$LD_FLAGS%g -s%@MAKE_LIB@%$MAKE_LIB%g -s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g -s%@SHLIB_LD@%$SHLIB_LD%g -s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g -s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g -s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g -s%@TCL_VERSION@%$TCL_VERSION%g -s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g -s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g -s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g -s%@TCL_DBGX@%$TCL_DBGX%g -s%@TCL_DEFS@%$TCL_DEFS%g -s%@TCL_LIBS@%$TCL_LIBS%g -s%@TCL_SHLIB_LD_LIBS@%$TCL_SHLIB_LD_LIBS%g -s%@TCL_SHLIB_SUFFIX@%$TCL_SHLIB_SUFFIX%g -s%@TCL_COMPAT_OBJS@%$TCL_COMPAT_OBJS%g -s%@TCL_CFLAGS@%$TCL_CFLAGS%g -s%@TCL_LIB_FULL_PATH@%$TCL_LIB_FULL_PATH%g -s%@TK_VERSION@%$TK_VERSION%g -s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g -s%@TK_LIB_DIR@%$TK_LIB_DIR%g -s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g -s%@TK_LIB_FLAG@%$TK_LIB_FLAG%g -s%@TK_XINCLUDES@%$TK_XINCLUDES%g -s%@TK_XLIBSW@%$TK_XLIBSW%g -s%@TK_SRC_DIR@%$TK_SRC_DIR%g -s%@TK_LIB_FULL_PATH@%$TK_LIB_FULL_PATH%g -s%@ITCL_VERSION@%$ITCL_VERSION%g -s%@ITCL_MAJOR_VERSION@%$ITCL_MAJOR_VERSION%g -s%@ITCL_MINOR_VERSION@%$ITCL_MINOR_VERSION%g -s%@ITCL_RELEASE_LEVEL@%$ITCL_RELEASE_LEVEL%g -s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g -s%@ITCL_LIB_FULL_PATH@%$ITCL_LIB_FULL_PATH%g -s%@ITCL_LIB_DIR@%$ITCL_LIB_DIR%g -s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g -s%@ITCL_PKG_FILE@%$ITCL_PKG_FILE%g -s%@ITCL_SRC_DIR@%$ITCL_SRC_DIR%g -s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g -s%@ITK_LIB_FILE@%$ITK_LIB_FILE%g -s%@ITK_LIB_SPEC@%$ITK_LIB_SPEC%g -s%@ITK_PKG_FILE@%$ITK_PKG_FILE%g -s%@ITK_SRC_DIR@%$ITK_SRC_DIR%g -s%@ITK_LIB_FULL_PATH@%$ITK_LIB_FULL_PATH%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/itcl/itk/unix/configure.in b/itcl/itk/unix/configure.in deleted file mode 100644 index 7624fe4b3a..0000000000 --- a/itcl/itk/unix/configure.in +++ /dev/null @@ -1,278 +0,0 @@ -dnl This file is an input file used by the GNU "autoconf" program to -dnl generate the file "configure", which is run during Tk installation -dnl to configure the system for the local environment. - -AC_INIT(../generic/itk.h) -# RCS: $Id$ - -ITCL_VERSION=3.0 -ITCL_MAJOR_VERSION=3 -ITCL_MINOR_VERSION=0 -ITCL_RELEASE_LEVEL=0 -VERSION=${ITCL_VERSION} - -AC_CONFIG_AUX_DIR(../../config) -AC_PREREQ(2.0) - -# ----------------------------------------------------------------------- -# Set up a new default --prefix. If a previous installation of -# [incr Tcl] can be found searching $PATH use that directory. -# ----------------------------------------------------------------------- - -AC_PREFIX_DEFAULT(/usr/local) -AC_PREFIX_PROGRAM(tclsh) - -if test "${prefix}" = "NONE"; then - prefix=/usr/local -fi -if test "${exec_prefix}" = "NONE"; then - exec_prefix=$prefix -fi - -AC_PROG_INSTALL -AC_PROG_RANLIB - -# ----------------------------------------------------------------------- -BUILD_DIR=`pwd` -ITK_SRC_DIR=`cd $srcdir/..; pwd` -cd ${BUILD_DIR} - -dnl CYGNUS LOCAL: allow gcc without a special flag -dnl AC_ARG_ENABLE(gcc, [ --enable-gcc allow use of gcc if available], -dnl [itk_ok=$enableval], [itk_ok=no]) -dnl if test "$itk_ok" = "yes"; then - AC_PROG_CC -dnl else -dnl CC=${CC-cc} -dnl AC_SUBST(CC) -dnl fi -# END CYGNUS LOCAL - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tcl is; if -# not, search for Tcl. -# not, assume that its top-level directory is a sibling of ours. -# CYGNUS LOCAL - Actually Tcl & Tk are just called "tcl" & "tk" without the 8.0 -#-------------------------------------------------------------------- - -AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.0 binaries from DIR], - itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix`) - -TCL_LIB_DIR="" -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tclConfig.sh; then - TCL_LIB_DIR=$dir - break - fi -done - -if test -z "$TCL_LIB_DIR"; then - AC_MSG_ERROR(Can't find Tcl libraries. Use --with-tcl to specify the directory containing tclConfig.sh on your system.) -fi - -#-------------------------------------------------------------------- -# Read in configuration information generated by Tcl for shared -# libraries, and arrange for it to be substituted into our -# Makefile. -#-------------------------------------------------------------------- - -file=$TCL_LIB_DIR/tclConfig.sh -. $file -CFLAGS=$TCL_CFLAGS -SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS -SHLIB_LD=$TCL_SHLIB_LD -SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX -DL_LIBS=$TCL_DL_LIBS -LD_FLAGS=$TCL_LD_FLAGS -LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS - -#-------------------------------------------------------------------- -# Make sure that we can find the Tcl sources, so we can include -# the "tclInt.h" file. -#-------------------------------------------------------------------- - -if test ! -d "$TCL_SRC_DIR"; then - AC_MSG_ERROR(Can't find Tcl source directory "$TCL_SRC_DIR". Itcl can't be built without this directory.) -fi - -#-------------------------------------------------------------------- -# See if there was a command-line option for where Tk is; if -# not, search for Tk. -# CYGNUS LOCAL - Actually Tcl & Tk are just called "tcl" & "tk" without the 8.0 -#-------------------------------------------------------------------- - -AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.0 binaries from DIR], - itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk*/unix`) - -TK_LIB_DIR="" -for dir in $itcl_search $exec_prefix/lib ; do - if test -r $dir/tkConfig.sh; then - TK_LIB_DIR=$dir - break - fi -done - -if test -z "$TK_LIB_DIR"; then - AC_MSG_ERROR(Can't find Tk libraries. Use --with-tk to specify the directory containing tkConfig.sh on your system.) -fi - -file=$TK_LIB_DIR/tkConfig.sh -. $file - -#-------------------------------------------------------------------- -# See if there was a command-line option for where [incr Tcl] is. -# 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], - ITCL_LIB_DIR=$withval, ITCL_LIB_DIR=`cd ../../itcl; pwd`) - -if test ! -r "$ITCL_LIB_DIR/itclConfig.sh"; then - AC_MSG_ERROR(Can't find Itcl libraries. Have you built Itcl yet? Use --with-itcl to specify the directory containing itclConfig.sh on your system.) -fi - -file=$ITCL_LIB_DIR/itclConfig.sh -. $file - -#-------------------------------------------------------------------- -# If this is gcc, add some extra compile flags. -#-------------------------------------------------------------------- - -AC_MSG_CHECKING([whether C compiler is gcc]) -AC_CACHE_VAL(itcl_cv_prog_gcc, [ - AC_EGREP_CPP(_cc_is_gcc_, [ -#ifdef __GNUC__ -_cc_is_gcc_ -#endif -], [itcl_cv_prog_gcc=yes], [itcl_cv_prog_gcc=no])]) -AC_MSG_RESULT([$itcl_cv_prog_gcc]) - -# CYGNUS LOCAL - set CFLAGS to -g -O2 for gcc. -if test -z "$CFLAGS" ; then -if test "$itcl_cv_prog_gcc" = "yes" ; then - CFLAGS="-g -O2" -else - CFLAGS="-O" -fi -fi - -if test "$itcl_cv_prog_gcc" = "yes" ; then - # leave -Wimplicit-int out, the X libs generate so many of these warnings - # that they obscure everything else. - # CYGNUS LOCAL - add -fwritable-strings to CFLAGS for gcc. Needed - # with Tcl8.1 - CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall -Wno-implicit-int" -fi - -AC_MSG_CHECKING([default compiler flags]) -AC_ARG_WITH(cflags, [ --with-cflags=FLAGS set compiler flags to FLAGS], - [CFLAGS="$with_cflags"]) - -AC_MSG_RESULT([$CFLAGS]) - -if test "$TCL_CC" != "$CC" ; then - echo "" - echo "WARNING: Compiler is $CC but Tcl was compiled with $TCL_CC" - echo "" -fi - -#-------------------------------------------------------------------- -# The statements below define a collection of symbols related to -# building libitk as a shared library instead of a static library. -#-------------------------------------------------------------------- - -AC_ARG_ENABLE(shared, - [ --enable-shared build libitk as a shared library], - [ok=$enableval], [ok=no]) -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}" - eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}" - ITK_PKG_FILE="[[file join [file dirname \$dir] ${ITK_LIB_FILE}]]" - # CYGNUS LOCAL - don't pass LD_SEARCH_FLAGS to libraries - MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) " - # END CYGNUS LOCAL - RANLIB=":" -else - SHLIB_CFLAGS="" - # CYGNUS LOCAL - Strip dots from library name for SunOS4, etc... - if test ${TCL_LIB_VERSIONS_OK} = "nodots"; then - ITK_LIB_FILE="libitk`echo ${VERSION} | tr -d .`.a" - else - eval "ITK_LIB_FILE=libitk${VERSION}.a" - fi - ITK_PKG_FILE="" - MAKE_LIB="ar cr ${ITK_LIB_FILE} \${OBJS}" -fi - -# 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 -# up the Tcl library. - -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - ITK_BUILD_LIB_SPEC="-L`pwd` -litk${VERSION}" - ITK_LIB_SPEC="-L${exec_prefix}/lib -litk${VERSION}" -else - ITK_BUILD_LIB_SPEC="-L`pwd` -litk`echo ${VERSION} | tr -d .`" - ITK_LIB_SPEC="-L${exec_prefix}/lib -litk`echo ${VERSION} | tr -d .`" -fi - -ITK_LIB_FULL_PATH="`pwd`/${ITK_LIB_FILE}" - -AC_SUBST(CFLAGS) -AC_SUBST(DL_LIBS) -AC_SUBST(LD_FLAGS) -AC_SUBST(MAKE_LIB) -AC_SUBST(SHLIB_CFLAGS) -AC_SUBST(SHLIB_LD) -AC_SUBST(SHLIB_LD_LIBS) -AC_SUBST(SHLIB_SUFFIX) -AC_SUBST(LD_SEARCH_FLAGS) - -AC_SUBST(TCL_VERSION) -AC_SUBST(TCL_SRC_DIR) -AC_SUBST(TCL_LIB_SPEC) -AC_SUBST(TCL_BUILD_LIB_SPEC) -AC_SUBST(TCL_LIB_FLAG) -AC_SUBST(TCL_DBGX) -AC_SUBST(TCL_DEFS) -AC_SUBST(TCL_LIBS) -AC_SUBST(TCL_SHLIB_LD_LIBS) -AC_SUBST(TCL_SHLIB_SUFFIX) -AC_SUBST(TCL_COMPAT_OBJS) -AC_SUBST(TCL_CFLAGS) -AC_SUBST(TCL_LIB_FULL_PATH) - -AC_SUBST(TK_VERSION) -AC_SUBST(TK_BUILD_LIB_SPEC) -AC_SUBST(TK_LIB_DIR) -AC_SUBST(TK_LIB_SPEC) -AC_SUBST(TK_LIB_FLAG) -AC_SUBST(TK_XINCLUDES) -AC_SUBST(TK_XLIBSW) -AC_SUBST(TK_SRC_DIR) -AC_SUBST(TK_LIB_FULL_PATH) - -AC_SUBST(ITCL_VERSION) -AC_SUBST(ITCL_MAJOR_VERSION) -AC_SUBST(ITCL_MINOR_VERSION) -AC_SUBST(ITCL_RELEASE_LEVEL) -AC_SUBST(ITCL_BUILD_LIB_SPEC) -AC_SUBST(ITCL_LIB_FULL_PATH) -AC_SUBST(ITCL_LIB_DIR) -AC_SUBST(ITCL_LIB_SPEC) -AC_SUBST(ITCL_PKG_FILE) -AC_SUBST(ITCL_SRC_DIR) - -AC_SUBST(ITK_BUILD_LIB_SPEC) -AC_SUBST(ITK_LIB_FILE) -AC_SUBST(ITK_LIB_SPEC) -AC_SUBST(ITK_PKG_FILE) -AC_SUBST(ITK_SRC_DIR) -AC_SUBST(ITK_LIB_FULL_PATH) - -AC_OUTPUT(Makefile pkgIndex.tcl ../itkConfig.sh) diff --git a/itcl/itk/unix/pkgIndex.tcl.in b/itcl/itk/unix/pkgIndex.tcl.in deleted file mode 100644 index 6ff2a7d78b..0000000000 --- a/itcl/itk/unix/pkgIndex.tcl.in +++ /dev/null @@ -1,3 +0,0 @@ -# Tcl package index file, version 1.0 - -package ifneeded Itk @ITCL_VERSION@ [list load "@ITK_PKG_FILE@" Itk] diff --git a/itcl/itk/win/configure b/itcl/itk/win/configure index 4058c11a21..1cd55bd032 100755 --- a/itcl/itk/win/configure +++ b/itcl/itk/win/configure @@ -3835,15 +3835,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/itcl/itk/win/dllEntryPoint.c b/itcl/itk/win/dllEntryPoint.c index 8b8c55e9d1..bc872d318c 100644 --- a/itcl/itk/win/dllEntryPoint.c +++ b/itcl/itk/win/dllEntryPoint.c @@ -6,45 +6,33 @@ #define WIN32_LEAN_AND_MEAN #include -/* CYGNUS LOCAL */ -#include - -/* - * The following declaration is for the VC++ DLL entry point. - */ - -BOOL APIENTRY DllMain _ANSI_ARGS_((HINSTANCE hInst, - DWORD reason, LPVOID reserved)); -/* END CYGNUS LOCAL */ - -/* #if defined(_MSC_VER) + /* Only do this when MSVC++ is compiling us. */ # define DllEntryPoint DllMain +# if defined(USE_TCL_STUBS) && (!defined(_MT) || !defined(_DLL) || defined(_DEBUG)) + /* + * This fixes a bug with how the Stubs library was compiled. + * The requirement for msvcrt.lib from tclstubXX.lib should + * be removed. + */ +# pragma comment(linker, "-nodefaultlib:msvcrt.lib") +# endif #endif -*/ - -#ifdef __CYGWIN32__ - -/* cygwin32 requires an impure pointer variable, which must be - explicitly initialized when the DLL starts up. */ -struct _reent *_impure_ptr; -extern struct _reent *_imp__reent_data; -#endif /* __CYGWIN32__ */ /* *---------------------------------------------------------------------- * * DllEntryPoint -- * - * This wrapper function is used by Borland to invoke the - * initialization code for Tk. It simply calls the DllMain - * routine. + * This wrapper function is used by Windows to invoke the + * initialization code for the DLL. If we are compiling + * with Visual C++, this routine will be renamed to DllMain. * * Results: - * See DllMain. + * Returns TRUE; * * Side effects: - * See DllMain. + * None. * *---------------------------------------------------------------------- */ @@ -55,39 +43,5 @@ DllEntryPoint(hInst, reason, reserved) DWORD reason; /* Reason this function is being called. */ LPVOID reserved; /* Not used. */ { - return DllMain(hInst, reason, reserved); -} - -/* - *---------------------------------------------------------------------- - * - * DllMain -- - * - * DLL entry point. - * - * Results: - * TRUE on sucess, FALSE on failure. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - -BOOL APIENTRY -DllMain(hInstance, reason, reserved) - HINSTANCE hInstance; - DWORD reason; - LPVOID reserved; -{ -/* CYGNUS LOCAL */ -#ifdef __CYGWIN32__ - /* CYGNUS LOCAL */ - /* cygwin32 requires the impure data pointer to be initialized - when the DLL starts up. */ - _impure_ptr = _imp__reent_data; - /* END CYGNUS LOCAL */ -#endif - - return(TRUE); + return TRUE; } diff --git a/itcl/itk/win/makefile.bc b/itcl/itk/win/makefile.bc index 0d56d4d4ad..f0217796b2 100644 --- a/itcl/itk/win/makefile.bc +++ b/itcl/itk/win/makefile.bc @@ -1,227 +1,228 @@ -# Borland C++ 4.52 makefile -# -# Copyright (c) 1993-1996 Lucent Technologies -# based on original from -# Copyright (c) 1995-1996 by Sun Microsystems, Inc. -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. - -!include "..\..\Makefile.bc" - -# -# Project directories -# -# ROOT = top of source tree -# TMPDIR = location where .obj files should be stored during build - -ROOT = .. -TMPDIR = . -TARGET_LIB_ITK = $(TARGET_LIB)\Itk2.2 -TARGET_DOC_ITK = $(TARGET_DOC)\Itk - -# uncomment the following line to compile with symbols -#DEBUG=1 - -# uncomment the following two lines to compile with TCL_MEM_DEBUG -#DEBUGDEFINES =TCL_MEM_DEBUG - - -INCLUDES =$(BORLAND)\include;$(ROOT)\generic;$(ROOT);$(TCLDIR)\generic;$(ITCLDIR)\generic;$(TKDIR)\generic;$(TKDIR)\xlib;$(TKDIR)\bitmaps -LIBDIRS =$(BORLAND)\lib;$(ROOT)\win - -!ifndef DEBUG - -# these macros cause maximum optimization and no symbols -DEBUGLDFLAGS = -DEBUGCCFLAGS = -v- -vi- -O2 - -!else - -# these macros enable debugging -DEBUGLDFLAGS = -v -DEBUGCCFLAGS = -k -Od -v - -!endif - -DEFINES = _RTLDLL;USE_TCLALLOC=0;STRICT;$(DEBUGDEFINES);ITCL_NAMESPACES=1 -PROJECTCCFLAGS= $(DEBUGCCFLAGS) -w-par -w-stu - -LNFLAGS_exe = -Tpe -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0w32 -LNFLAGS_dll = -Tpd -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0d32 - -LNLIBS_exe = $(ITKLIB) $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i -LNLIBS_dll = $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i - -# -# Global makefile settings -# - -.AUTODEPEND -.CACHEAUTODEPEND - -.suffixes: .c .dll .lib .obj .exe - -.path.c=$(ROOT)\win;$(ROOT)\generic; -.path.obj=$(TMPDIR) - -ITKWISHOBJS = \ - $(TMPDIR)\winMain.obj - -ITKOBJS = \ - $(TMPDIR)\itk_archetype.obj \ - $(TMPDIR)\itk_cmds.obj \ - $(TMPDIR)\itk_option.obj \ - $(TMPDIR)\itk_util.obj \ - $(TMPDIR)\dllEntryPoint.obj - -ITKWISH = itkwish.exe - - -# -# Targets -# - -all: cfgdll $(ITKDLL) cfgexe $(ITKWISH) cfgcln -test: $(ITKWISH) - $(CP) $(TCLLIBDIR)\*.dll - $(CP) $(TKLIBDIR)\*.dll - $(CP) $(ITCLLIBDIR)\*.dll -#set ITK_ - $(ITKWISH) <<| - cd ..\tests - source all - exit -| - -install: all - $(MKDIR) "$(TARGET_ROOT)" - $(MKDIR) "$(TARGET_BIN)" - $(MKDIR) "$(TARGET_LIB_ROOT)" - $(MKDIR) "$(TARGET_LIB)" - $(MKDIR) "$(TARGET_LIB_ITK)" - $(MKDIR) "$(TARGET_INCLUDE_ROOT)" - $(MKDIR) "$(TARGET_INCLUDE)" - $(MKDIR) "$(TARGET_DOC)" - $(MKDIR) "$(TARGET_DOC_ITK)" - $(CP) $(TMPDIR)\$(ITKWISH) "$(TARGET_BIN)" - $(CP) $(TMPDIR)\$(ITKDLL) "$(TARGET_BIN)" - $(CP) $(ROOT)\generic\itk.h "$(TARGET_INCLUDE)" - $(CP) $(ROOT)\library\*.* "$(TARGET_LIB_ITK)" - $(CP) $(ROOT)\win\*.tcl "$(TARGET_LIB_ITK)" - $(CP) $(ROOT)\..\html\Itk\*.* "$(TARGET_DOC_ITK)" - -# Implicit Targets - -.c.obj: - @$(BCC32) {$< } - -.dll.lib: - $(IMPLIB) -c $@ $< - -.rc.res: - $(RC) -i$(ROOT)\generic;$(ITCLDIR)\generic;$(TCLDIR)\generic;$(TKDIR)\generic $< - -# -# Special case object file targets -# - -# -# Configuration file targets - these files are implicitly used by the compiler -# - -cfgdll: - @$(CP) &&| - -n$(TMPDIR) -I$(INCLUDES) -c -WD - -D$(DEFINES) -3 -d $(PROJECTCCFLAGS) -| bcc32.cfg >NUL - -cfgexe: - @$(CP) &&| - -n$(TMPDIR) -I$(INCLUDES) -c -W - -D$(DEFINES) -3 -d $(PROJECTCCFLAGS) -| bcc32.cfg >NUL - -cfgtest: - @$(CP) &&| - -n$(TMPDIR) -I$(INCLUDES) -c -W - -D$(DEFINES);TCL_TEST -3 -d $(PROJECTCCFLAGS) -| bcc32.cfg >NUL - -cfgcln: - @$(RM) bcc32.cfg - -# -# Executable targets -# - -$(ITKDLL): $(ITKOBJS) itk.def rc\itk.res - $(TLINK32) @&&| -$(LNFLAGS_dll) $(ITKOBJS) -$@ --x -$(LNLIBS_dll) -itk.def -rc\itk.res -| - -$(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) rc\itkwish.res - $(TLINK32) @&&| -$(LNFLAGS_exe) $(ITKWISHOBJS) -$@ --x -$(LNLIBS_exe) -|, &&| -EXETYPE WINDOWS -CODE PRELOAD MOVEABLE DISCARDABLE -DATA PRELOAD MOVEABLE MULTIPLE -|, rc\itkwish.res - -# -# Other dependencies -# - - -# The following rule automatically generates a tk.def file containing -# an export entry for every public symbol in the $(TKDLL) library. - -itk.def: $(ITKOBJS) - $(TCLLIBDIR)\dumpexts.exe -o $@ $(ITKDLL) @&&| - $(ITKOBJS) -| - -# Dependencies for .rc files: -rc\itk.res: rc\*.cur rc\itk.ico -rc\itkwish.res: rc\*.cur rc\itk.ico - -# debugging rules, the .dll and .exe files must be in the same -# directory as the object files for debugging purposes - -$(TMPDIR)\$(ITKDLL): $(ITKDLL) - $(CP) $(ITKDLL) $(TMPDIR) - -$(TMPDIR)\$(ITCLDLL): $(ITCLLIBDIR)\$(ITCLDLL) - $(CP) $(ITCLLIBDIR)\$(ITCLDLL) $(TMPDIR) - -$(TMPDIR)\$(TKDLL): $(TKLIBDIR)\$(TKDLL) - $(CP) $(TKLIBDIR)\$(TKDLL) $(TMPDIR) - -$(TMPDIR)\$(TCLDLL): $(TCLLIBDIR)\$(TCLDLL) - $(CP) $(TCLLIBDIR)\$(TCLDLL) $(TMPDIR) - -$(TMPDIR)\$(ITKWISH): $(ITKWISH) - $(CP) $(ITKWISH) $(TMPDIR) - -debug: $(TMPDIR)\$(ITKDLL) $(TMPDIR)\$(ITCLDLL) $(TMPDIR)\$(TKDLL) $(TMPDIR)\$(TCLDLL) - - -# remove all generated files - -clean: - -@$(RM) $(ITKWISH) - -@$(RM) $(ITKLIB) - -@$(RM) $(ITKDLL) - -@$(RM) itk.def - -@$(RM) $(TMPDIR)\Rc\*.res - -@$(RM) $(TMPDIR)\*.obj - -@$(RM) *.cfg +# Borland C++ 4.52 makefile +# +# Copyright (c) 1993-1996 Lucent Technologies +# based on original from +# Copyright (c) 1995-1996 by Sun Microsystems, Inc. +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +!include "..\..\Makefile.bc" + +# +# Project directories +# +# ROOT = top of source tree +# TMPDIR = location where .obj files should be stored during build + +ROOT = .. +TMPDIR = . +TARGET_LIB_ITK = $(TARGET_LIB)\Itk2.2 +TARGET_DOC_ITK = $(TARGET_DOC)\Itk + +# uncomment the following line to compile with symbols +#DEBUG=1 + +# uncomment the following two lines to compile with TCL_MEM_DEBUG +#DEBUGDEFINES =TCL_MEM_DEBUG + + +INCLUDES =$(BORLAND)\include;$(ROOT)\generic;$(ROOT);$(TCLDIR)\generic;$(ITCLDIR)\generic;$(TKDIR)\generic;$(TKDIR)\xlib;$(TKDIR)\bitmaps +LIBDIRS =$(BORLAND)\lib;$(ROOT)\win + +!ifndef DEBUG + +# these macros cause maximum optimization and no symbols +DEBUGLDFLAGS = +DEBUGCCFLAGS = -v- -vi- -O2 + +!else + +# these macros enable debugging +DEBUGLDFLAGS = -v +DEBUGCCFLAGS = -k -Od -v + +!endif + +DEFINES = _RTLDLL;USE_TCLALLOC=0;STRICT;$(DEBUGDEFINES);ITCL_NAMESPACES=1 +PROJECTCCFLAGS= $(DEBUGCCFLAGS) -w-par -w-stu + +LNFLAGS_exe = -Tpe -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0w32 +LNFLAGS_dll = -Tpd -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0d32 + +LNLIBS_exe = $(ITKLIB) $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i +LNLIBS_dll = $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i + +# +# Global makefile settings +# + +.AUTODEPEND +.CACHEAUTODEPEND + +.suffixes: .c .dll .lib .obj .exe + +.path.c=$(ROOT)\win;$(ROOT)\generic; +.path.obj=$(TMPDIR) + +ITKWISHOBJS = \ + $(TMPDIR)\winMain.obj + +ITKOBJS = \ + $(TMPDIR)\itk_archetype.obj \ + $(TMPDIR)\itk_cmds.obj \ + $(TMPDIR)\itk_option.obj \ + $(TMPDIR)\itk_util.obj \ + $(TMPDIR)\dllEntryPoint.obj + +ITKWISH = itkwish.exe + + +# +# Targets +# + +all: cfgdll $(ITKDLL) cfgexe $(ITKWISH) cfgcln +test: $(ITKWISH) + $(CP) $(TCLLIBDIR)\*.dll + $(CP) $(TKLIBDIR)\*.dll + $(CP) $(ITCLLIBDIR)\*.dll +#set ITK_ + $(ITKWISH) <<| + cd ..\tests + source all + exit +| + +install: all + $(MKDIR) "$(TARGET_ROOT)" + $(MKDIR) "$(TARGET_BIN)" + $(MKDIR) "$(TARGET_LIB_ROOT)" + $(MKDIR) "$(TARGET_LIB)" + $(MKDIR) "$(TARGET_LIB_ITK)" + $(MKDIR) "$(TARGET_INCLUDE_ROOT)" + $(MKDIR) "$(TARGET_INCLUDE)" + $(MKDIR) "$(TARGET_DOC)" + $(MKDIR) "$(TARGET_DOC_ITK)" + $(CP) $(TMPDIR)\$(ITKWISH) "$(TARGET_BIN)" + $(CP) $(TMPDIR)\$(ITKDLL) "$(TARGET_BIN)" + $(CP) $(ROOT)\generic\itk.h "$(TARGET_INCLUDE)" + $(CP) $(ROOT)\library\*.* "$(TARGET_LIB_ITK)" + $(CP) $(ROOT)\win\*.tcl "$(TARGET_LIB_ITK)" + $(CP) $(ROOT)\..\html\Itk\*.* "$(TARGET_DOC_ITK)" + +# Implicit Targets + +.c.obj: + @$(BCC32) {$< } + +.dll.lib: + $(IMPLIB) -c $@ $< + +.rc.res: + $(RC) -i$(ROOT)\generic;$(ITCLDIR)\generic;$(TCLDIR)\generic;$(TKDIR)\generic $< + +# +# Special case object file targets +# + +# +# Configuration file targets - these files are implicitly used by the compiler +# + +cfgdll: + @$(CP) &&| + -n$(TMPDIR) -I$(INCLUDES) -c -WD + -D$(DEFINES) -3 -d $(PROJECTCCFLAGS) +| bcc32.cfg >NUL + +cfgexe: + @$(CP) &&| + -n$(TMPDIR) -I$(INCLUDES) -c -W + -D$(DEFINES) -3 -d $(PROJECTCCFLAGS) +| bcc32.cfg >NUL + +cfgtest: + @$(CP) &&| + -n$(TMPDIR) -I$(INCLUDES) -c -W + -D$(DEFINES);TCL_TEST -3 -d $(PROJECTCCFLAGS) +| bcc32.cfg >NUL + +cfgcln: + @$(RM) bcc32.cfg + +# +# Executable targets +# + +$(ITKDLL): $(ITKOBJS) itk.def rc\itk.res + $(TLINK32) @&&| +$(LNFLAGS_dll) $(ITKOBJS) +$@ +-x +$(LNLIBS_dll) +itk.def +rc\itk.res +| + +$(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) rc\itkwish.res + $(TLINK32) @&&| +$(LNFLAGS_exe) $(ITKWISHOBJS) +$@ +-x +$(LNLIBS_exe) +|, &&| +EXETYPE WINDOWS +CODE PRELOAD MOVEABLE DISCARDABLE +DATA PRELOAD MOVEABLE MULTIPLE +|, rc\itkwish.res + +# +# Other dependencies +# + + +# The following rule automatically generates a tk.def file containing +# an export entry for every public symbol in the $(TKDLL) library. + +itk.def: $(ITKOBJS) + $(TCLLIBDIR)\dumpexts.exe -o $@ $(ITKDLL) @&&| + $(ITKOBJS) +| + +# Dependencies for .rc files: +rc\itk.res: rc\*.cur rc\itk.ico +rc\itkwish.res: rc\*.cur rc\itk.ico + +# debugging rules, the .dll and .exe files must be in the same +# directory as the object files for debugging purposes + +$(TMPDIR)\$(ITKDLL): $(ITKDLL) + $(CP) $(ITKDLL) $(TMPDIR) + +$(TMPDIR)\$(ITCLDLL): $(ITCLLIBDIR)\$(ITCLDLL) + $(CP) $(ITCLLIBDIR)\$(ITCLDLL) $(TMPDIR) + +$(TMPDIR)\$(TKDLL): $(TKLIBDIR)\$(TKDLL) + $(CP) $(TKLIBDIR)\$(TKDLL) $(TMPDIR) + +$(TMPDIR)\$(TCLDLL): $(TCLLIBDIR)\$(TCLDLL) + $(CP) $(TCLLIBDIR)\$(TCLDLL) $(TMPDIR) + +$(TMPDIR)\$(ITKWISH): $(ITKWISH) + $(CP) $(ITKWISH) $(TMPDIR) + +debug: $(TMPDIR)\$(ITKDLL) $(TMPDIR)\$(ITCLDLL) $(TMPDIR)\$(TKDLL) $(TMPDIR)\$(TCLDLL) + + +# remove all generated files + +clean: + -@$(RM) $(ITKWISH) + -@$(RM) $(ITKLIB) + -@$(RM) $(ITKDLL) + -@$(RM) itk.def + -@$(RM) $(TMPDIR)\Rc\*.res + -@$(RM) $(TMPDIR)\*.obj + -@$(RM) *.cfg + diff --git a/itcl/itk/win/makefile.vc b/itcl/itk/win/makefile.vc index 5d26cf408a..680531bd79 100644 --- a/itcl/itk/win/makefile.vc +++ b/itcl/itk/win/makefile.vc @@ -1,305 +1,293 @@ -# Visual C++ 2.x and 4.0 makefile -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# Copyright (c) 1995-1996 Sun Microsystems, Inc. -# SCCS: @(#) makefile.vc 1.8 98/07/29 13:14:52 - -# Does not depend on the presence of any environment variables in -# order to compile tcl; all needed information is derived from -# location of the compiler directories. -# -# NOTE: Be sure to modify the "makefile.vc" file in the toplevel directory -# for the itcl distribution. Include the location of your VC++ development -# tools and the installation directory. - -!include "..\..\makefile.vc" - - -# ROOT = top of source tree -# -# TMPDIR = location where .obj files should be stored during build - -ROOT = .. -ITCLDIR = ..\..\itcl - -###################################################################### -# Do not modify below this line -###################################################################### - -ITKNAMEPREFIX = itk -WISHNAMEPREFIX = itkwish -VERSION = 31 -DOTVERSION = 3.1 -STUBPREFIX = $(ITKNAMEPREFIX)stub - -BINROOT = . -!IF "$(NODEBUG)" == "1" -TMPDIR = $(BINROOT)\Release -DBGX = -!ELSE -TMPDIR = $(BINROOT)\Debug -DBGX = d -!ENDIF -OUTDIR = $(TMPDIR) - -ITKDLLNAME = $(ITKNAMEPREFIX)$(VERSION)$(DBGX).dll -ITKDLL = $(OUTDIR)\$(ITKDLLNAME) -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) -INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include - -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)\tcl81$(DBGX).lib -TCLSTUBLIB = $(TCLBUILDDIR)\tclstub81$(DBGX).lib -TCLDLL = $(TCLBUILDDIR)\tcl81$(DBGX).dll -TKBUILDDIR = $(TKDIR)\win\$(OUTDIR) -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 - -ITCLSTUBLIBNAME = itclstub$(VERSION)$(DBGX).lib -ITCLSTUBLIB = $(ITCLBUILDDIR)\$(ITCLSTUBLIBNAME) - -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 -###################################################################### - -!IF "$(NODEBUG)" == "1" -ldebug = /RELEASE -!ELSE -ldebug = -debug:full -debugtype:cv -!ENDIF - -# declarations common to all linker options -lcommon = /NODEFAULTLIB /RELEASE /NOLOGO - -# declarations for use on Intel i386, i486, and Pentium systems -!IF "$(MACHINE)" == "IX86" -DLLENTRY = @12 -lflags = $(lcommon) /MACHINE:$(MACHINE) -!ELSE -lflags = $(lcommon) /MACHINE:$(MACHINE) -!ENDIF - -conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup -guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup -dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll - -!IF "$(MACHINE)" == "PPC" -libc = libc.lib -libcdll = crtdll.lib -!ELSE -libc = libc.lib oldnames.lib -libcdll = msvcrt.lib oldnames.lib -!ENDIF - -baselibs = kernel32.lib $(optlibs) advapi32.lib -winlibs = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib -guilibs = $(libc) $(winlibs) - -guilibsdll = $(libcdll) $(winlibs) - -###################################################################### -# Compile flags -###################################################################### - -!IF "$(NODEBUG)" == "1" -!IF "$(MACHINE)" == "ALPHA" -# MSVC on Alpha doesn't understand -Ot -cdebug = -O2i -Gs -GD -DNDEBUG -!ELSE -cdebug = -Oti -Gs -GD -DNDEBUG -!ENDIF -!ELSE -cdebug = -Z7 -Od -WX -DDEBUG -!ENDIF - -# declarations common to all compiler options -ccommon = -c -W3 -nologo -Fp$(TMPDIR)\ -YX - -!IF "$(MACHINE)" == "IX86" -cflags = $(ccommon) -D_X86_=1 -!ELSE -!IF "$(MACHINE)" == "MIPS" -cflags = $(ccommon) -D_MIPS_=1 -!ELSE -!IF "$(MACHINE)" == "PPC" -cflags = $(ccommon) -D_PPC_=1 -!ELSE -!IF "$(MACHINE)" == "ALPHA" -cflags = $(ccommon) -D_ALPHA_=1 -!ENDIF -!ENDIF -!ENDIF -!ENDIF - -cvars = -DWIN32 -D_WIN32 -cvarsmt = $(cvars) -D_MT -cvarsdll = $(cvarsmt) -D_DLL - -!IF "$(NODEBUG)" == "1" -cvarsdll = $(cvars) -MD -!ELSE -cvarsdll = $(cvars) -MDd -!ENDIF - -CON_CFLAGS = $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE - -###################################################################### -# Project specific targets -###################################################################### - -all: setup $(ITKWISH) $(ITKDLL) $(ITKSTUBLIB) -test: setup $(ITKDLL) $(ITKSTUBLIB) $(ITKWISH) - -@copy $(TCLDLL) $(TMPDIR) - -@copy $(TKDLL) $(TMPDIR) - -@copy $(ITCLDLL) $(TMPDIR) -# $(ITKWISH) - -setup: - if not exist $(TMPDIR) mkdir $(TMPDIR) - if not exist $(OUTDIR) mkdir $(OUTDIR) - -$(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 $(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) - -$(TMPDIR)\itkvc.def: $(DUMPEXTS) $(ITKOBJS) - $(DUMPEXTS) -o $@ $(ITKDLLNAME) @<< - $(ITKOBJS) -<< - -$(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c - $(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $? - set LIB=$(TOOLS32)\lib - $(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \ - $(TMPDIR)\winDumpExts.obj - -install: all - if not exist $(INSTALLDIR) mkdir $(INSTALLDIR) - if not exist $(BIN_INSTALL_DIR) mkdir $(BIN_INSTALL_DIR) - if not exist $(LIB_INSTALL_DIR) mkdir $(LIB_INSTALL_DIR) - if not exist $(SCRIPT_INSTALL_DIR) mkdir $(SCRIPT_INSTALL_DIR) - if not exist $(INCLUDE_INSTALL_DIR) mkdir $(INCLUDE_INSTALL_DIR) - copy $(ITKWISH) "$(BIN_INSTALL_DIR)" - copy $(ITKDLL) "$(BIN_INSTALL_DIR)" - copy $(ROOT)\generic\itk.h "$(INCLUDE_INSTALL_DIR)" - 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) $(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 -# - -{$(GENERICDIR)}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(WINDIR)}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(ROOT)\unix}.c{$(TMPDIR)}.obj: - $(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $< - -{$(RCDIR)}.rc{$(TMPDIR)}.res: - $(rc32) -fo $@ -r -i $(GENERICDIR) -i $(TCLDIR)\generic -i $(ITCLDIR)\generic $< - -clean: - -@del $(OUTDIR)\*.exp - -@del $(OUTDIR)\*.lib - -@del $(OUTDIR)\*.dll - -@del $(OUTDIR)\*.exe - -@del $(OUTDIR)\*.pdb - -@del $(TMPDIR)\*.pch - -@del $(TMPDIR)\*.obj - -@del $(TMPDIR)\*.res - -@del $(TMPDIR)\*.def - -@del $(TMPDIR)\*.exe - -@rmdir $(OUTDIR) - -@rmdir $(TMPDIR) +###################################################################### +# Visual C++ 5.0+ makefile for [Incr Tcl] +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# Copyright (c) 1993-1998 Lucent Technologies, Inc. +# RCS: $Id$ +###################################################################### +# All needed information is derived from running vcvars32.bat +# +# NOTE: Be sure to modify the "config.vc" file in the toplevel directory +# before running this makefile. +###################################################################### +# Do not modify this file! modify config.vc to effect the build. +###################################################################### + +!include "..\..\rules.vc" +!include "..\..\config.vc" +!include "..\..\pkg.vc" + +BINROOT = . +ROOT = .. +ITCLDIR = ..\..\itcl +ITKNAMEPREFIX = itk +STUBPREFIX = $(ITKNAMEPREFIX)stub + +!if $(DEBUG) +TMPNAME = Debug +DBGX = d +!else +TMPNAME = Release +DBGX = +!endif + +TMP_DIR = $(BINROOT)\$(TMPNAME) + +!ifndef OUT_DIR +OUT_DIR = $(TMP_DIR) +!endif + +!if $(STATIC_BUILD) +ITKOUTNAME = $(ITKNAMEPREFIX)$(ITK_VERSION)s$(DBGX) +ITKTARGET = "$(OUT_DIR)\$(ITKOUTNAME).lib" +!else +ITKOUTNAME = $(ITKNAMEPREFIX)$(ITK_VERSION)$(DBGX) +ITKIMPLIB = "$(OUT_DIR)\$(ITKOUTNAME).lib" +ITKTARGET = "$(OUT_DIR)\$(ITKOUTNAME).dll" +!endif + +!if $(ISTCLINSTALL) +TCLSTUBLIB = "$(TCLROOT)\lib\tclstub$(TCL_VERSION).lib" +TKSTUBLIB = "$(TCLROOT)\lib\tkstub$(TCL_VERSION).lib" +TCLIMPLIB = "$(TCLROOT)\lib\tcl$(TCL_VERSION)$(DBGX).lib" +TKIMPLIB = "$(TCLROOT)\lib\tk$(TCL_VERSION)$(DBGX).lib" +TCLSH = "$(TCLROOT)\bin\tclsh$(TCL_VERSION)$(DBGX).exe" +WISH = "$(TCLROOT)\bin\wish$(TCL_VERSION)$(DBGX).exe" +!else +TCLSTUBLIB = "$(TCLROOT)\win\Release\tclstub$(TCL_VERSION).lib" +TKSTUBLIB = "$(TKROOT)\win\Release\tkstub$(TCL_VERSION).lib" +TCLIMPLIB = "$(TCLROOT)\win\$(OUT_DIR)\tcl$(TCL_VERSION)$(DBGX).lib" +TKIMPLIB = "$(TKROOT)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).lib" +TCLSH = "$(TCLROOT)\win\$(OUT_DIR)\tclsh$(TCL_VERSION)$(DBGX).exe" +WISH = "$(TCLROOT)\win\$(OUT_DIR)\wish$(TCL_VERSION)$(DBGX).exe" +!endif + +ITCLSTUBLIBNAME = itclstub$(ITCL_VERSION).lib +ITCLSTUBLIB = "$(ITCLDIR)\win\Release\$(ITCLSTUBLIBNAME)" + +ITKSTUBLIBNAME = $(STUBPREFIX)$(ITK_VERSION).lib +ITKSTUBLIB = "$(OUT_DIR)\$(ITKSTUBLIBNAME)" + + +LIB_INSTALL_DIR = $(INSTALLDIR)\lib +BIN_INSTALL_DIR = $(INSTALLDIR)\bin +SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\itk$(ITK_DOTVERSION) +INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include + +ITKOBJS = \ + $(TMP_DIR)\itk_archetype.obj \ + $(TMP_DIR)\itk_cmds.obj \ + $(TMP_DIR)\itk_option.obj \ + $(TMP_DIR)\itk_util.obj \ +!if $(STATIC_BUILD) == 0 + $(TMP_DIR)\dllEntryPoint.obj \ + $(TMP_DIR)\dllResource.obj \ +!endif + $(TMP_DIR)\itkStubInit.obj + +ITKSTUBOBJS = \ + $(TMP_DIR)\itkStubLib.obj + +WINDIR = $(ROOT)\win +GENERICDIR = $(ROOT)\generic +RCDIR = $(ROOT)\win\rc + +###################################################################### +# Link flags +###################################################################### + +!if $(DEBUG) +ldebug = -debug:full -debugtype:cv -pdb:none +!else +ldebug = -release -opt:ref +!endif + +# declarations common to all linker options +lcommon = -nologo -link50compat -machine:$(MACHINE) + +ITK_LFLAGS = $(lcommon) -subsystem:windows -dll + +!if $(USE_TCL_STUBS) +ITK_LLIBS = $(TCLSTUBLIB) $(TKSTUBLIB) $(ITCLSTUBLIB) +!else +ITK_LLIBS = $(TCLIMPLIB) $(TKIMPLIB) $(ITCLIMPLIB) +!endif + +###################################################################### +# Compile flags +###################################################################### + +!if $(DEBUG) == 0 +!if "$(MACHINE)" == "ALPHA" +# MSVC on Alpha doesn't understand -Ot +cdebug = -O2i +!else +cdebug = -Ox +!endif +!else +!if $(MSDEV_VER) < 6 +cdebug = -Zi -Od -WX +!else +cdebug = -ZI -Od -WX +!endif +!endif + +!if $(STATIC_BUILD) +cdll = +!else +cdll = -GD +!endif + +# declarations common to all compiler options +ccommon = -nologo -c -W3 -YX -Fp$(TMP_DIR)\ + +!if $(STATIC_BUILD) && $(NOMSVCRT) +crt = -MT$(DBGX) +!else +crt = -MD$(DBGX) +!endif + +!if $(ISTCLINSTALL) +TCL_INCLUDES = -I"$(TCLROOT)\include" +TK_INCLUDES = +!else +TCL_INCLUDES = -I"$(TCLROOT)\generic" +TK_INCLUDES = -I"$(TKROOT)\generic" -I"$(TKROOT)\xlib" +!endif + +ITK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) +ITCL_INCLUDES = -I"$(ITCLDIR)\generic" +ITK_DEFINES = -DBUILD_itk -DTCL_THREADS=1 +ITK_EXE_CFLAGS = $(ccommon) $(cdebug) $(crt) $(cdll) $(ITCL_INCLUDES) $(ITK_INCLUDES) \ + $(TCL_INCLUDES) $(TK_INCLUDES) $(ITK_DEFINES) + +!if $(USE_TCL_STUBS) +ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DUSE_TCL_STUBS -DUSE_TK_STUBS -DUSE_ITCL_STUBS +!else +ITK_CFLAGS = $(ITK_EXE_CFLAGS) +!endif + +###################################################################### +# Project specific targets +###################################################################### + +all : setup $(ITKTARGET) $(ITKSTUBLIB) +release : setup $(ITKTARGET) $(ITKSTUBLIB) + +test: setup $(ITKDLL) $(ITKSTUBLIB) $(ITKWISH) + -@copy $(TCLDLL) $(TMPDIR) + -@copy $(TKDLL) $(TMPDIR) + -@copy $(ITCLDLL) $(TMPDIR) +# $(ITKWISH) + +setup : + @$(vcvars) > nul + @if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) &\ + echo Created directory '$(TMP_DIR)' + @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) &\ + echo Created directory '$(OUT_DIR)' + +$(ITKTARGET): $(ITKOBJS) +!if $(STATIC_BUILD) + $(lib32) -nologo -machine:$(MACHINE) -out:$@ @<< +!else + $(link32) $(ITK_LFLAGS) -out:$@ $(ITK_LLIBS) @<< +!endif + $(ITKOBJS) +<< + + +!if $(DEBUG) == 0 +$(ITKSTUBLIB) : $(ITKSTUBOBJS) + $(lib32) -nologo -out:$@ $(ITKSTUBOBJS) +!else +$(ITKSTUBLIB) : +!endif + +install: all + if not exist "$(INSTALLDIR)" mkdir "$(INSTALLDIR)" + if not exist "$(BIN_INSTALL_DIR)" mkdir "$(BIN_INSTALL_DIR)" + if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)" + if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)" + if not exist "$(INCLUDE_INSTALL_DIR)" mkdir "$(INCLUDE_INSTALL_DIR)" + copy $(ITKTARGET) "$(SCRIPT_INSTALL_DIR)" + copy $(ITKSTUBLIB) "$(LIB_INSTALL_DIR)" + copy $(ROOT)\generic\itk.h "$(INCLUDE_INSTALL_DIR)" + copy $(ROOT)\generic\itkDecls.h "$(INCLUDE_INSTALL_DIR)" + copy $(ROOT)\library\*.* "$(SCRIPT_INSTALL_DIR)" + echo package ifneeded Itk $(ITK_DOTVERSION) [list load [file join $$dir $(ITKOUTNAME).dll] Itk] > \ + "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" + + +###################################################################### +# Regenerate the stubs files. +###################################################################### + +!if $(ISTCLINSTALL) == 0 +# Only from the sources of Tcl does genStubs.tcl exist. +genstubs: + $(TCLSH) $(TCLROOT)\tools\genStubs.tcl $(GENERICDIR) \ + $(GENERICDIR)\itk.decls +!else +genstubs: + @echo ERROR: Can't rebuild stubs tables without the Tcl source distribution +!endif + +###################################################################### +# Special case object file targets +###################################################################### + +# 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 + +$(TMP_DIR)\itkStubLib.obj : $(GENERICDIR)\itkStubLib.c + $(cc32) -DSTATIC_BUILD $(ITK_EXE_CFLAGS) -Zl -Fo$@ $? + +$(TMP_DIR)\dllResource.obj : $(TMP_DIR)\itk.res + $(cvtres32) -nologo -machine:$(MACHINE) -out:$@ $? + +###################################################################### +# Inference rules. Use batch-mode when supported. +###################################################################### + +!if $(_NMAKE_VER) < 162 +{$(WINDIR)}.c{$(TMP_DIR)}.obj : +!else +{$(WINDIR)}.c{$(TMP_DIR)}.obj :: +!endif + $(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMP_DIR)\ @<< +$< +<< + +!if $(_NMAKE_VER) < 162 +{$(GENERICDIR)}.c{$(TMP_DIR)}.obj : +!else +{$(GENERICDIR)}.c{$(TMP_DIR)}.obj :: +!endif + $(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMP_DIR)\ @<< +$< +<< + +{$(RCDIR)}.rc{$(TMP_DIR)}.res : + $(rc32) -fo $@ -DDEBUG=$(DEBUG) $(ITK_INCLUDES) $(TCL_INCLUDES) $(ITCL_INCLUDES) $(ITK_DEFINES) $< + +###################################################################### +# Clean up +###################################################################### + +tidy : + -del $(TMP_DIR)\*.pch + -del $(TMP_DIR)\*.obj + -del $(TMP_DIR)\*.res + +clean : tidy + -del $(OUT_DIR)\*.exp + -del $(OUT_DIR)\*.lib + -del $(OUT_DIR)\*.dll + +hose : clean + -rmdir $(OUT_DIR) + -rmdir $(TMP_DIR) + diff --git a/itcl/itk/win/rc/cursor00.cur b/itcl/itk/win/rc/cursor00.cur deleted file mode 100644 index 337e6d4e9012855fce13556b8f229608d5e3b8b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3I}XA?5JTUPVmr2@Bq=F5LBx?LDN^KUIm#Yk%XDU}^brysSsM8x87>6V1SRho za04F6lz1g0?+lX8?4P~&6+U-ZW|$Wkcc?vgwS)ex*>lEOcZ}Td7iyPElZH)-Ra!&Z T2B{UP*Mt78*>lEOcijB~_R@QD diff --git a/itcl/itk/win/rc/cursor02.cur b/itcl/itk/win/rc/cursor02.cur deleted file mode 100644 index fbc47749fd46676772d10c8c5e07f32474c2b781..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?@mN429umB5_^ls1Ui5l9Do`FhT~Ph{OPl1WZCkNO=X~@rO2D@aeO4PqJib zrBKdNE$JB2mU#e?S_E&Z{@3Tt_B>pWWOh27T4{&+EG1MUH=rr}5pPKs?6C&L4S&^( d?HkhFzBcv~!^R#_lKq%eWGG>O;2r~t{RI=9ero^# diff --git a/itcl/itk/win/rc/cursor04.cur b/itcl/itk/win/rc/cursor04.cur deleted file mode 100644 index 9634c42f3b5dbd309ff486363a792f02232464d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|l$g0|Nu|0R{%v u1wgwSP%-}p1~7op5FP^q&<#`pf9(JN{~`bX{|9~q28n_219nXO9|{1;z|NqA)O|l&S2Z$CB&Dem7 pSr;%cFdu-3F(3h;8>j*vu>b#$j{n&I{|~|+_z@Vy|5yJX4gj}Qeo+7b diff --git a/itcl/itk/win/rc/cursor08.cur b/itcl/itk/win/rc/cursor08.cur deleted file mode 100644 index d9f15f775627a1fc59ff24a4eef345684be6d314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmb`Bu?>JQ5CiXNvH_ywOG-8%qhuV$%1D%Sk5f@ZN`dg}8e14Vu4n17HzC;PcLowO&n@lMQW`tMc$?Cj$RKg>U*I8 diff --git a/itcl/itk/win/rc/cursor0a.cur b/itcl/itk/win/rc/cursor0a.cur deleted file mode 100644 index 3f8ef45620a84f54c851b8327cac13c354b61e58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|+av9|HqN2Ljvw v1G=LN6@$c()qwPX0MHE-fhL9j|6%x%^8f!0KoemYCJy6+XpkD1IEV%S7`S){ diff --git a/itcl/itk/win/rc/cursor0c.cur b/itcl/itk/win/rc/cursor0c.cur deleted file mode 100644 index 1014eddca2ed9a2df589d58f503b19ace75e4f3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu)Jq|!X5QgDzH9Dcu+EVET+>9HzlETkXv<@H{?@EM3$84U-%>HFpisa za;g#@4ICpxcjk98v-jkO8QY~`;Ou4Dq?vxg*r9<(dhZdz8-9fxpLi&^EsY;q>e?)0 LA?vYVHKRQpA^mz; diff --git a/itcl/itk/win/rc/cursor0e.cur b/itcl/itk/win/rc/cursor0e.cur deleted file mode 100644 index 964058d9adeabf601f89eea3dcc9223d58de4e99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu)u?c`c429u$Vqqa-Wqo#*ZlI$%fH;EVxQ9+)X(7b_8nrqE6Fvw@;4V@kC-0?# zY@Jj|YCuap92pBUi;X|e?34oKk8b3BBuJ5=gvY%{$sc}&97nv^YBto5gL=n?1ruh3 Gz2E{yjd@!D diff --git a/itcl/itk/win/rc/cursor10.cur b/itcl/itk/win/rc/cursor10.cur deleted file mode 100644 index c4f78096f3bb8dca4d21c02bba741869d5e08947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3Ar6C35JcZ6O^O1CEeWQQqz8bbeTnQ5dKAurs76*aOy{GTfP&e)5l`$cWCZFO zathi26>v9J^d@*x;@aDiw3P=;w?JY|^xYA%7hInHZLqc5#o9ldO7w<*mQMQKq)#c$ NS7~ab_d`m4j~_ZPe5(Ke diff --git a/itcl/itk/win/rc/cursor12.cur b/itcl/itk/win/rc/cursor12.cur deleted file mode 100644 index 920c936ae04afb050f2f66e9856793e1d8ef453c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|o45KL!R6W^BNZ ZkqrjAfhvH30puA3{$v0DKRyhz6aedVe3AeF diff --git a/itcl/itk/win/rc/cursor14.cur b/itcl/itk/win/rc/cursor14.cur deleted file mode 100644 index c7de122e01fc989f286b34e73bdeeea984f628c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3u?>JQ3tmfMA$f1|R^sfgvKVYkp?{ diff --git a/itcl/itk/win/rc/cursor18.cur b/itcl/itk/win/rc/cursor18.cur deleted file mode 100644 index 95ed2ee9623dcc4040a71522c836b0464d173516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3Ee?Y~6okKJ#X9P$nt((i5eSadBlKu{6pm1do4yG_U`P|@JZMPtJ(RdH z!4nvQuvmf=cO^+z@!wgl@c2Tv!92tCf_Hnyo-=pc^~Q=HZfWbJwMaEfpR|*!RMs>0 Kj@(^uy!`>#Re7oa diff --git a/itcl/itk/win/rc/cursor1a.cur b/itcl/itk/win/rc/cursor1a.cur deleted file mode 100644 index ea51361200cfb876d11669b8714736b1be7f0ce5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3AqoOv6okKD1>I^8lP+S|#iDos4HiN03W6ed1KVyAqb!RU4IaQFm`p|wV-Ux; zY1<+=!^eX+FbtG%_&!w4eFqI7Fzm(HaONUODvE!~q7P(jTd+Ao?+Ia=GkU}F4wDYd y>o84VwT9sX+ApvTe<`+xjNL*?1L@$|4Rc~Aotn~hCY>wNr7I;hX+Mx|W$6ng^nHu~ diff --git a/itcl/itk/win/rc/cursor1c.cur b/itcl/itk/win/rc/cursor1c.cur deleted file mode 100644 index 6f10bfbee8269b15d07473d45276ded078a2eb25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O_ZGd51?I45PWME z1HJsc PXlfex|NlQA|NlP#-?(u! diff --git a/itcl/itk/win/rc/cursor1e.cur b/itcl/itk/win/rc/cursor1e.cur deleted file mode 100644 index 49fa7f70ddb8dd68b3a15a0324d806b9313c57c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O_UrfP!%@(_a8(% eh{h%l5(5FC8z=%F>i_@8h8Y-vojW^w~*SCCzK8kL#Y^&0Dw6e&+^Ux_qGk diff --git a/itcl/itk/win/rc/cursor22.cur b/itcl/itk/win/rc/cursor22.cur deleted file mode 100644 index 2f8e91247f86e69939a29db60c0f543f385873d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCUnrnFR%Xx7euEDUl2UFCFU;B#fl(dN*x8ez9hQkP_7qkOBdRP`#xLe!z+_^G?_u>t^ a@$RJgEKNr#SJH5akEMUw_uM(>z4rlm!g~?` diff --git a/itcl/itk/win/rc/cursor26.cur b/itcl/itk/win/rc/cursor26.cur deleted file mode 100644 index 0b2dbd2578e68204ef98f93db3317b874e2b8ede..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmb`BAr62r5Co@GRN}C$MDhfl-ly;cWZm|frU`;n5N0!G_r$@1BP9ry!@&mZrd6D# lv&@h*n?G$n!+LjPfv2NyHv{|OH%gSQ(9K?YbL{Q5Q2_|SfARnT diff --git a/itcl/itk/win/rc/cursor28.cur b/itcl/itk/win/rc/cursor28.cur deleted file mode 100644 index 30550f956132b051a948187475d1c0511c7429fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|qQ*AE4bVs93Ru mfdPck#X)L80O$s)fCk3@|6#cQSz5JTUG0*Qt$QYt7Z*#JiSV=zWWU=&73NfF68(~yV`?qnCwmhPY+(REP8 z4hbGW9}2`2O0k~2``IL&;YE@%luP`wLj8j09QX6T%$&L7uJice_IyTZYo&K1t(CNt Ohn!iz%pG^PR{8?i27Rjl diff --git a/itcl/itk/win/rc/cursor2c.cur b/itcl/itk/win/rc/cursor2c.cur deleted file mode 100644 index 7be349469a3879cf32b23647d04181293fdbf9cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(F%E)25QX8lV4?*9D_gd-^Z+JsGxh|Y2^-I0Ji*#gm^^=I>0mbB%;qJ#8L3cE zj8ZM>7NiUF3L^CgoVn7{*Uk1i+?e#di%B};G)e~)Z+1YJr3U3BX?8~iiXC=W#}Dmb ZKe)W`Y3+=uu}7pM6S=g1aKIB^`w!OIe(C@K diff --git a/itcl/itk/win/rc/cursor2e.cur b/itcl/itk/win/rc/cursor2e.cur deleted file mode 100644 index 7a0bc694bd1e70f4ac44e263b0c14445de594c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?@m75QX7q2MG$4q@u+oWd=YZBQZiG24DnMU<>9zOh9KOl$SrGOh?Z8?xbhg zIw>kBC8?Cu1Zl@SfJiL@XRPkm=gsy!{3Gdj(;}h91}ntG4$vKEsmRRH5nDuw9TwM# bANIK7ffwF4JL6l~J@R_e7hGQO#K#^0$+&<7 diff --git a/itcl/itk/win/rc/cursor30.cur b/itcl/itk/win/rc/cursor30.cur deleted file mode 100644 index 70ef4fd23f83cc49c3a1866492d23234f14e710f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F$#lF5JcZkBVIrVq|g+>B85eYbW!jq9wdqfNSVV1COe3&AkOk&nHkuH6N$2f zET&0N0Cf-+ZIEKNBxx(&mA!s&?cp}S{Q=JlRP%y&d(PZ(cUAmwSnnj6?^*if(l|;} QC(YG@cYDspjoFjEc!%r-Wes`ZwT(Id)`#+7niNhY9DCSz9$5b2 kFTEF1pGuuCwdUGNw~J4@9{48ll#+-0#6&62r0r7r0ON#r;Q#;t diff --git a/itcl/itk/win/rc/cursor34.cur b/itcl/itk/win/rc/cursor34.cur deleted file mode 100644 index 0fad3f1cfb3e589a794683213b2979bcc81d8fac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu4F%H5&3t@p4FcK-Sv3_1f0?U`5dP z&}JM1w!k5o7MEmX{P4eOGM|#>WPyqT%{})R^UVUAE1YgHOqJI5Tx-YLYi;BXi!cq+ d=PbQ<(rYa}JL$2PO89e?*7jU;k9$4i*)J|8eJKC{ diff --git a/itcl/itk/win/rc/cursor36.cur b/itcl/itk/win/rc/cursor36.cur deleted file mode 100644 index fc8d4f6d4e527d67db9cd313bc80e877e02639d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O_ZD*P!$InmVW>g z_`txBV8Ouf$AE$19}xcs^5<`0U}!J~$`t@{1rP%P&J|5dR0tgD?PHpm@Rn diff --git a/itcl/itk/win/rc/cursor38.cur b/itcl/itk/win/rc/cursor38.cur deleted file mode 100644 index 4447d7d0bab9d713b161b6deafeb3d4e844b21c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(Ar8Vo5QX7?K~M}G48gG|a77{r?akmQ9HlrCE`dfN>mF|}(2y{bFSFT~%q~nw zU;$hIoU?31$yi>|t|;{AzWco1Hma opm9G{)&%~;_*qG>x%8Y$eJ0(5)S339_O0{IB!hdn&(^+?-m)itfdBvi diff --git a/itcl/itk/win/rc/cursor3e.cur b/itcl/itk/win/rc/cursor3e.cur deleted file mode 100644 index fa6fe5b694bde672db38753333c34412f76b0788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F$#lF5JcZs(8fAggv2uCzd$rc5psf*sqzmH@Jd>F5HDal1H!n(Dvbm(!((Bl z*ntQ~Q9x?;4tBuFu!xJ{%v+MQRsY<@0g@K78gdUlhdP5cfe?MuS$2IwIq{Kg_*?Ts hnks2LN<$;{z0?fS;U%5#QuSUb?e1?*g84x|R87NiFRfNr1&9AN(czkv~gL8cLd IVd_D80a*-rGynhq diff --git a/itcl/itk/win/rc/cursor44.cur b/itcl/itk/win/rc/cursor44.cur deleted file mode 100644 index e8bdfd2639e1d164265f607a77ab6b0bd9ece3b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?@m75Jur=6p08S($SKVk_})KHX)m2m5gFQf|d=A=KxhYa@KdYf9oW}f<)Uw z<$g%81@c=PetMckB+ RT7LPKf7!)zL|k>(Q*Xu>f3*Mr diff --git a/itcl/itk/win/rc/cursor46.cur b/itcl/itk/win/rc/cursor46.cur deleted file mode 100644 index 3e97094d9313083d4036ddd668ad7bce0b89026b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F%H5o5Cq34g^MV3sa;a$2j(dWqUQPM3D~Gn)B`IPC7V{C@ds diff --git a/itcl/itk/win/rc/cursor48.cur b/itcl/itk/win/rc/cursor48.cur deleted file mode 100644 index 2a5689731ed2fdebbbb2cd449117aab1b8941402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O`IGP14I2^?AXPX gfx$Ht6@$cJ>VY0$0J?!9aDegu{|2Bb diff --git a/itcl/itk/win/rc/cursor4c.cur b/itcl/itk/win/rc/cursor4c.cur deleted file mode 100644 index 0407d77a21caa522d75f1971e866f3c777795270..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lC-~&PfMg|5k1_lNVAO;FCH~=vt5aI*>|NqA)O|qQ*2L=WZHUR3x Zhmj2ix`8U7f&Kq~WZVuk6(5FK3IL>^eeeJP diff --git a/itcl/itk/win/rc/cursor4e.cur b/itcl/itk/win/rc/cursor4e.cur deleted file mode 100644 index a58e3dba5e24e0ed66c7c9f4ee7cb5b6b8b1538e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|qQ*2L=WZW-uUt ZkxT}4V@7!|cv1 z>_SXL2#^`a2-d*Cv_)w~##Bj~ihs)bGdv4e-C_BGd4RNpxEgile*1v^4X$sf8M9pn piFf?NUzJqSz&eqdOllWWmrMP{v<`EVN|i5dPEzq2_Zs`H^DlUwc|NqA)O`IGP14I2E?AXPH gfgvOW6@$cJ>VY0$0J?!9aDegu{|2Bb~i=8_;WT8aPK!!;u&nkbb`lh@~60Uh?f&`VLei+7_P9 zlAr-P;}&m|oWD4(y|_+ES8+q-8R`P1wr{mFeBdN{{pNip$o6?0g!T@%V(X>lCCyoy RQhew?@fI`d=y^K^p}*1ub^QPU diff --git a/itcl/itk/win/rc/cursor56.cur b/itcl/itk/win/rc/cursor56.cur deleted file mode 100644 index 2f3732ba615497d10f319e8f05a57894f396f4f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?_)I5QX9Yu1$o9OQVwPEtMWXVhitObsmd1;SJ~%;y6ROm6*vl#YrYJP?0DF z#$?tB7Qo6J(OPmxb)VTElKSDVN$rJ+Ep1~vJNkB*K@|$rmRlIvyfa{G{^7s6d;Mx> ZJ6Mul0~<=ukfn#+ny<@NI)%MSdIR#ed>#M* diff --git a/itcl/itk/win/rc/cursor58.cur b/itcl/itk/win/rc/cursor58.cur deleted file mode 100644 index 98b6a2fb5921a6b10ddcaa42b7de3dbe7f6fad34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu4F$%&^5JcaPMeKej3PNIM`O8!q@F-ru(#{k@uHbQEyhyx3O1p8F^g(c!2eUI< z>_SGMEFrf}0an1?FpJs<)^jCkF8(R2Gq@HI->_(4UBT`Sr|NqA)O|l$g1JF(+EdPUn h0fdpoKx||HbOTkuAN&9Rk?{fM|NoIOvK)vF0{{U-e$oH{ diff --git a/itcl/itk/win/rc/cursor5c.cur b/itcl/itk/win/rc/cursor5c.cur deleted file mode 100644 index a407b55fb2dfa9001826c62b4f0d0c8174cc8ca4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F%E)I5Jca{g2qT^EJ&oZIQwZ#s0{lv`)6M!*@c2c z(?H3AHo+0NSVr8ebn4V&uo cklt5mK1)-z{4r;l&1SDs8lKW<_4dEHFV*0FxBvhE diff --git a/itcl/itk/win/rc/cursor5e.cur b/itcl/itk/win/rc/cursor5e.cur deleted file mode 100644 index ab3449f7a9dca85ff2b70bc79fde18415f6b18d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(!3l#v5QX8l5h8?uw_LMFk0~LgSV}suB|ESM)4_rl58}%|!JD^amT!iAFfh_d zNjXaw<|9crNiB%FuSlhuy?1h-}3MhaRK-0c)aw%m4rY diff --git a/itcl/itk/win/rc/cursor60.cur b/itcl/itk/win/rc/cursor60.cur deleted file mode 100644 index 847969d261cb4333cc1d58d064dd7c140043d3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmb`CAr62r3`Ktt7z_$MMUWf;#d){^j`N~Wg!0M+ZV3r(UYh@Zw`@`+Q%X`pk0y1J z2Eft;MwiOnOY!%t<_K8K4QA-2^~m$l_)lKr0dM%HcCLXlSlq7>-NpxBLWh4Yc`x>F Df)RW= diff --git a/itcl/itk/win/rc/cursor62.cur b/itcl/itk/win/rc/cursor62.cur deleted file mode 100644 index 36404a50b00e6b407e8d6047d836dd71cc3ec8fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O`04N14I2^?AXPX afguzPgTz4Ufo`A*IKcS-e*@4oQZWG0wtU?H diff --git a/itcl/itk/win/rc/cursor66.cur b/itcl/itk/win/rc/cursor66.cur deleted file mode 100644 index 81d53b4269674bad09924a0c088f10d255f046e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O|o45KL!RDCIof| w@s&_<{Ue~;fMPHVbOTiY0|Ur25G?rP|9=4>8-@it{{IJI1`Y(42l0Vw0At8ArgZy5QX7CMMUCigRHDXbvOz~Kq4x7G>+0ER919&eSw|f0%YgQX4mAwg+$ju zcHI+Pftz{7V9B+eX!~&7l8)ho*Q1B>v>DovC+D-K8l5R@0S9n~Q_hm5S0gRS+~48j Oef6zc=@-`GZ|x5|fqGH^ diff --git a/itcl/itk/win/rc/cursor6a.cur b/itcl/itk/win/rc/cursor6a.cur deleted file mode 100644 index 20f138e45d82a3d1e96c65477726842ac9f23f96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F&02T3`GA@tcp%+OQjodGkY{gafB@uo)MJWcud}(B-12N;0OUKY6b@_&>I#p s8P4ibygfHbdH5xXc58uh1)pr5-hs(}_@`MqMrrS)t&x&{`nA8|1P{lWca=B#;nj8pw=YfD&k} yEMl+<#tXMZ^L9zE`FY9nK@ShH?+I3VdTO5~DeQ=NYLl?>ve9iy> diff --git a/itcl/itk/win/rc/cursor72.cur b/itcl/itk/win/rc/cursor72.cur deleted file mode 100644 index 4994c6e7a26862bc9ebb0d8c876dca5b551549b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lC;9y{2Fkob05ChU0KnxUOZ~$UPAOwL1Fo{Y0|NkFTkVFwi2cSJf uV)hRV49pLJ>JKo$9R+j)Mc|M8|Nq3`5A6T{gYXZ2i28r_Kx^y&{|5lcUVHff diff --git a/itcl/itk/win/rc/cursor74.cur b/itcl/itk/win/rc/cursor74.cur deleted file mode 100644 index d5e43613d34661c9c5f69ec02fc8605d0e9d9ab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3F$#b%6hl)T9Nk>)=;#gfXg!)o@dzCq#F!v1f<-W&2mL?!^aB+FVgwr17=RAI zAT+`(f~q8vCHtF~^v?p+tM15p&+piG&Uqvu>4slACUWn|ttE4F;r_|(IcLv%)(N@~ BecS*5 diff --git a/itcl/itk/win/rc/cursor76.cur b/itcl/itk/win/rc/cursor76.cur deleted file mode 100644 index ce6e3972403610b3342471203219f1d6965e2e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(tqKBB5QgFRECvySNj7dY8aEg=cv&JGyfQI(9bSQm$@KYd-LMGG@Pzqc7-%ST z9jwfKfi19;Ed~{HE|ScRf19nE_(yB5ImM$dd$!hpROX(5DSw3ll;0_O#nH^Zz zk;oYut0XuAXJd=rBx`FVZN)!jxrH`Y_B{mS2*Vw^cO~}l)_lE>u7CJzrbU`(X_?GJ Zx?ZGGq+26BJ9F@Us$OJq_j%P$bieN|NqA)O_ZEHP?aJSTLNhi y)Gjl|NjAo%6ZEG diff --git a/itcl/itk/win/rc/cursor7e.cur b/itcl/itk/win/rc/cursor7e.cur deleted file mode 100644 index 4b24e50885a2594dacb8e3af334844e8a6ea5120..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3Ar8U-5Co?{XEJhVaT#jl6u(7+}@tK zgB}4{29awSzyw$ruP9C6`sizI=(?mX{5VxHY^J`uhItL+5u_R9Ih=>B#}y1pvxCs| r!N0fi4}WRaNXbEpA}L)-^+h_KocB_3lR|rwNY_HTZ(AO|_~vO|`gD69 diff --git a/itcl/itk/win/rc/cursor80.cur b/itcl/itk/win/rc/cursor80.cur deleted file mode 100644 index a3955a5f7e74f46151e478f9b47324c704b6d445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu3Jr2S!6obE@O6^9ciUEm?jBo;eZp0m!;Yw_|1`-1+Bb#|9pdO%pavVF35}1+5 z8QPdlf&o|uBVr#+F<<}}kN3OELj%V%SpS*N-E-fFKTO7ZC%snE aeJ+(ET_4gVxI9UVZB={cJQ314g$JR(b^?tCLkGwG1A2wuo4|>L}CHxQXm}{K^;Znb`%96uG+sZ8Ufn?4+X1%OI;hK6njnqPx;_KFU2Km3@L%43KKZ=t ZVRz|ywIq$LRnqOJxK{=#NZOf8eE_=xeV70M diff --git a/itcl/itk/win/rc/cursor86.cur b/itcl/itk/win/rc/cursor86.cur deleted file mode 100644 index 2d38c0351f196e7a178c532f6aca14d475ec434b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?>VU429trkPzKb(US5?Hh@tO3_>!jTr?sLv8(d=CGZbnKWuM*)u(K^lbLdEU{RaXZn9KfH<$+a_PJV8(|NqA)O}tzKP$?G7(ZRsL zGJ%1CX#vnJ2cT+zl>I*l1~M6dZlDPKv;Y4e8-8Z||NkT9|NlR*|NsAk|Ns9#@(^_m IKpT-U0Qf6>BLDyZ diff --git a/itcl/itk/win/rc/cursor8c.cur b/itcl/itk/win/rc/cursor8c.cur deleted file mode 100644 index 103010b645cc7478d98e26b113701a1cdcc37376..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmb`Cxe4Q5~wTCoXJ+|NqA)O_Usm0s{jKa{}31 z2@DL}3qW=Q-PORrzMH4gw%GKsQhX9{2zM{|Jg7@c;i0!(Zb6 X|NmkC|NjShgcwK;#0QE0sfS|NqA)O|qN>PzOFN|AT=6 YgpmQz4O9V#fu`WY2bll=N5(Kq0h;B1!TA;s#29-bwxCz(dQe1?^c#sH?17wL=J+1bq-Gzcc zN)T;bfC^}hQ)CltN0M|@{=YVPSKjc{x^>SGq3+=Jg8m7GkG#%qvV6lSEqCeD{4hG+ S5r_3rQ%aM4woe!7{gA#u7IusP diff --git a/itcl/itk/win/rc/cursor94.cur b/itcl/itk/win/rc/cursor94.cur deleted file mode 100644 index 7777d5380a7e999dceb6bedb0f81f9937ec4b5cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU|NqA)O}d-}PzxR`|AT=6 YgpmQz4b%aLfyUs$2bll=N5(Kq0h|SY!T|NqA)O_ZGc0|o{dw*SDu zkRZXpaDs<{p@p4+p}8G`8-eVDK(R!i97qjJJ%|Rnfg*5#|Nnm&ZeRy`h#BN592h7E JQUg;Dq5%Q2cfSAt diff --git a/itcl/itk/win/rc/cursor98.cur b/itcl/itk/win/rc/cursor98.cur deleted file mode 100644 index 5cab68ebace8c45df525bc61f8d7f3fd11d16355..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZQzU}9ioP*7lCU=67%{{R1f_V_VK4NN^qF8~zIewY9N diff --git a/itcl/itk/win/rc/itk.rc b/itcl/itk/win/rc/itk.rc index f63bf01dc7..47511b1b7f 100644 --- a/itcl/itk/win/rc/itk.rc +++ b/itcl/itk/win/rc/itk.rc @@ -1,126 +1,62 @@ -// SCCS: @(#) tk.rc 1.17 96/09/12 16:22:08 -// -// Version -// - -#define VS_VERSION_INFO 1 -#define RESOURCE_INCLUDED -#include -#include - -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" +// RCS: @(#) $Id$ +// +// Version resource script. +// + +#include + +#define RESOURCE_INCLUDED +#include + +// +// build-up the name suffix that defines the type of build this is. +// +#if DEBUG +#define SUFFIX_DEBUG "d" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_DEBUG + + +VS_VERSION_INFO VERSIONINFO + FILEVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0 + PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0 + FILEFLAGSMASK 0x3fL +#if DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "[incr Tk] Object-Oriented Tk extension\0" + VALUE "Authors", "Michael McLennan\0" + VALUE "OriginalFilename", "itk" STRINGIFY(JOIN(ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION)) SUFFIX ".dll\0" + VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0" + VALUE "FileVersion", ITCL_PATCH_LEVEL + VALUE "LegalCopyright", "Copyright \251 1993-2001\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 + +// +// Icons +// + +toaster ICON DISCARDABLE "itk.ico" + diff --git a/itcl/itk/win/rc/itkwish.rc b/itcl/itk/win/rc/itkwish.rc deleted file mode 100644 index 94fd89fdb2..0000000000 --- a/itcl/itk/win/rc/itkwish.rc +++ /dev/null @@ -1,43 +0,0 @@ -// SCCS: @(#) wish.rc 1.13 96/09/12 16:22:14 -// -// Version -// - -#define RESOURCE_INCLUDED -#include -#include - -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 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "[incr Tk] Object-Oriented Wish Application\0" - VALUE "Authors", "Michael McLennan\0" - VALUE "OriginalFilename", "itkwish.exe\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 -// - -wish ICON DISCARDABLE "itk.ico" diff --git a/itcl/itk/win/winMain.c b/itcl/itk/win/winMain.c deleted file mode 100644 index 4ec8d1976c..0000000000 --- a/itcl/itk/win/winMain.c +++ /dev/null @@ -1,345 +0,0 @@ -/* - * winMain.c -- - * - * Main entry point for wish and other Tk-based applications. - * - * Copyright (c) 1995 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * SCCS: @(#) winMain.c 1.33 96/12/17 12:56:14 - */ - -#include -#define WIN32_LEAN_AND_MEAN -#include -#undef WIN32_LEAN_AND_MEAN -#include -#include - -#include "itk.h" - -/* include tclInt.h for access to namespace API */ -#include "tkInt.h" - - -/* - * Forward declarations for procedures defined later in this file: - */ - -static void setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr)); -static void WishPanic _ANSI_ARGS_(TCL_VARARGS(char *,format)); - -#ifdef TK_TEST -EXTERN int Tktest_Init(Tcl_Interp *interp); -#endif /* TK_TEST */ - - -/* - *---------------------------------------------------------------------- - * - * WinMain -- - * - * Main entry point from Windows. - * - * Results: - * Returns false if initialization fails, otherwise it never - * returns. - * - * Side effects: - * Just about anything, since from here we call arbitrary Tcl code. - * - *---------------------------------------------------------------------- - */ - -int APIENTRY -WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow) - HINSTANCE hInstance; - HINSTANCE hPrevInstance; - LPSTR lpszCmdLine; - int nCmdShow; -{ - char **argv, *p; - int argc; - char buffer[MAX_PATH]; - - Tcl_SetPanicProc(WishPanic); - - /* - * Set up the default locale to be standard "C" locale so parsing - * is performed correctly. - */ - - setlocale(LC_ALL, "C"); - - - /* - * Increase the application queue size from default value of 8. - * At the default value, cross application SendMessage of WM_KILLFOCUS - * will fail because the handler will not be able to do a PostMessage! - * This is only needed for Windows 3.x, since NT dynamically expands - * the queue. - */ - 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. - */ - - setargv(&argc, &argv); - - /* - * Replace argv[0] with full pathname of executable, and forward - * slashes substituted for backslashes. - */ - - GetModuleFileName(NULL, buffer, sizeof(buffer)); - argv[0] = buffer; - for (p = buffer; *p != '\0'; p++) { - if (*p == '\\') { - *p = '/'; - } - } - - Tk_Main(argc, argv, Tcl_AppInit); - return 1; -} - - -/* - *---------------------------------------------------------------------- - * - * Tcl_AppInit -- - * - * This procedure performs application-specific initialization. - * Most applications, especially those that incorporate additional - * packages, will have their own version of this procedure. - * - * Results: - * Returns a standard Tcl completion code, and leaves an error - * message in interp->result if an error occurs. - * - * Side effects: - * Depends on the startup script. - * - *---------------------------------------------------------------------- - */ - -int -Tcl_AppInit(interp) - Tcl_Interp *interp; /* Interpreter for application. */ -{ - if (Tcl_Init(interp) == TCL_ERROR) { - goto error; - } - if (Tk_Init(interp) == TCL_ERROR) { - goto error; - } - Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit); - - if (Itcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - if (Itk_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - Tcl_StaticPackage(interp, "Itcl", Itcl_Init, Itcl_SafeInit); - Tcl_StaticPackage(interp, "Itk", Itk_Init, (Tcl_PackageInitProc *) NULL); - - /* - * This is itkwish, so import all [incr Tcl] commands by - * default into the global namespace. Fix up the autoloader - * to do the same. - */ - if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp), - "::itk::*", /* allowOverwrite */ 1) != TCL_OK) { - return TCL_ERROR; - } - - if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp), - "::itcl::*", /* allowOverwrite */ 1) != TCL_OK) { - return TCL_ERROR; - } - - if (Tcl_Eval(interp, "auto_mkindex_parser::slavehook { _%@namespace import -force ::itcl::* ::itk::* }") != TCL_OK) { - return TCL_ERROR; - } - - /* - * Initialize the console only if we are running as an interactive - * application. - */ - - if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) { - goto error; - } - -#ifdef TK_TEST - if (Tktest_Init(interp) == TCL_ERROR) { - goto error; - } - Tcl_StaticPackage(interp, "Tktest", Tktest_Init, - (Tcl_PackageInitProc *) NULL); -#endif /* TK_TEST */ - - Tcl_SetVar(interp, "tcl_rcFileName", "~/itkwishrc.tcl", TCL_GLOBAL_ONLY); - return TCL_OK; - -error: - WishPanic(interp->result); - return TCL_ERROR; -} - -/* - *---------------------------------------------------------------------- - * - * WishPanic -- - * - * Display a message and exit. - * - * Results: - * None. - * - * Side effects: - * Exits the program. - * - *---------------------------------------------------------------------- - */ - -void -WishPanic TCL_VARARGS_DEF(char *,arg1) -{ - va_list argList; - char buf[1024]; - char *format; - - format = TCL_VARARGS_START(char *,arg1,argList); - vsprintf(buf, format, argList); - - MessageBeep(MB_ICONEXCLAMATION); - MessageBox(NULL, buf, "Fatal Error in Wish", - MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); -#ifdef _MSC_VER - DebugBreak(); -#endif - ExitProcess(1); -} -/* - *------------------------------------------------------------------------- - * - * setargv -- - * - * Parse the Windows command line string into argc/argv. Done here - * because we don't trust the builtin argument parser in crt0. - * Windows applications are responsible for breaking their command - * line into arguments. - * - * 2N backslashes + quote -> N backslashes + begin quoted string - * 2N + 1 backslashes + quote -> literal - * N backslashes + non-quote -> literal - * quote + quote in a quoted string -> single quote - * quote + quote not in quoted string -> empty string - * quote -> begin quoted string - * - * Results: - * Fills argcPtr with the number of arguments and argvPtr with the - * array of arguments. - * - * Side effects: - * Memory allocated. - * - *-------------------------------------------------------------------------- - */ - -static void -setargv(argcPtr, argvPtr) - int *argcPtr; /* Filled with number of argument strings. */ - char ***argvPtr; /* Filled with argument strings (malloc'd). */ -{ - char *cmdLine, *p, *arg, *argSpace; - char **argv; - int argc, size, inquote, copy, slashes; - - cmdLine = GetCommandLine(); - - /* - * Precompute an overly pessimistic guess at the number of arguments - * in the command line by counting non-space spans. - */ - - size = 2; - for (p = cmdLine; *p != '\0'; p++) { - if (isspace(*p)) { - size++; - while (isspace(*p)) { - p++; - } - if (*p == '\0') { - break; - } - } - } - argSpace = (char *) ckalloc((unsigned) (size * sizeof(char *) - + strlen(cmdLine) + 1)); - argv = (char **) argSpace; - argSpace += size * sizeof(char *); - size--; - - p = cmdLine; - for (argc = 0; argc < size; argc++) { - argv[argc] = arg = argSpace; - while (isspace(*p)) { - p++; - } - if (*p == '\0') { - break; - } - - inquote = 0; - slashes = 0; - while (1) { - copy = 1; - while (*p == '\\') { - slashes++; - p++; - } - if (*p == '"') { - if ((slashes & 1) == 0) { - copy = 0; - if ((inquote) && (p[1] == '"')) { - p++; - copy = 1; - } else { - inquote = !inquote; - } - } - slashes >>= 1; - } - - while (slashes) { - *arg = '\\'; - arg++; - slashes--; - } - - if ((*p == '\0') || (!inquote && isspace(*p))) { - break; - } - if (copy != 0) { - *arg = *p; - arg++; - } - p++; - } - *arg = '\0'; - argSpace = arg + 1; - } - argv[argc] = NULL; - - *argcPtr = argc; - *argvPtr = argv; -} - diff --git a/itcl/makefile.bc b/itcl/makefile.bc index 12762724db..4a59049ab8 100644 --- a/itcl/makefile.bc +++ b/itcl/makefile.bc @@ -1,114 +1,115 @@ -# Borland 5.01 Makefile for Itcl 2.2 Distribution -# -# This is the main Borland makefile for the Windows distribution -# of [incr Tcl] version 2.2. - -# -# TOOLS -- path to root of Borland Directory -# TARGET_ROOT -- Target Directory for installation -# SOURCE_ROOT -- Path to root of source tree - -TOOLS = c:\bc45 -TARGET_ROOT = c:\Program files\Itcl2.2 -SOURCE_ROOT = c:\Itcl2.2 - -# -# You should not have to modify anything further in this makefile -# - -# -# Borland C++ tools -# - -BORLAND = $(TOOLS) -IMPLIB = $(BORLAND)\bin\Implib -BCC32 = $(BORLAND)\bin\Bcc32 -TLINK32 = $(BORLAND)\bin\tlink32 -RC = $(BORLAND)\bin\brcc32 -BCC = $(BORLAND)\bin\Bcc -TLINK = $(BORLAND)\bin\tlink -RC16 = $(BORLAND)\bin\brcc32 -31 -MAKE = $(BORLAND)\bin\make -fmakefile.bc - -# -# System calls -# - -CP = copy -RM = del -MKDIR = -mkdir - -# -# Source and Build Paths -# - -TCLDIR = $(SOURCE_ROOT)\Tcl7.6 -TKDIR = $(SOURCE_ROOT)\Tk4.2 -ITCLDIR = $(SOURCE_ROOT)\Itcl -ITKDIR = $(SOURCE_ROOT)\Itk -IWIDGETSDIR = $(SOURCE_ROOT)\Iwidgets2.2.0 - -# -# Target Paths -# - -TARGET_BIN = $(TARGET_ROOT)\Bin -TARGET_LIB_ROOT = $(TARGET_ROOT)\Lib -TARGET_LIB = $(TARGET_LIB_ROOT)\Itcl -TARGET_INCLUDE_ROOT = $(TARGET_ROOT)\Include -TARGET_INCLUDE = $(TARGET_INCLUDE_ROOT)\Itcl -TARGET_DOC = $(TARGET_ROOT)\Html - -# -# Shared Target Files: -# - -TCLLIB = Tcl76i.lib -TCLDLL = Tcl76i.dll -TKLIB = Tk42i.lib -TKDLL = Tk42i.dll -ITCLLIB = Itcl22.lib -ITCLDLL = Itcl22.dll -ITKLIB = Itk22.lib -ITKDLL = Itk22.dll - -# -# Paths to Build locations of libraries -# -TCLLIBDIR = $(TCLDIR)\Win -TKLIBDIR = $(TKDIR)\Win -ITCLLIBDIR = $(ITCLDIR)\Win -ITKLIBDIR = $(ITKDIR)\Win - - -dist: - cd $(TCLDIR)\Win - $(MAKE) all - cd $(TKDIR)\Win - $(MAKE) all - cd $(ITCLDIR)\Win - $(MAKE) all - cd $(ITKDIR)\Win - $(MAKE) all - -dist-install: - cd $(TCLDIR)\Win - $(MAKE) install - cd $(TKDIR)\Win - $(MAKE) install - cd $(ITCLDIR)\Win - $(MAKE) install - cd $(ITKDIR)\Win - $(MAKE) install - cd $(IWIDGETSDIR)\Win - $(MAKE) install - -dist-clean: - cd $(TCLDIR)\Win - $(MAKE) clean - cd $(TKDIR)\Win - $(MAKE) clean - cd $(ITCLDIR)\Win - $(MAKE) clean - cd $(ITKDIR)\Win - $(MAKE) clean +# Borland 5.01 Makefile for Itcl 2.2 Distribution +# +# This is the main Borland makefile for the Windows distribution +# of [incr Tcl] version 2.2. + +# +# TOOLS -- path to root of Borland Directory +# TARGET_ROOT -- Target Directory for installation +# SOURCE_ROOT -- Path to root of source tree + +TOOLS = c:\bc45 +TARGET_ROOT = c:\Program files\Itcl2.2 +SOURCE_ROOT = c:\Itcl2.2 + +# +# You should not have to modify anything further in this makefile +# + +# +# Borland C++ tools +# + +BORLAND = $(TOOLS) +IMPLIB = $(BORLAND)\bin\Implib +BCC32 = $(BORLAND)\bin\Bcc32 +TLINK32 = $(BORLAND)\bin\tlink32 +RC = $(BORLAND)\bin\brcc32 +BCC = $(BORLAND)\bin\Bcc +TLINK = $(BORLAND)\bin\tlink +RC16 = $(BORLAND)\bin\brcc32 -31 +MAKE = $(BORLAND)\bin\make -fmakefile.bc + +# +# System calls +# + +CP = copy +RM = del +MKDIR = -mkdir + +# +# Source and Build Paths +# + +TCLDIR = $(SOURCE_ROOT)\Tcl7.6 +TKDIR = $(SOURCE_ROOT)\Tk4.2 +ITCLDIR = $(SOURCE_ROOT)\Itcl +ITKDIR = $(SOURCE_ROOT)\Itk +IWIDGETSDIR = $(SOURCE_ROOT)\Iwidgets2.2.0 + +# +# Target Paths +# + +TARGET_BIN = $(TARGET_ROOT)\Bin +TARGET_LIB_ROOT = $(TARGET_ROOT)\Lib +TARGET_LIB = $(TARGET_LIB_ROOT)\Itcl +TARGET_INCLUDE_ROOT = $(TARGET_ROOT)\Include +TARGET_INCLUDE = $(TARGET_INCLUDE_ROOT)\Itcl +TARGET_DOC = $(TARGET_ROOT)\Html + +# +# Shared Target Files: +# + +TCLLIB = Tcl76i.lib +TCLDLL = Tcl76i.dll +TKLIB = Tk42i.lib +TKDLL = Tk42i.dll +ITCLLIB = Itcl22.lib +ITCLDLL = Itcl22.dll +ITKLIB = Itk22.lib +ITKDLL = Itk22.dll + +# +# Paths to Build locations of libraries +# +TCLLIBDIR = $(TCLDIR)\Win +TKLIBDIR = $(TKDIR)\Win +ITCLLIBDIR = $(ITCLDIR)\Win +ITKLIBDIR = $(ITKDIR)\Win + + +dist: + cd $(TCLDIR)\Win + $(MAKE) all + cd $(TKDIR)\Win + $(MAKE) all + cd $(ITCLDIR)\Win + $(MAKE) all + cd $(ITKDIR)\Win + $(MAKE) all + +dist-install: + cd $(TCLDIR)\Win + $(MAKE) install + cd $(TKDIR)\Win + $(MAKE) install + cd $(ITCLDIR)\Win + $(MAKE) install + cd $(ITKDIR)\Win + $(MAKE) install + cd $(IWIDGETSDIR)\Win + $(MAKE) install + +dist-clean: + cd $(TCLDIR)\Win + $(MAKE) clean + cd $(TKDIR)\Win + $(MAKE) clean + cd $(ITCLDIR)\Win + $(MAKE) clean + cd $(ITKDIR)\Win + $(MAKE) clean + diff --git a/itcl/makefile.vc b/itcl/makefile.vc index d5d8e2355f..7a79939772 100644 --- a/itcl/makefile.vc +++ b/itcl/makefile.vc @@ -1,95 +1,45 @@ -# -# Visual C++ 4.1 makefile -# - -# This is the main Visual C++ makefile for the Windows distribution -# of [incr Tcl] version 3.0. To compile the distribution using Visual -# C++, copy "makefile.vc" to "makefile". Then set the macros for the -# location of the source directory, installation directory, and the -# Microsoft Compilers. You may then "make dist" to build the distribution, -# and "make dist-install" to install it to the target directory you specify -# below, and "make dist-clean" to clean up. - -# -# Project directories -# -# ROOT = top of source tree -# -# TMPDIR = location where .obj files should be stored during build -# -# TOOLS32 = location of VC++ 32-bit development tools. Note that the -# VC++ 2.0 header files are broken, so you need to use the -# ones that come with the developer network CD's, or later -# versions of VC++. -# -# INSTALLDIR = where the install- targets should copy the binaries and -# support files -# - -TOOLS32 = c:\progra~1\devstudio\vc -TOOLS32_rc = c:\progra~1\devstudio\sharedide - -SOURCE_ROOT = \ws\incrTcl -INSTALLDIR = c:\progra~1\Tcl -TCLDIR = \ws\tcl8.1 -TKDIR = \ws\tk8.1 -TCLSH = $(TCLDIR)\win\Release\tclsh81.exe - -# Set this to the appropriate value of /MACHINE: for your platform -MACHINE = IX86 - -# Set NODEBUG to 0 to compile with symbols -NODEBUG = 1 - -# uncomment one of the following lines to compile with TCL_MEM_DEBUG, -# TCL_MEM_DEBUG, or TCL_COMPILE_DEBUG -#DEBUGDEFINES = -DTCL_MEM_DEBUG -#DEBUGDEFINES = -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -#DEBUGDEFINES = -DTCL_MEM_DEBUG -DTCL_COMPILE_STATS -#DEBUGDEFINES = -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS - - -# -# You should not have to modify anything further in this makefile -# - - -MAKE = $(TOOLS32)\bin\nmake -fmakefile.vc - -# -# System calls -# - -CP = copy -RM = del -MKDIR = -mkdir - -# -# Source and Build Paths -# -ITCLDIR = $(SOURCE_ROOT)\Itcl -ITKDIR = $(SOURCE_ROOT)\Itk -IWIDGETS2DIR = $(SOURCE_ROOT)\Iwidgets2.2.0 -IWIDGETS3DIR = $(SOURCE_ROOT)\Iwidgets3.0.0 - -dist: - cd $(ITCLDIR)\Win - $(MAKE) all - cd $(ITKDIR)\Win - $(MAKE) all - -dist-install: - cd $(ITCLDIR)\Win - $(MAKE) install - cd $(ITKDIR)\Win - $(MAKE) install - cd $(IWIDGETS2DIR)\Win - $(MAKE) install - cd $(IWIDGETS3DIR)\Win - $(MAKE) install - -dist-clean: - cd $(ITCLDIR)\Win - $(MAKE) clean - cd $(ITKDIR)\Win - $(MAKE) clean +###################################################################### +# +# Microsoft Visual C++ 5.0+ makefile for [Incr Tcl/Tk]. +# +###################################################################### +# +# This is the main Visual C++ makefile for the Win32 distribution +# of [incr Tcl/Tk]. To compile the distribution using Visual C++, +# first open "config.vc" and follow the directions for editing the +# approriate values for your setup. This is not the TEA makefile. +# +###################################################################### +# $Id$ +###################################################################### + +!include "rules.vc" +!include "config.vc" + +MAKECMD = nmake.exe -nologo /$(MAKEFLAGS) -f makefile.vc + +release : + cd itcl\win + $(MAKECMD) release + cd ..\..\itk\win + $(MAKECMD) release + +docs : + @echo "ack!" + +install : + cd itcl\win + $(MAKECMD) install + cd ..\..\itk\win + $(MAKECMD) install + if exist ..\..\iwidgets\nul ( \ + cd ..\..\iwidgets\win &\ + $(MAKECMD) install \ + ) + +#dist-clean: +# cd $(ITCLDIR)\Win +# $(MAKECMD) clean +# cd $(ITKDIR)\Win +# $(MAKECMD) clean + -- 2.11.0