Itk - the [incr Tk] extension

Check-in [88cc176780]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update to latest TEA. Improve tests/all.tcl.

This file used to be https://core.tcl.tk/itk/finfo?name=configure.in

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 88cc1767804d5de4607e9cb4f021a41f1e6bab3946b4a95aa125467d97f7ff58
User & Date: stu 2018-06-18 15:42:29
Original Comment: Update to latest TEA. Improve tests/all.tcl.
Context
2018-07-21
21:53
Update to latest TEA. Make itkConfig.sh work. Closes [7bbf7d75a7]. Leaf check-in: 3f419cf802 user: stu tags: trunk
2018-06-18
15:42
Update to latest TEA. Improve tests/all.tcl.

This file used to be https://core.tcl.tk/itk/finfo?name=configure.in check-in: 88cc176780 user: stu tags: trunk

2018-06-14
12:44
Remove Max OS 9 support. check-in: bcd4e565ae user: dgp tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

     3      3   #	This file is a Makefile for Sample TEA Extension.  If it has the name
     4      4   #	"Makefile.in" then it is a template for a Makefile;  to generate the
     5      5   #	actual Makefile, run "./configure", which is a configuration script
     6      6   #	generated by the "autoconf" program (constructs like "@[email protected]" will get
     7      7   #	replaced in the actual Makefile.
     8      8   #
     9      9   # Copyright (c) 1999 Scriptics Corporation.
    10         -# Copyright (c) 2002-2004 ActiveState Corporation.
           10  +# Copyright (c) 2002-2005 ActiveState Corporation.
    11     11   #
    12     12   # See the file "license.terms" for information on usage and redistribution
    13     13   # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
           14  +
           15  +#========================================================================
           16  +# Add additional lines to handle any additional AC_SUBST cases that
           17  +# have been added in a customized configure script.
           18  +#========================================================================
           19  +
           20  +#SAMPLE_NEW_VAR	= @[email protected]
           21  +
           22  +#========================================================================
           23  +# Nothing of the variables below this line should need to be changed.
           24  +# Please check the TARGETS section below to make sure the make targets
           25  +# are correct.
           26  +#========================================================================
    14     27   
    15     28   #========================================================================
    16     29   # The names of the source files is defined in the configure script.
    17     30   # The object files are used for linking into the final library.
    18     31   # This will be used when a dist target is added to the Makefile.
    19     32   # It is not important to specify the directory, as long as it is the
    20     33   # $(srcdir) or in the generic, win or unix subdirectory.
................................................................................
    38     51   # itk.h includes itclInt.h, which needs itclIntDecls.h,
    39     52   # so we must install them.
    40     53   #========================================================================
    41     54   
    42     55   PKG_HEADERS	= @[email protected]
    43     56   
    44     57   #========================================================================
    45         -# Nothing of the variables below this line should need to be changed.
    46         -# Please check the TARGETS section below to make sure the make targets
    47         -# are correct.
    48         -#========================================================================
    49         -
    50         -itk_LIB_FILE	= @[email protected]
    51         -itkstub_LIB_FILE = @[email protected]
    52         -itclstub_LIB_FILE = @[email protected]
    53         -
    54         -#========================================================================
    55         -# Add additional lines to handle any additional AC_SUBST cases that
    56         -# have been added to the configure script.
    57         -#========================================================================
    58         -
    59         -ITK_GENERIC_DIR_NATIVE	= @[email protected]
    60         -ITK_UNIX_DIR_NATIVE	= @[email protected]
    61         -ITK_WIN_DIR_NATIVE	= @[email protected]
    62         -
    63         -#========================================================================
    64         -# Nothing of the variables below this line need to be changed.  Please
    65         -# check the TARGETS section below to make sure the make targets are
    66         -# correct.
    67         -#========================================================================
    68         -
    69         -#========================================================================
    70         -# Change the name of the variable "exampleA_LIB_FILE" to match the one
    71         -# used in the configure script.  This is the parameterized name of the
    72         -# library that we are building.
           58  +# "PKG_LIB_FILE" refers to the library (dynamic or static as per
           59  +# configuration options) composed of the named objects.
    73     60   #========================================================================
    74     61   
    75     62   PKG_LIB_FILE	= @[email protected]
    76     63   PKG_STUB_LIB_FILE = @[email protected]
    77     64   
    78     65   lib_BINARIES	= $(PKG_LIB_FILE)
    79     66   BINARIES	= $(lib_BINARIES)
................................................................................
    82     69   
    83     70   srcdir		= @[email protected]
    84     71   prefix		= @[email protected]
    85     72   exec_prefix	= @[email protected]
    86     73   
    87     74   bindir		= @[email protected]
    88     75   libdir		= @[email protected]
           76  +includedir	= @[email protected]
    89     77   datarootdir	= @[email protected]
    90     78   datadir		= @[email protected]
    91     79   mandir		= @[email protected]
    92         -includedir	= @[email protected]
    93     80   
    94     81   DESTDIR		=
    95     82   
    96     83   PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
    97     84   pkgdatadir	= $(datadir)/$(PKG_DIR)
    98     85   pkglibdir	= $(libdir)/$(PKG_DIR)
    99     86   pkgincludedir	= $(includedir)/$(PKG_DIR)
   100     87   
   101         -top_builddir	= .
           88  +top_builddir	= @[email protected]
   102     89   
   103     90   INSTALL_OPTIONS	=
   104         -INSTALL         = $(SHELL) $(srcdir)/tclconfig/install-sh -c ${INSTALL_OPTIONS}
   105         -INSTALL_PROGRAM	= ${INSTALL} -m 755
   106         -INSTALL_DATA	= ${INSTALL} -m 444
   107         -INSTALL_SCRIPT	= ${INSTALL_SCRIPT_PROGRAM}
           91  +INSTALL		= @[email protected] $(INSTALL_OPTIONS)
           92  +INSTALL_DATA_DIR = @[email protected]
           93  +INSTALL_DATA	= @[email protected]
           94  +INSTALL_PROGRAM	= @[email protected]
           95  +INSTALL_SCRIPT	= @[email protected]
           96  +INSTALL_LIBRARY	= @[email protected]
   108     97   
   109     98   PACKAGE_NAME	= @[email protected]
   110     99   PACKAGE_VERSION	= @[email protected]
   111    100   CC		= @[email protected]
   112    101   CFLAGS_DEFAULT	= @[email protected]
   113    102   CFLAGS_WARNING	= @[email protected]
   114    103   CLEANFILES	= @[email protected]
................................................................................
   121    110   OBJEXT		= @[email protected]
   122    111   RANLIB		= @[email protected]
   123    112   RANLIB_STUB	= @[email protected]
   124    113   SHLIB_CFLAGS	= @[email protected]
   125    114   SHLIB_LD	= @[email protected]
   126    115   SHLIB_LD_LIBS	= @[email protected]
   127    116   STLIB_LD	= @[email protected]
   128         -TCL_DEFS	= @[email protected]
          117  +#TCL_DEFS	= @[email protected]
   129    118   TCL_BIN_DIR	= @[email protected]
   130    119   TCL_SRC_DIR	= @[email protected]
   131    120   TK_SRC_DIR	= @[email protected]
   132    121   TK_BIN_DIR	= @[email protected]
   133    122   ITCL_TOOLS_DIR	= @[email protected]/tools
   134    123   
   135    124   # Not used, but retained for reference of what libs Tcl required
   136         -TCL_LIBS	= @[email protected]
          125  +#TCL_LIBS	= @[email protected]
   137    126   
   138    127   #========================================================================
   139    128   # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
   140    129   # package without installing.  The other environment variables allow us
   141    130   # to test against an uninstalled Tcl.  Add special env vars that you
   142    131   # require for testing here (like TCLX_LIBRARY).
   143    132   #========================================================================
   144    133   
          134  +#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
   145    135   EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
   146         -TCLSH_ENV	= TCL_LIBRARY=`@[email protected] $(TCL_SRC_DIR)/library` \
   147         -		  TK_LIBRARY=`@[email protected] $(TK_SRC_DIR)/library` \
          136  +TCLLIBPATH	= $(top_builddir) @[email protected]
          137  +TCLSH_ENV	= TCL_LIBRARY=`@[email protected] $(TCL_SRC_DIR)/library`
          138  +PKG_ENV		= @[email protected]="$(EXTRA_PATH):$(@[email protected])" \
          139  +		  PATH="$(EXTRA_PATH):$(PATH)" \
   148    140   		  ITCL_LIBRARY=`@[email protected] @[email protected]/library` \
   149    141   		  ITK_LIBRARY=`@[email protected] $(srcdir)/library` \
   150         -		  @[email protected]="$(EXTRA_PATH):$(@[email protected])" \
   151         -		  PATH="$(EXTRA_PATH):$(PATH)" \
   152         -		  TCLLIBPATH="$(top_builddir) @[email protected]"
          142  +		  TCLLIBPATH="$(TCLLIBPATH)"
          143  +
   153    144   TCLSH_PROG	= @[email protected]
          145  +TCLSH		= $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG)
          146  +
          147  +WISH_ENV	= TK_LIBRARY=`@[email protected] $(TK_SRC_DIR)/library`
   154    148   WISH_PROG	= @[email protected]
   155         -TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
   156         -WISH		= $(TCLSH_ENV) $(WISH_PROG)
          149  +WISH		= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
   157    150   
          151  +SHARED_BUILD	= @[email protected]
          152  +
          153  +#INCLUDES	= @[email protected] @[email protected]
   158    154   INCLUDES	= @[email protected] @[email protected] @[email protected] @[email protected]
   159    155   
   160    156   PKG_CFLAGS	= @[email protected]
   161    157   
   162         -DEFS		= @[email protected] $(PKG_CFLAGS) \
   163         -		  -DITK_LIBRARY=\"$(pkglibdir)\"
          158  +# TCL_DEFS is not strictly need here, but if you remove it, then you
          159  +# must make sure that configure.ac checks for the necessary components
          160  +# that your library may use.  TCL_DEFS can actually be a problem if
          161  +# you do not compile with a similar machine setup as the Tcl core was
          162  +# compiled with.
          163  +#DEFS		= $(TCL_DEFS) @[email protected] $(PKG_CFLAGS)
          164  +DEFS		= @[email protected] $(PKG_CFLAGS) -DITK_LIBRARY=\"$(pkglibdir)\"
   164    165   
   165    166   CONFIG_CLEAN_FILES = @[email protected] Makefile itkConfig.sh pkgIndex.tcl
   166    167   
   167    168   CPPFLAGS	= @[email protected]
   168    169   LIBS		= @[email protected] @[email protected]
   169    170   AR		= @[email protected]
   170    171   CFLAGS		= @[email protected]
   171    172   COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   172    173   
          174  +GDB		= gdb
          175  +VALGRIND	= valgrind
          176  +VALGRINDARGS	= --tool=memcheck --num-callers=8 --leak-resolution=high \
          177  +		  --leak-check=yes --show-reachable=yes -v
          178  +
          179  +.SUFFIXES: .c .$(OBJEXT)
          180  +
   173    181   #========================================================================
   174    182   # Start of user-definable TARGETS section
   175    183   #========================================================================
   176    184   
   177    185   #========================================================================
   178    186   # TEA TARGETS.  Please note that the "libraries:" target refers to platform
   179         -# independent files, and the "binaries:" target inclues executable programs and
          187  +# independent files, and the "binaries:" target includes executable programs and
   180    188   # platform-dependent libraries.  Modify these targets so that they install
   181    189   # the various pieces of your package.  The make and install rules
   182    190   # for the BINARIES that you specified above have already been done.
   183    191   #========================================================================
   184    192   
   185    193   all: binaries libraries doc
   186    194   
................................................................................
   191    199   # of the Makefile, in the "BINARIES" variable.
   192    200   #========================================================================
   193    201   
   194    202   binaries: $(BINARIES)
   195    203   
   196    204   libraries:
   197    205   
          206  +#========================================================================
          207  +# Your doc target should differentiate from doc builds (by the developer)
          208  +# and doc installs (see install-doc), which just install the docs on the
          209  +# end user machine when building from source.
          210  +#========================================================================
          211  +
   198    212   doc:
   199    213   
   200    214   install: all install-binaries install-libraries install-doc
   201    215   
   202    216   install-binaries: binaries install-lib-binaries install-bin-binaries
   203    217   
   204    218   #========================================================================
   205    219   # This rule installs platform-independent files, such as header files.
   206    220   #========================================================================
   207    221   
   208    222   install-libraries: libraries
   209         -	@mkdir -p $(DESTDIR)$(includedir)
          223  +	@$(INSTALL_DATA_DIR) $(DESTDIR)$(includedir)
   210    224   	@echo "Installing header files in $(DESTDIR)$(includedir)"
   211    225   	@list='$(PKG_HEADERS)'; for i in $$list; do \
   212    226   	    echo "Installing $(srcdir)/$$i" ; \
   213    227   	    $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
   214    228   	done;
   215    229   
   216    230   #========================================================================
   217    231   # Install documentation.  Unix manpages should go in the $(mandir)
   218    232   # directory.
   219    233   #========================================================================
   220    234   
   221    235   install-doc: doc
   222         -	@mkdir -p $(DESTDIR)$(mandir)/mann
   223         -	@echo "Installing man pages in $(DESTDIR)$(mandir)"
   224         -	@cd $(srcdir)/doc; for i in *.n; do \
   225         -	    echo "Installing $$i"; \
   226         -	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
   227         -	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
   228         -		$$i > $(DESTDIR)$(mandir)/mann/$$i; \
   229         -	    chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
          236  +	@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
          237  +	@echo "Installing documentation in $(DESTDIR)$(mandir)"
          238  +	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
          239  +	    if test X"$$i" = X'$(srcdir)/doc/*.n'; then break; fi; \
          240  +	    bi=`basename $$i`; \
          241  +	    echo "Installing $$bi"; \
          242  +	    sed -e '/man\.macros/r $(srcdir)/doc/man.macros' -e '/man\.macros/d' $$i > $$bi.tmp \
          243  +	    && $(INSTALL_DATA) $$bi.tmp $(DESTDIR)$(mandir)/mann/$$bi \
          244  +	    && rm -f $$bi.tmp; \
   230    245   	done
   231    246   
   232    247   test: binaries libraries
   233    248   	$(WISH) `@[email protected] $(srcdir)/tests/all.tcl` -load "package require -exact itk $(PACKAGE_VERSION)" $(TESTFLAGS)
   234    249   
   235    250   shell: binaries libraries
   236    251   	@$(WISH) $(SCRIPT)
   237    252   
   238    253   gdb:
   239         -	$(TCLSH_ENV) gdb $(WISH_PROG) $(SCRIPT)
          254  +	$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(WISH_PROG) $(SCRIPT)
          255  +
          256  +gdb-test: binaries libraries 
          257  +	$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
          258  +	    --args $(WISH_PROG) `@[email protected] $(srcdir)/tests/all.tcl` \
          259  +	    $(TESTFLAGS) -singleproc 1 \
          260  +	    -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
          261  +		[list load `@[email protected] $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
          262  +
          263  +valgrind: binaries libraries
          264  +	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) \
          265  +	    `@[email protected] $(srcdir)/tests/all.tcl` $(TESTFLAGS)
          266  +
          267  +valgrindshell: binaries libraries
          268  +	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) $(SCRIPT)
   240    269   
   241    270   depend:
   242    271   
          272  +genstubs: $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic/itk.decls
          273  +	$(TCLSH) $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic $(srcdir)/generic/itk.decls
          274  +
   243    275   #========================================================================
   244    276   # $(PKG_LIB_FILE) should be listed as part of the BINARIES variable
   245    277   # mentioned above.  That will ensure that this target is built when you
   246    278   # run "make binaries".
   247    279   #
   248    280   # The $(PKG_OBJECTS) objects are created and linked into the final
   249    281   # library.  In most cases these object files will correspond to the
................................................................................
   263    295   #========================================================================
   264    296   # We need to enumerate the list of .c to .o lines here.
   265    297   #
   266    298   # In the following lines, $(srcdir) refers to the toplevel directory
   267    299   # containing your extension.  If your sources are in a subdirectory,
   268    300   # you will have to modify the paths to reflect this:
   269    301   #
   270         -# exampleA.$(OBJEXT): $(srcdir)/src/win/exampleA.c
   271         -# 	$(COMPILE) -c `@[email protected] $(srcdir)/src/win/exampleA.c` -o [email protected]
          302  +# sample.$(OBJEXT): $(srcdir)/generic/sample.c
          303  +# 	$(COMPILE) -c `@[email protected] $(srcdir)/generic/sample.c` -o [email protected]
   272    304   #
   273    305   # Setting the VPATH variable to a list of paths will cause the makefile
   274    306   # to look into these paths when resolving .c to .obj dependencies.
   275    307   # As necessary, add $(srcdir):$(srcdir)/compat:....
   276    308   #========================================================================
   277    309   
   278    310   VPATH = $(srcdir)/unix:$(srcdir)/generic:$(srcdir)/win
   279    311   
   280         -.c.$(OBJEXT):
          312  +[email protected]@:
   281    313   	$(COMPILE) -c `@[email protected] $<` -o [email protected]
   282    314   
   283    315   #========================================================================
   284    316   # Distribution creation
   285    317   # You may need to tweak this target to make it work correctly.
   286    318   #========================================================================
   287    319   
   288         -TAR		= tar
   289         -#COMPRESS       = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
   290         -COMPRESS        = $(TAR) zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
   291         -DIST_ROOT       = /tmp/dist
   292         -DIST_DIR        = $(DIST_ROOT)/$(PKG_DIR)
          320  +#COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
          321  +COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
          322  +DIST_ROOT	= /tmp/dist
          323  +DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
          324  +
          325  +DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
          326  +DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
   293    327   
   294    328   dist-clean:
   295    329   	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
   296    330   
   297         -dist: dist-clean doc
   298         -	mkdir -p $(DIST_DIR)
   299         -	cp -p $(srcdir)/license* $(srcdir)/aclocal.m4 $(srcdir)/configure \
   300         -		$(srcdir)/*.in  $(DIST_DIR)/
   301         -	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
   302         -	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in
          331  +dist: dist-clean
          332  +	$(INSTALL_DATA_DIR) $(DIST_DIR)
   303    333   
   304         -	mkdir $(DIST_DIR)/tclconfig
   305         -	cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
   306         -		$(DIST_DIR)/tclconfig/
   307         -	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
   308         -	chmod +x $(DIST_DIR)/tclconfig/install-sh
          334  +	# TEA files
          335  +	$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
          336  +	    $(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
          337  +	    $(DIST_DIR)/
          338  +	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
          339  +
          340  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
          341  +	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
          342  +	    $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
          343  +	    $(DIST_DIR)/tclconfig/
          344  +
          345  +	# Extension files
          346  +	$(DIST_INSTALL_DATA) \
          347  +	    $(srcdir)/ChangeLog \
          348  +	    $(srcdir)/license.terms \
          349  +	    $(srcdir)/pkgIndex.tcl.in \
          350  +	    $(srcdir)/itkConfig.sh.in \
          351  +	    $(DIST_DIR)/
   309    352   
   310    353   	list='demos doc examples generic library tests win win/rc'; \
   311    354   	for p in $$list; do \
   312         -	    if test -d $(srcdir)/$$p ; then \
   313         -		mkdir $(DIST_DIR)/$$p; \
   314         -		for q in $(srcdir)/$$p/*; do \
   315         -		    if test -f $$q ; then \
   316         -			cp -p $$q $(DIST_DIR)/$$p/; \
   317         -		    fi; \
   318         -		done; \
   319         -	    fi; \
   320         -	done
   321         -
   322         -	list='CHANGES ChangeLog INCOMPATIBLE README TODO'; \
   323         -	for p in $$list; do \
   324         -	    if test -f $(srcdir)/../$$p ; then \
   325         -		cp -p $(srcdir)/../$$p $(DIST_DIR)/; \
   326         -	    fi; \
          355  +	    $(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \
          356  +	    for f in $(srcdir)/$$p/*; do \
          357  +		if ! test -f $$f; then continue; fi; \
          358  +		$(DIST_INSTALL_DATA) $$f $(DIST_DIR)/$$p/; \
          359  +	    done; \
   327    360   	done
   328    361   
   329    362   	(cd $(DIST_ROOT); $(COMPRESS);)
   330    363   
   331    364   #========================================================================
   332    365   # End of user-definable section
   333    366   #========================================================================
   334    367   
   335    368   #========================================================================
   336    369   # Don't modify the file to clean here.  Instead, set the "CLEANFILES"
   337         -# variable in configure.in
          370  +# variable in configure.ac
   338    371   #========================================================================
   339    372   
   340         -clean:  
          373  +clean:
   341    374   	-test -z "$(BINARIES)" || rm -f $(BINARIES)
   342         -	-rm -f *.o core *.core
   343         -	-rm -f *.$(OBJEXT)
          375  +	-rm -f *.$(OBJEXT) core *.core
   344    376   	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
   345    377   
   346    378   distclean: clean
   347    379   	-rm -f *.tab.c
   348    380   	-rm -f $(CONFIG_CLEAN_FILES)
   349    381   	-rm -f config.cache config.log config.status
   350    382   
   351    383   #========================================================================
   352    384   # Install binary object libraries.  On Windows this includes both .dll and
   353    385   # .lib files.  Because the .lib files are not explicitly listed anywhere,
   354    386   # we need to deduce their existence from the .dll file of the same name.
   355         -# Additionally, the .dll files go into the bin directory, but the .lib
   356         -# files go into the lib directory.  On Unix platforms, all library files
   357         -# go into the lib directory.  In addition, this will generate the pkgIndex.tcl
   358         -# file in the install location (assuming it can find a usable tclsh8.2 shell)
          387  +# Library files go into the lib directory.
          388  +# In addition, this will generate the pkgIndex.tcl
          389  +# file in the install location (assuming it can find a usable tclsh shell)
   359    390   #
   360    391   # You should not have to modify this target.
   361    392   #========================================================================
   362    393   
   363         -install-lib-binaries:
   364         -	@mkdir -p $(DESTDIR)$(pkglibdir)
          394  +install-lib-binaries: binaries
          395  +	@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
   365    396   	@list='$(lib_BINARIES)'; for p in $$list; do \
   366    397   	  if test -f $$p; then \
   367         -	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
   368         -	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
   369         -	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
   370         -	    if test "x$$stub" = "xstub"; then \
   371         -		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
   372         -		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
   373         -	    else \
   374         -		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
   375         -		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
   376         -	    fi; \
          398  +	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
          399  +	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
   377    400   	    ext=`echo $$p|sed -e "s/.*\.//"`; \
   378    401   	    if test "x$$ext" = "xdll"; then \
   379    402   		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
   380    403   		if test -f $$lib; then \
   381    404   		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
   382    405   	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
   383    406   		fi; \
................................................................................
   387    410   	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
   388    411   	  if test -f $(srcdir)/$$p; then \
   389    412   	    destp=`basename $$p`; \
   390    413   	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
   391    414   	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
   392    415   	  fi; \
   393    416   	done
   394         -	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
   395         -	: $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir)
          417  +	@if test "x$(SHARED_BUILD)" = "x1"; then \
          418  +	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
          419  +	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
          420  +	fi
          421  +	: $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(pkglibdir)
   396    422   
   397    423   #========================================================================
   398         -# Install binary executables (e.g. .exe files)
          424  +# Install binary executables (e.g. .exe files and dependent .dll files)
          425  +# This is for files that must go in the bin directory (located next to
          426  +# wish and tclsh), like dependent .dll files on Windows.
   399    427   #
   400         -# You should not have to modify this target.
          428  +# You should not have to modify this target, except to define bin_BINARIES
          429  +# above if necessary.
   401    430   #========================================================================
   402    431   
   403         -install-bin-binaries:
   404         -	@mkdir -p $(DESTDIR)$(bindir)
          432  +install-bin-binaries: binaries
          433  +	@$(INSTALL_DATA_DIR) $(DESTDIR)$(bindir)
   405    434   	@list='$(bin_BINARIES)'; for p in $$list; do \
   406    435   	  if test -f $$p; then \
   407    436   	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
   408    437   	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
   409    438   	  fi; \
   410    439   	done
   411    440   
   412         -.SUFFIXES: .c .$(OBJEXT)
   413         -
   414    441   Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
   415    442   	cd $(top_builddir) \
   416    443   	  && [email protected] CONFIG_HEADERS= $(SHELL) ./config.status
   417    444   
   418    445   uninstall-binaries:
   419    446   	list='$(lib_BINARIES)'; for p in $$list; do \
   420    447   	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
................................................................................
   423    450   	  p=`basename $$p`; \
   424    451   	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
   425    452   	done
   426    453   	list='$(bin_BINARIES)'; for p in $$list; do \
   427    454   	  rm -f $(DESTDIR)$(bindir)/$$p; \
   428    455   	done
   429    456   
   430         -genstubs: $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic/itk.decls
   431         -	@echo $(TCLSH) $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic $(srcdir)/generic/itk.decls
   432         -	@$(TCLSH) $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic $(srcdir)/generic/itk.decls
   433         -
   434    457   .PHONY: all binaries clean depend distclean doc install libraries test
          458  +.PHONY: gdb gdb-test valgrind valgrindshell
          459  +.PHONY: genstubs
   435    460   
   436    461   # Tell versions [3.59,3.63) of GNU make to not export all variables.
   437    462   # Otherwise a system limit (for SysV at least) may be exceeded.
   438    463   .NOEXPORT:

Changes to aclocal.m4.

            1  +#
            2  +# Include the TEA standard macro set
            3  +#
            4  +
     1      5   builtin(include,tclconfig/tcl.m4)
            6  +
            7  +#
            8  +# Add here whatever m4 macros you want to define for your package
            9  +#

Changes to configure.

   618    618   # include <unistd.h>
   619    619   #endif"
   620    620   
   621    621   ac_subst_vars='LTLIBOBJS
   622    622   LIBOBJS
   623    623   WISH_PROG
   624    624   TCLSH_PROG
   625         -itk_LIB_FILE
   626         -itkstub_LIB_FILE
   627    625   VC_MANIFEST_EMBED_EXE
   628    626   VC_MANIFEST_EMBED_DLL
   629    627   RANLIB_STUB
   630    628   MAKE_STUB_LIB
   631    629   MAKE_STATIC_LIB
   632    630   MAKE_SHARED_LIB
   633    631   MAKE_LIB
................................................................................
   641    639   STLIB_LD
   642    640   CFLAGS_WARNING
   643    641   CFLAGS_OPTIMIZE
   644    642   CFLAGS_DEBUG
   645    643   RC
   646    644   CELIB_DIR
   647    645   AR
          646  +STUBS_BUILD
   648    647   SHARED_BUILD
   649    648   XMKMF
   650    649   TK_INCLUDES
   651    650   TCL_TOP_DIR_NATIVE
   652    651   TCL_INCLUDES
   653    652   PKG_OBJECTS
   654    653   PKG_SOURCES
   655         -MATH_LIBS
   656    654   EGREP
   657    655   GREP
   658    656   RANLIB
   659    657   SET_MAKE
   660         -INSTALL_LIBRARY
   661         -INSTALL_SCRIPT
   662         -INSTALL_PROGRAM
   663         -INSTALL_DATA
   664         -INSTALL_DATA_DIR
   665         -INSTALL
   666    658   CPP
   667    659   itcl_STUB_LIB_PATH
   668    660   itcl_STUB_LIB_SPEC
   669    661   itcl_STUB_LIB_FILE
   670    662   itcl_LIB_SPEC
   671    663   itcl_LIB_FILE
   672    664   itcl_SRC_DIR
................................................................................
   703    695   TCL_LIB_FILE
   704    696   TCL_SRC_DIR
   705    697   TCL_BIN_DIR
   706    698   TCL_PATCH_LEVEL
   707    699   TCL_VERSION
   708    700   CONFIG_CLEAN_FILES
   709    701   LN_S
          702  +INSTALL_LIBRARY
          703  +INSTALL_SCRIPT
          704  +INSTALL_PROGRAM
          705  +INSTALL_DATA
          706  +INSTALL_DATA_DIR
          707  +INSTALL
   710    708   PKG_CFLAGS
   711    709   PKG_LIBS
   712    710   PKG_INCLUDES
   713    711   PKG_HEADERS
   714    712   PKG_TCL_SOURCES
   715    713   PKG_STUB_OBJECTS
   716    714   PKG_STUB_SOURCES
................................................................................
   762    760   with_tcl
   763    761   with_tk
   764    762   with_itcl
   765    763   with_tclinclude
   766    764   with_tkinclude
   767    765   with_x
   768    766   enable_shared
          767  +enable_stubs
   769    768   enable_64bit
   770    769   enable_64bit_vis
   771    770   enable_rpath
   772    771   enable_wince
   773    772   with_celib
   774    773   enable_symbols
   775    774   '
................................................................................
  1393   1392     cat <<\_ACEOF
  1394   1393   
  1395   1394   Optional Features:
  1396   1395     --disable-option-checking  ignore unrecognized --enable/--with options
  1397   1396     --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  1398   1397     --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  1399   1398     --enable-shared         build and link with shared libraries (default: on)
         1399  +  --enable-stubs          build and link with stub libraries. Always true for
         1400  +                          shared builds (default: on)
  1400   1401     --enable-64bit          enable 64bit support (default: off)
  1401   1402     --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
  1402   1403     --disable-rpath         disable rpath support (default: on)
  1403   1404     --enable-wince          enable Win/CE support (where applicable)
  1404   1405     --enable-symbols        build with debugging symbols (default: off)
  1405   1406   
  1406   1407   Optional Packages:
................................................................................
  1762   1763   fi
  1763   1764   eval ac_res=\$$3
  1764   1765   	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1765   1766   $as_echo "$ac_res" >&6; }
  1766   1767     eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1767   1768   
  1768   1769   } # ac_fn_c_check_func
  1769         -
  1770         -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
  1771         -# -------------------------------------------------------
  1772         -# Tests whether HEADER exists, giving a warning if it cannot be compiled using
  1773         -# the include files in INCLUDES and setting the cache variable VAR
  1774         -# accordingly.
  1775         -ac_fn_c_check_header_mongrel ()
  1776         -{
  1777         -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1778         -  if eval \${$3+:} false; then :
  1779         -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  1780         -$as_echo_n "checking for $2... " >&6; }
  1781         -if eval \${$3+:} false; then :
  1782         -  $as_echo_n "(cached) " >&6
  1783         -fi
  1784         -eval ac_res=\$$3
  1785         -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1786         -$as_echo "$ac_res" >&6; }
  1787         -else
  1788         -  # Is the header compilable?
  1789         -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
  1790         -$as_echo_n "checking $2 usability... " >&6; }
  1791         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1792         -/* end confdefs.h.  */
  1793         -$4
  1794         -#include <$2>
  1795         -_ACEOF
  1796         -if ac_fn_c_try_compile "$LINENO"; then :
  1797         -  ac_header_compiler=yes
  1798         -else
  1799         -  ac_header_compiler=no
  1800         -fi
  1801         -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  1802         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
  1803         -$as_echo "$ac_header_compiler" >&6; }
  1804         -
  1805         -# Is the header present?
  1806         -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
  1807         -$as_echo_n "checking $2 presence... " >&6; }
  1808         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1809         -/* end confdefs.h.  */
  1810         -#include <$2>
  1811         -_ACEOF
  1812         -if ac_fn_c_try_cpp "$LINENO"; then :
  1813         -  ac_header_preproc=yes
  1814         -else
  1815         -  ac_header_preproc=no
  1816         -fi
  1817         -rm -f conftest.err conftest.i conftest.$ac_ext
  1818         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  1819         -$as_echo "$ac_header_preproc" >&6; }
  1820         -
  1821         -# So?  What about this header?
  1822         -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
  1823         -  yes:no: )
  1824         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
  1825         -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
  1826         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  1827         -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  1828         -    ;;
  1829         -  no:yes:* )
  1830         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
  1831         -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
  1832         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
  1833         -$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
  1834         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
  1835         -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
  1836         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
  1837         -$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
  1838         -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  1839         -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  1840         -    ;;
  1841         -esac
  1842         -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  1843         -$as_echo_n "checking for $2... " >&6; }
  1844         -if eval \${$3+:} false; then :
  1845         -  $as_echo_n "(cached) " >&6
  1846         -else
  1847         -  eval "$3=\$ac_header_compiler"
  1848         -fi
  1849         -eval ac_res=\$$3
  1850         -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1851         -$as_echo "$ac_res" >&6; }
  1852         -fi
  1853         -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1854         -
  1855         -} # ac_fn_c_check_header_mongrel
  1856   1770   cat >config.log <<_ACEOF
  1857   1771   This file contains any messages produced by compilers while
  1858   1772   running configure, to aid debugging if configure makes a mistake.
  1859   1773   
  1860   1774   It was created by itk $as_me 4.1.0, which was
  1861   1775   generated by GNU Autoconf 2.69.  Invocation command line was
  1862   1776   
................................................................................
  2209   2123   #--------------------------------------------------------------------
  2210   2124   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
  2211   2125   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
  2212   2126   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
  2213   2127   #--------------------------------------------------------------------
  2214   2128   
  2215   2129   
  2216         -    # TEA extensions pass this us the version of TEA they think they
  2217         -    # are compatible with.
  2218         -    TEA_VERSION="3.9"
         2130  +    TEA_VERSION="3.13"
  2219   2131   
  2220         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
  2221         -$as_echo_n "checking for correct TEA configuration... " >&6; }
         2132  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
         2133  +$as_echo_n "checking TEA configuration... " >&6; }
  2222   2134       if test x"${PACKAGE_NAME}" = x ; then
  2223   2135   	as_fn_error $? "
  2224   2136   The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
  2225   2137       fi
  2226         -    if test x"3.9" = x ; then
  2227         -	as_fn_error $? "
  2228         -TEA version not specified." "$LINENO" 5
  2229         -    elif test "3.9" != "${TEA_VERSION}" ; then
  2230         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&5
  2231         -$as_echo "warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&6; }
  2232         -    else
  2233         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
         2138  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
  2234   2139   $as_echo "ok (TEA ${TEA_VERSION})" >&6; }
  2235         -    fi
  2236   2140   
  2237   2141       # If the user did not set CFLAGS, set it now to keep macros
  2238   2142       # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
  2239   2143       if test "${CFLAGS+set}" != "set" ; then
  2240   2144   	CFLAGS=""
  2241   2145       fi
  2242   2146   
  2243   2147       case "`uname -s`" in
  2244         -	*win32*|*WIN32*|*MINGW32_*)
         2148  +	*win32*|*WIN32*|*MINGW32_*|*MINGW64_*)
  2245   2149   	    # Extract the first word of "cygpath", so it can be a program name with args.
  2246   2150   set dummy cygpath; ac_word=$2
  2247   2151   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2248   2152   $as_echo_n "checking for $ac_word... " >&6; }
  2249   2153   if ${ac_cv_prog_CYGPATH+:} false; then :
  2250   2154     $as_echo_n "(cached) " >&6
  2251   2155   else
................................................................................
  2329   2233   
  2330   2234   
  2331   2235   
  2332   2236   
  2333   2237   
  2334   2238   
  2335   2239   
         2240  +    # Configure the installer.
         2241  +
         2242  +    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
         2243  +    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
         2244  +    INSTALL_DATA='${INSTALL} -m 644'
         2245  +    INSTALL_PROGRAM='${INSTALL} -m 755'
         2246  +    INSTALL_SCRIPT='${INSTALL} -m 755'
         2247  +
         2248  +
         2249  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
         2250  +$as_echo_n "checking system version... " >&6; }
         2251  +if ${tcl_cv_sys_version+:} false; then :
         2252  +  $as_echo_n "(cached) " >&6
         2253  +else
         2254  +
         2255  +	# TEA specific:
         2256  +	if test "${TEA_PLATFORM}" = "windows" ; then
         2257  +	    tcl_cv_sys_version=windows
         2258  +	else
         2259  +	    tcl_cv_sys_version=`uname -s`-`uname -r`
         2260  +	    if test "$?" -ne 0 ; then
         2261  +		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5
         2262  +$as_echo "$as_me: WARNING: can't find uname command" >&2;}
         2263  +		tcl_cv_sys_version=unknown
         2264  +	    else
         2265  +		if test "`uname -s`" = "AIX" ; then
         2266  +		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
         2267  +		fi
         2268  +	    fi
         2269  +	fi
         2270  +
         2271  +fi
         2272  +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5
         2273  +$as_echo "$tcl_cv_sys_version" >&6; }
         2274  +    system=$tcl_cv_sys_version
         2275  +
         2276  +    case $system in
         2277  +	HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;;
         2278  +	      *) INSTALL_LIBRARY='${INSTALL} -m 644' ;;
         2279  +    esac
         2280  +
         2281  +
         2282  +
         2283  +
         2284  +
         2285  +
         2286  +
         2287  +
         2288  +
         2289  +
         2290  +#--------------------------------------------------------------------
         2291  +# Try to ensure the existence of a tclconfig directory in either
         2292  +# $srcdir or the current dir, if one can't be found in $srcdir.
         2293  +# If this package is being built as part of a bundle then a tclconfig
         2294  +# directory might exist in $srcdir's parent directory.
         2295  +#--------------------------------------------------------------------
  2336   2296   
  2337   2297   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
  2338   2298   $as_echo_n "checking whether ln -s works... " >&6; }
  2339   2299   LN_S=$as_ln_s
  2340   2300   if test "$LN_S" = "ln -s"; then
  2341   2301     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  2342   2302   $as_echo "yes" >&6; }
................................................................................
  2344   2304     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
  2345   2305   $as_echo "no, using $LN_S" >&6; }
  2346   2306   fi
  2347   2307   
  2348   2308   CONFIG_CLEAN_FILES=
  2349   2309   if test ! -d $srcdir/tclconfig ; then
  2350   2310       if test -d $srcdir/../tclconfig ; then
  2351         -        $LN_S $srcdir/../tclconfig tclconfig
         2311  +	$LN_S $srcdir/../tclconfig tclconfig
  2352   2312   	CONFIG_CLEAN_FILES=tclconfig
  2353   2313       fi
  2354   2314   fi
  2355   2315   
         2316  +
         2317  +#--------------------------------------------------------------------
         2318  +# Tell autoconf where to find tcl.m4 and install.sh.
         2319  +#--------------------------------------------------------------------
  2356   2320   
  2357   2321   ac_aux_dir=
  2358   2322   for ac_dir in tclconfig "$srcdir"/tclconfig; do
  2359   2323     if test -f "$ac_dir/install-sh"; then
  2360   2324       ac_aux_dir=$ac_dir
  2361   2325       ac_install_sh="$ac_aux_dir/install-sh -c"
  2362   2326       break
................................................................................
  2484   2448   	    fi
  2485   2449   
  2486   2450   	    # check in a few common install locations
  2487   2451   	    if test x"${ac_cv_c_tclconfig}" = x ; then
  2488   2452   		for i in `ls -d ${libdir} 2>/dev/null` \
  2489   2453   			`ls -d ${exec_prefix}/lib 2>/dev/null` \
  2490   2454   			`ls -d ${prefix}/lib 2>/dev/null` \
  2491         -			`ls -d /usr/local/lib 2>/dev/null` \
  2492   2455   			`ls -d /usr/contrib/lib 2>/dev/null` \
         2456  +			`ls -d /usr/local/lib 2>/dev/null` \
         2457  +			`ls -d /usr/pkg/lib 2>/dev/null` \
  2493   2458   			`ls -d /usr/lib 2>/dev/null` \
  2494   2459   			`ls -d /usr/lib64 2>/dev/null` \
  2495   2460   			`ls -d /usr/lib/tcl8.6 2>/dev/null` \
  2496   2461   			`ls -d /usr/lib/tcl8.5 2>/dev/null` \
         2462  +			`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
         2463  +			`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
         2464  +			`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
         2465  +			`ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
  2497   2466   			; do
  2498   2467   		    if test -f "$i/tclConfig.sh" ; then
  2499   2468   			ac_cv_c_tclconfig="`(cd $i; pwd)`"
  2500   2469   			break
  2501   2470   		    fi
  2502   2471   		done
  2503   2472   	    fi
................................................................................
  3484   3453   
  3485   3454   
  3486   3455   
  3487   3456   
  3488   3457   
  3489   3458   
  3490   3459   #--------------------------------------------------------------------
  3491         -# Load the tkConfig.sh file
         3460  +# Load the tkConfig.sh file if necessary (Tk extension)
  3492   3461   #--------------------------------------------------------------------
  3493   3462   
  3494   3463   
  3495   3464       #
  3496   3465       # Ok, lets find the tk configuration
  3497   3466       # First, look for one uninstalled.
  3498   3467       # the alternative search directory is invoked by --with-tk
................................................................................
  3573   3542   	    fi
  3574   3543   
  3575   3544   	    # check in a few common install locations
  3576   3545   	    if test x"${ac_cv_c_tkconfig}" = x ; then
  3577   3546   		for i in `ls -d ${libdir} 2>/dev/null` \
  3578   3547   			`ls -d ${exec_prefix}/lib 2>/dev/null` \
  3579   3548   			`ls -d ${prefix}/lib 2>/dev/null` \
  3580         -			`ls -d /usr/local/lib 2>/dev/null` \
  3581   3549   			`ls -d /usr/contrib/lib 2>/dev/null` \
         3550  +			`ls -d /usr/local/lib 2>/dev/null` \
         3551  +			`ls -d /usr/pkg/lib 2>/dev/null` \
  3582   3552   			`ls -d /usr/lib 2>/dev/null` \
  3583   3553   			`ls -d /usr/lib64 2>/dev/null` \
         3554  +			`ls -d /usr/lib/tk8.6 2>/dev/null` \
         3555  +			`ls -d /usr/lib/tk8.5 2>/dev/null` \
         3556  +			`ls -d /usr/local/lib/tk8.6 2>/dev/null` \
         3557  +			`ls -d /usr/local/lib/tk8.5 2>/dev/null` \
         3558  +			`ls -d /usr/local/lib/tcl/tk8.6 2>/dev/null` \
         3559  +			`ls -d /usr/local/lib/tcl/tk8.5 2>/dev/null` \
  3584   3560   			; do
  3585   3561   		    if test -f "$i/tkConfig.sh" ; then
  3586   3562   			ac_cv_c_tkconfig="`(cd $i; pwd)`"
  3587   3563   			break
  3588   3564   		    fi
  3589   3565   		done
  3590   3566   	    fi
................................................................................
  3720   3696   
  3721   3697   
  3722   3698   
  3723   3699       # TEA specific:
  3724   3700   
  3725   3701   
  3726   3702   
         3703  +
         3704  +#--------------------------------------------------------------------
         3705  +# Load the itclConfig.sh file
         3706  +#--------------------------------------------------------------------
  3727   3707   
  3728   3708   
  3729   3709       #
  3730   3710       # Ok, lets find the itcl configuration
  3731   3711       # First, look for one uninstalled.
  3732   3712       # the alternative search directory is invoked by --with-itcl
  3733   3713       #
................................................................................
  3971   3951   fi
  3972   3952   
  3973   3953   fi
  3974   3954   
  3975   3955   
  3976   3956   ITCL_INCLUDES="-I\"`${CYGPATH} ${itcl_SRC_DIR}/generic`\""
  3977   3957   
  3978         -#--------------------------------------------------------------------
         3958  +#-----------------------------------------------------------------------
  3979   3959   # Handle the --prefix=... option by defaulting to what Tcl gave.
  3980         -# Must be called after TEA_LOAD_TCLCONFIG and before $prefix is used.
  3981         -#--------------------------------------------------------------------
         3960  +# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
         3961  +#-----------------------------------------------------------------------
  3982   3962   
  3983   3963   
  3984   3964       if test "${prefix}" = "NONE"; then
  3985   3965   	prefix_default=yes
  3986   3966   	if test x"${TCL_PREFIX}" != x; then
  3987   3967   	    { $as_echo "$as_me:${as_lineno-$LINENO}: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&5
  3988   3968   $as_echo "$as_me: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&6;}
................................................................................
  4003   3983   	    { $as_echo "$as_me:${as_lineno-$LINENO}: --exec-prefix defaulting to ${prefix}" >&5
  4004   3984   $as_echo "$as_me: --exec-prefix defaulting to ${prefix}" >&6;}
  4005   3985   	    exec_prefix=$prefix
  4006   3986   	fi
  4007   3987       fi
  4008   3988   
  4009   3989   
  4010         -#------------------------------------------------------------------------
         3990  +#-----------------------------------------------------------------------
  4011   3991   # Standard compiler checks.
  4012   3992   # This sets up CC by using the CC env var, or looks for gcc otherwise.
  4013         -# This also calls AC_PROG_CC, AC_PROG_INSTALL and a few others to create
  4014         -# the basic setup necessary to compile executables.
  4015         -#------------------------------------------------------------------------
         3993  +# This also calls AC_PROG_CC and a few others to create the basic setup
         3994  +# necessary to compile executables.
         3995  +#-----------------------------------------------------------------------
  4016   3996   
  4017   3997   
  4018   3998       # Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE)
  4019   3999       # in this macro, they need to go into TEA_SETUP_COMPILER instead.
  4020   4000   
  4021   4001       ac_ext=c
  4022   4002   ac_cpp='$CPP $CPPFLAGS'
................................................................................
  4690   4670   
  4691   4671   ac_ext=c
  4692   4672   ac_cpp='$CPP $CPPFLAGS'
  4693   4673   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  4694   4674   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  4695   4675   ac_compiler_gnu=$ac_cv_c_compiler_gnu
  4696   4676   
  4697         -
  4698         -    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
  4699         -    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
  4700         -    INSTALL_DATA='${INSTALL} -m 644'
  4701         -    INSTALL_PROGRAM='${INSTALL}'
  4702         -    INSTALL_SCRIPT='${INSTALL}'
  4703         -    INSTALL_LIBRARY='${INSTALL_DATA}'
  4704         -
  4705         -
  4706         -
  4707         -
  4708         -
  4709         -
  4710         -
  4711   4677   
  4712   4678       #--------------------------------------------------------------------
  4713   4679       # Checks to see if the make program sets the $MAKE variable.
  4714   4680       #--------------------------------------------------------------------
  4715   4681   
  4716   4682       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  4717   4683   $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
................................................................................
  5376   5342   
  5377   5343        ;; #(
  5378   5344      *)
  5379   5345        as_fn_error $? "unknown endianness
  5380   5346    presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  5381   5347    esac
  5382   5348   
  5383         -    if test "${TEA_PLATFORM}" = "unix" ; then
  5384         -
  5385         -    #--------------------------------------------------------------------
  5386         -    # On a few very rare systems, all of the libm.a stuff is
  5387         -    # already in libc.a.  Set compiler flags accordingly.
  5388         -    # Also, Linux requires the "ieee" library for math to work
  5389         -    # right (and it must appear before "-lm").
  5390         -    #--------------------------------------------------------------------
  5391         -
  5392         -    ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
  5393         -if test "x$ac_cv_func_sin" = xyes; then :
  5394         -  MATH_LIBS=""
  5395         -else
  5396         -  MATH_LIBS="-lm"
  5397         -fi
  5398         -
  5399         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lieee" >&5
  5400         -$as_echo_n "checking for main in -lieee... " >&6; }
  5401         -if ${ac_cv_lib_ieee_main+:} false; then :
  5402         -  $as_echo_n "(cached) " >&6
  5403         -else
  5404         -  ac_check_lib_save_LIBS=$LIBS
  5405         -LIBS="-lieee  $LIBS"
  5406         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5407         -/* end confdefs.h.  */
  5408         -
  5409         -
  5410         -int
  5411         -main ()
  5412         -{
  5413         -return main ();
  5414         -  ;
  5415         -  return 0;
  5416         -}
  5417         -_ACEOF
  5418         -if ac_fn_c_try_link "$LINENO"; then :
  5419         -  ac_cv_lib_ieee_main=yes
  5420         -else
  5421         -  ac_cv_lib_ieee_main=no
  5422         -fi
  5423         -rm -f core conftest.err conftest.$ac_objext \
  5424         -    conftest$ac_exeext conftest.$ac_ext
  5425         -LIBS=$ac_check_lib_save_LIBS
  5426         -fi
  5427         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee_main" >&5
  5428         -$as_echo "$ac_cv_lib_ieee_main" >&6; }
  5429         -if test "x$ac_cv_lib_ieee_main" = xyes; then :
  5430         -  MATH_LIBS="-lieee $MATH_LIBS"
  5431         -fi
  5432         -
  5433         -
  5434         -    #--------------------------------------------------------------------
  5435         -    # Interactive UNIX requires -linet instead of -lsocket, plus it
  5436         -    # needs net/errno.h to define the socket-related error codes.
  5437         -    #--------------------------------------------------------------------
  5438         -
  5439         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -linet" >&5
  5440         -$as_echo_n "checking for main in -linet... " >&6; }
  5441         -if ${ac_cv_lib_inet_main+:} false; then :
  5442         -  $as_echo_n "(cached) " >&6
  5443         -else
  5444         -  ac_check_lib_save_LIBS=$LIBS
  5445         -LIBS="-linet  $LIBS"
  5446         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5447         -/* end confdefs.h.  */
  5448         -
  5449         -
  5450         -int
  5451         -main ()
  5452         -{
  5453         -return main ();
  5454         -  ;
  5455         -  return 0;
  5456         -}
  5457         -_ACEOF
  5458         -if ac_fn_c_try_link "$LINENO"; then :
  5459         -  ac_cv_lib_inet_main=yes
  5460         -else
  5461         -  ac_cv_lib_inet_main=no
  5462         -fi
  5463         -rm -f core conftest.err conftest.$ac_objext \
  5464         -    conftest$ac_exeext conftest.$ac_ext
  5465         -LIBS=$ac_check_lib_save_LIBS
  5466         -fi
  5467         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_main" >&5
  5468         -$as_echo "$ac_cv_lib_inet_main" >&6; }
  5469         -if test "x$ac_cv_lib_inet_main" = xyes; then :
  5470         -  LIBS="$LIBS -linet"
  5471         -fi
  5472         -
  5473         -    ac_fn_c_check_header_mongrel "$LINENO" "net/errno.h" "ac_cv_header_net_errno_h" "$ac_includes_default"
  5474         -if test "x$ac_cv_header_net_errno_h" = xyes; then :
  5475         -
  5476         -
  5477         -$as_echo "#define HAVE_NET_ERRNO_H 1" >>confdefs.h
  5478         -
  5479         -fi
  5480         -
  5481         -
  5482         -
  5483         -    #--------------------------------------------------------------------
  5484         -    #	Check for the existence of the -lsocket and -lnsl libraries.
  5485         -    #	The order here is important, so that they end up in the right
  5486         -    #	order in the command line generated by make.  Here are some
  5487         -    #	special considerations:
  5488         -    #	1. Use "connect" and "accept" to check for -lsocket, and
  5489         -    #	   "gethostbyname" to check for -lnsl.
  5490         -    #	2. Use each function name only once:  can't redo a check because
  5491         -    #	   autoconf caches the results of the last check and won't redo it.
  5492         -    #	3. Use -lnsl and -lsocket only if they supply procedures that
  5493         -    #	   aren't already present in the normal libraries.  This is because
  5494         -    #	   IRIX 5.2 has libraries, but they aren't needed and they're
  5495         -    #	   bogus:  they goof up name resolution if used.
  5496         -    #	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
  5497         -    #	   To get around this problem, check for both libraries together
  5498         -    #	   if -lsocket doesn't work by itself.
  5499         -    #--------------------------------------------------------------------
  5500         -
  5501         -    tcl_checkBoth=0
  5502         -    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
  5503         -if test "x$ac_cv_func_connect" = xyes; then :
  5504         -  tcl_checkSocket=0
  5505         -else
  5506         -  tcl_checkSocket=1
  5507         -fi
  5508         -
  5509         -    if test "$tcl_checkSocket" = 1; then
  5510         -	ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt"
  5511         -if test "x$ac_cv_func_setsockopt" = xyes; then :
  5512         -
  5513         -else
  5514         -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5
  5515         -$as_echo_n "checking for setsockopt in -lsocket... " >&6; }
  5516         -if ${ac_cv_lib_socket_setsockopt+:} false; then :
  5517         -  $as_echo_n "(cached) " >&6
  5518         -else
  5519         -  ac_check_lib_save_LIBS=$LIBS
  5520         -LIBS="-lsocket  $LIBS"
  5521         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5522         -/* end confdefs.h.  */
  5523         -
  5524         -/* Override any GCC internal prototype to avoid an error.
  5525         -   Use char because int might match the return type of a GCC
  5526         -   builtin and then its argument prototype would still apply.  */
  5527         -#ifdef __cplusplus
  5528         -extern "C"
  5529         -#endif
  5530         -char setsockopt ();
  5531         -int
  5532         -main ()
  5533         -{
  5534         -return setsockopt ();
  5535         -  ;
  5536         -  return 0;
  5537         -}
  5538         -_ACEOF
  5539         -if ac_fn_c_try_link "$LINENO"; then :
  5540         -  ac_cv_lib_socket_setsockopt=yes
  5541         -else
  5542         -  ac_cv_lib_socket_setsockopt=no
  5543         -fi
  5544         -rm -f core conftest.err conftest.$ac_objext \
  5545         -    conftest$ac_exeext conftest.$ac_ext
  5546         -LIBS=$ac_check_lib_save_LIBS
  5547         -fi
  5548         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5
  5549         -$as_echo "$ac_cv_lib_socket_setsockopt" >&6; }
  5550         -if test "x$ac_cv_lib_socket_setsockopt" = xyes; then :
  5551         -  LIBS="$LIBS -lsocket"
  5552         -else
  5553         -  tcl_checkBoth=1
  5554         -fi
  5555         -
  5556         -fi
  5557         -
  5558         -    fi
  5559         -    if test "$tcl_checkBoth" = 1; then
  5560         -	tk_oldLibs=$LIBS
  5561         -	LIBS="$LIBS -lsocket -lnsl"
  5562         -	ac_fn_c_check_func "$LINENO" "accept" "ac_cv_func_accept"
  5563         -if test "x$ac_cv_func_accept" = xyes; then :
  5564         -  tcl_checkNsl=0
  5565         -else
  5566         -  LIBS=$tk_oldLibs
  5567         -fi
  5568         -
  5569         -    fi
  5570         -    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  5571         -if test "x$ac_cv_func_gethostbyname" = xyes; then :
  5572         -
  5573         -else
  5574         -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  5575         -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  5576         -if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  5577         -  $as_echo_n "(cached) " >&6
  5578         -else
  5579         -  ac_check_lib_save_LIBS=$LIBS
  5580         -LIBS="-lnsl  $LIBS"
  5581         -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5582         -/* end confdefs.h.  */
  5583         -
  5584         -/* Override any GCC internal prototype to avoid an error.
  5585         -   Use char because int might match the return type of a GCC
  5586         -   builtin and then its argument prototype would still apply.  */
  5587         -#ifdef __cplusplus
  5588         -extern "C"
  5589         -#endif
  5590         -char gethostbyname ();
  5591         -int
  5592         -main ()
  5593         -{
  5594         -return gethostbyname ();
  5595         -  ;
  5596         -  return 0;
  5597         -}
  5598         -_ACEOF
  5599         -if ac_fn_c_try_link "$LINENO"; then :
  5600         -  ac_cv_lib_nsl_gethostbyname=yes
  5601         -else
  5602         -  ac_cv_lib_nsl_gethostbyname=no
  5603         -fi
  5604         -rm -f core conftest.err conftest.$ac_objext \
  5605         -    conftest$ac_exeext conftest.$ac_ext
  5606         -LIBS=$ac_check_lib_save_LIBS
  5607         -fi
  5608         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  5609         -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  5610         -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  5611         -  LIBS="$LIBS -lnsl"
  5612         -fi
  5613         -
  5614         -fi
  5615         -
  5616         -
  5617         -    # TEA specific: Don't perform the eval of the libraries here because
  5618         -    # DL_LIBS won't be set until we call TEA_CONFIG_CFLAGS
  5619         -
  5620         -    TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
  5621         -
  5622         -
  5623         -
  5624         -
  5625         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dirent.h" >&5
  5626         -$as_echo_n "checking dirent.h... " >&6; }
  5627         -if ${tcl_cv_dirent_h+:} false; then :
  5628         -  $as_echo_n "(cached) " >&6
  5629         -else
  5630         -
  5631         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5632         -/* end confdefs.h.  */
  5633         -#include <sys/types.h>
  5634         -#include <dirent.h>
  5635         -int
  5636         -main ()
  5637         -{
  5638         -
  5639         -#ifndef _POSIX_SOURCE
  5640         -#   ifdef __Lynx__
  5641         -	/*
  5642         -	 * Generate compilation error to make the test fail:  Lynx headers
  5643         -	 * are only valid if really in the POSIX environment.
  5644         -	 */
  5645         -
  5646         -	missing_procedure();
  5647         -#   endif
  5648         -#endif
  5649         -DIR *d;
  5650         -struct dirent *entryPtr;
  5651         -char *p;
  5652         -d = opendir("foobar");
  5653         -entryPtr = readdir(d);
  5654         -p = entryPtr->d_name;
  5655         -closedir(d);
  5656         -
  5657         -  ;
  5658         -  return 0;
  5659         -}
  5660         -_ACEOF
  5661         -if ac_fn_c_try_link "$LINENO"; then :
  5662         -  tcl_cv_dirent_h=yes
  5663         -else
  5664         -  tcl_cv_dirent_h=no
  5665         -fi
  5666         -rm -f core conftest.err conftest.$ac_objext \
  5667         -    conftest$ac_exeext conftest.$ac_ext
  5668         -fi
  5669         -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_dirent_h" >&5
  5670         -$as_echo "$tcl_cv_dirent_h" >&6; }
  5671         -
  5672         -    if test $tcl_cv_dirent_h = no; then
  5673         -
  5674         -$as_echo "#define NO_DIRENT_H 1" >>confdefs.h
  5675         -
  5676         -    fi
  5677         -
  5678         -    # TEA specific:
  5679         -    ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
  5680         -if test "x$ac_cv_header_errno_h" = xyes; then :
  5681         -
  5682         -else
  5683         -
  5684         -$as_echo "#define NO_ERRNO_H 1" >>confdefs.h
  5685         -
  5686         -fi
  5687         -
  5688         -
  5689         -    ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
  5690         -if test "x$ac_cv_header_float_h" = xyes; then :
  5691         -
  5692         -else
  5693         -
  5694         -$as_echo "#define NO_FLOAT_H 1" >>confdefs.h
  5695         -
  5696         -fi
  5697         -
  5698         -
  5699         -    ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default"
  5700         -if test "x$ac_cv_header_values_h" = xyes; then :
  5701         -
  5702         -else
  5703         -
  5704         -$as_echo "#define NO_VALUES_H 1" >>confdefs.h
  5705         -
  5706         -fi
  5707         -
  5708         -
  5709         -    ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
  5710         -if test "x$ac_cv_header_limits_h" = xyes; then :
  5711         -
  5712         -$as_echo "#define HAVE_LIMITS_H 1" >>confdefs.h
  5713         -
  5714         -else
  5715         -
  5716         -$as_echo "#define NO_LIMITS_H 1" >>confdefs.h
  5717         -
  5718         -fi
  5719         -
  5720         -
  5721         -    ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
  5722         -if test "x$ac_cv_header_stdlib_h" = xyes; then :
  5723         -  tcl_ok=1
  5724         -else
  5725         -  tcl_ok=0
  5726         -fi
  5727         -
  5728         -
  5729         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5730         -/* end confdefs.h.  */
  5731         -#include <stdlib.h>
  5732         -
  5733         -_ACEOF
  5734         -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  5735         -  $EGREP "strtol" >/dev/null 2>&1; then :
  5736         -
  5737         -else
  5738         -  tcl_ok=0
  5739         -fi
  5740         -rm -f conftest*
  5741         -
  5742         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5743         -/* end confdefs.h.  */
  5744         -#include <stdlib.h>
  5745         -
  5746         -_ACEOF
  5747         -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  5748         -  $EGREP "strtoul" >/dev/null 2>&1; then :
  5749         -
  5750         -else
  5751         -  tcl_ok=0
  5752         -fi
  5753         -rm -f conftest*
  5754         -
  5755         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5756         -/* end confdefs.h.  */
  5757         -#include <stdlib.h>
  5758         -
  5759         -_ACEOF
  5760         -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  5761         -  $EGREP "strtod" >/dev/null 2>&1; then :
  5762         -
  5763         -else
  5764         -  tcl_ok=0
  5765         -fi
  5766         -rm -f conftest*
  5767         -
  5768         -    if test $tcl_ok = 0; then
  5769         -
  5770         -$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
  5771         -
  5772         -    fi
  5773         -    ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
  5774         -if test "x$ac_cv_header_string_h" = xyes; then :
  5775         -  tcl_ok=1
  5776         -else
  5777         -  tcl_ok=0
  5778         -fi
  5779         -
  5780         -
  5781         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5782         -/* end confdefs.h.  */
  5783         -#include <string.h>
  5784         -
  5785         -_ACEOF
  5786         -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  5787         -  $EGREP "strstr" >/dev/null 2>&1; then :
  5788         -
  5789         -else
  5790         -  tcl_ok=0
  5791         -fi
  5792         -rm -f conftest*
  5793         -
  5794         -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5795         -/* end confdefs.h.  */
  5796         -#include <string.h>
  5797         -
  5798         -_ACEOF
  5799         -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  5800         -  $EGREP "strerror" >/dev/null 2>&1; then :
  5801         -
  5802         -else
  5803         -  tcl_ok=0
  5804         -fi
  5805         -rm -f conftest*
  5806         -
  5807         -
  5808         -    # See also memmove check below for a place where NO_STRING_H can be
  5809         -    # set and why.
  5810         -
  5811         -    if test $tcl_ok = 0; then
  5812         -
  5813         -$as_echo "#define NO_STRING_H 1" >>confdefs.h
  5814         -
  5815         -    fi
  5816         -
  5817         -    ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
  5818         -if test "x$ac_cv_header_sys_wait_h" = xyes; then :
  5819         -
  5820         -else
  5821         -
  5822         -$as_echo "#define NO_SYS_WAIT_H 1" >>confdefs.h
  5823         -
  5824         -fi
  5825         -
  5826         -
  5827         -    ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
  5828         -if test "x$ac_cv_header_dlfcn_h" = xyes; then :
  5829         -
  5830         -else
  5831         -
  5832         -$as_echo "#define NO_DLFCN_H 1" >>confdefs.h
  5833         -
  5834         -fi
  5835         -
  5836         -
  5837         -
  5838         -    # OS/390 lacks sys/param.h (and doesn't need it, by chance).
  5839         -    for ac_header in sys/param.h
  5840         -do :
  5841         -  ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
  5842         -if test "x$ac_cv_header_sys_param_h" = xyes; then :
  5843         -  cat >>confdefs.h <<_ACEOF
  5844         -#define HAVE_SYS_PARAM_H 1
  5845         -_ACEOF
  5846         -
  5847         -fi
  5848         -
  5849         -done
  5850         -
  5851         -
  5852         -	# Let the user call this, because if it triggers, they will
  5853         -	# need a compat/strtod.c that is correct.  Users can also
  5854         -	# use Tcl_GetDouble(FromObj) instead.
  5855         -	#TEA_BUGGY_STRTOD
  5856         -    fi
  5857   5349   
  5858   5350   
  5859   5351   #-----------------------------------------------------------------------
  5860   5352   # __CHANGE__
  5861   5353   # Specify the C source files to compile in TEA_ADD_SOURCES,
  5862   5354   # public headers that need to be installed in TEA_ADD_HEADERS,
  5863   5355   # stub library C source files to compile in TEA_ADD_STUB_SOURCES,
................................................................................
  5958   5450   	PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i"
  5959   5451       done
  5960   5452   
  5961   5453   
  5962   5454   
  5963   5455   #--------------------------------------------------------------------
  5964   5456   # __CHANGE__
  5965         -# A few miscellaneous platform-specific items:
  5966   5457   #
  5967         -# Define a special symbol for Windows (BUILD_itk in this case) so
  5968         -# that we create the export library with the dll.  See sha1.h on how
  5969         -# to use this.
         5458  +# You can add more files to clean if your extension creates any extra
         5459  +# files by extending CLEANFILES.
         5460  +# Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure
         5461  +# and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var.
  5970   5462   #
  5971         -# Windows creates a few extra files that need to be cleaned up.
  5972         -# You can add more files to clean if your extension creates any extra
  5973         -# files.
  5974         -#
  5975         -# Define any extra compiler flags in the PACKAGE_CFLAGS variable.
  5976         -# These will be appended to the current set of compiler flags for
  5977         -# your system.
         5463  +# A few miscellaneous platform-specific items:
         5464  +# TEA_ADD_* any platform specific compiler/build info here.
  5978   5465   #--------------------------------------------------------------------
  5979   5466   
         5467  +#CLEANFILES="$CLEANFILES pkgIndex.tcl"
  5980   5468   if test "${TEA_PLATFORM}" = "windows" ; then
         5469  +    # Ensure no empty if clauses
         5470  +    :
         5471  +    #TEA_ADD_SOURCES([win/winFile.c])
         5472  +    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
  5981   5473   
  5982   5474       vars="dllEntryPoint.c"
  5983   5475       for i in $vars; do
  5984   5476   	case $i in
  5985   5477   	    \$*)
  5986   5478   		# allow $-var names
  5987   5479   		PKG_SOURCES="$PKG_SOURCES $i"
................................................................................
  6009   5501   		PKG_OBJECTS="$PKG_OBJECTS $j"
  6010   5502   		;;
  6011   5503   	esac
  6012   5504       done
  6013   5505   
  6014   5506   
  6015   5507   
         5508  +else
         5509  +    # Ensure no empty else clauses
         5510  +    :
         5511  +    #TEA_ADD_SOURCES([unix/unixFile.c])
         5512  +    #TEA_ADD_LIBS([-lsuperfly])
  6016   5513   fi
  6017   5514   
  6018   5515   #--------------------------------------------------------------------
  6019   5516   # __CHANGE__
  6020   5517   # Choose which headers you need.  Extension authors should try very
  6021   5518   # hard to only rely on the Tcl public header files.  Internal headers
  6022   5519   # contain private data structures and are subject to change without
  6023   5520   # notice.
  6024         -# This must be done AFTER calling TEA_PATH_TCLCONFIG/TEA_LOAD_TCLCONFIG
  6025         -# so that we can extract TCL_SRC_DIR from the config file (in the case
  6026         -# of private headers
         5521  +# This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG
  6027   5522   #--------------------------------------------------------------------
  6028   5523   
  6029   5524   #TEA_PUBLIC_TCL_HEADERS
  6030   5525   
  6031   5526       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl public headers" >&5
  6032   5527   $as_echo_n "checking for Tcl public headers... " >&6; }
  6033   5528   
................................................................................
  6267   5762   
  6268   5763   	fi
  6269   5764   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${INCLUDE_DIR_NATIVE}" >&5
  6270   5765   $as_echo "${INCLUDE_DIR_NATIVE}" >&6; }
  6271   5766       fi
  6272   5767   
  6273   5768   #TEA_PRIVATE_TK_HEADERS
  6274         -
  6275         -#--------------------------------------------------------------------
  6276         -# For Unix/Tk builds, make sure that the X libraries/headers are found.
  6277         -#--------------------------------------------------------------------
  6278         -
  6279   5769   
  6280   5770       if test "${TEA_WINDOWINGSYSTEM}" = "x11" ; then
  6281   5771   
  6282   5772       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
  6283   5773   $as_echo_n "checking for X... " >&6; }
  6284   5774   
  6285   5775   
................................................................................
  6608   6098   # We need to enable the threading macros found in tcl.h and tclInt.h.
  6609   6099   # The use of the threading features is determined by the core the
  6610   6100   # extension is loaded into, but we need to compile with these macros
  6611   6101   # turned on.
  6612   6102   #--------------------------------------------------------------------
  6613   6103   
  6614   6104   $as_echo "#define TCL_THREADS 1" >>confdefs.h
         6105  +
  6615   6106   
  6616   6107   #--------------------------------------------------------------------
  6617   6108   # Check whether --enable-threads or --disable-threads was given.
  6618   6109   # This auto-enables if Tcl was compiled threaded.
  6619   6110   #--------------------------------------------------------------------
  6620   6111   
  6621   6112   #TEA_ENABLE_THREADS
................................................................................
  6626   6117   #--------------------------------------------------------------------
  6627   6118   
  6628   6119   
  6629   6120       { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
  6630   6121   $as_echo_n "checking how to build libraries... " >&6; }
  6631   6122       # Check whether --enable-shared was given.
  6632   6123   if test "${enable_shared+set}" = set; then :
  6633         -  enableval=$enable_shared; tcl_ok=$enableval
         6124  +  enableval=$enable_shared; shared_ok=$enableval
  6634   6125   else
  6635         -  tcl_ok=yes
         6126  +  shared_ok=yes
  6636   6127   fi
  6637   6128   
  6638   6129   
  6639   6130       if test "${enable_shared+set}" = set; then
  6640   6131   	enableval="$enable_shared"
  6641         -	tcl_ok=$enableval
         6132  +	shared_ok=$enableval
         6133  +    else
         6134  +	shared_ok=yes
         6135  +    fi
         6136  +
         6137  +    # Check whether --enable-stubs was given.
         6138  +if test "${enable_stubs+set}" = set; then :
         6139  +  enableval=$enable_stubs; stubs_ok=$enableval
         6140  +else
         6141  +  stubs_ok=yes
         6142  +fi
         6143  +
         6144  +
         6145  +    if test "${enable_stubs+set}" = set; then
         6146  +	enableval="$enable_stubs"
         6147  +	stubs_ok=$enableval
  6642   6148       else
  6643         -	tcl_ok=yes
         6149  +	stubs_ok=yes
  6644   6150       fi
  6645   6151   
  6646         -    if test "$tcl_ok" = "yes" ; then
         6152  +    # Stubs are always enabled for shared builds
         6153  +    if test "$shared_ok" = "yes" ; then
  6647   6154   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
  6648   6155   $as_echo "shared" >&6; }
  6649   6156   	SHARED_BUILD=1
         6157  +        STUBS_BUILD=1
  6650   6158       else
  6651   6159   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  6652   6160   $as_echo "static" >&6; }
  6653   6161   	SHARED_BUILD=0
  6654   6162   
  6655   6163   $as_echo "#define STATIC_BUILD 1" >>confdefs.h
  6656   6164   
         6165  +        if test "$stubs_ok" = "yes" ; then
         6166  +          STUBS_BUILD=1
         6167  +        else
         6168  +          STUBS_BUILD=0
         6169  +        fi
  6657   6170       fi
         6171  +    if test "${STUBS_BUILD}" = "1" ; then
         6172  +
         6173  +$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h
         6174  +
         6175  +
         6176  +$as_echo "#define USE_TCLOO_STUBS 1" >>confdefs.h
         6177  +
         6178  +      if test "${TEA_WINDOWINGSYSTEM}" != ""; then
         6179  +
         6180  +$as_echo "#define USE_TK_STUBS 1" >>confdefs.h
         6181  +
         6182  +      fi
         6183  +    fi
         6184  +
         6185  +
  6658   6186   
  6659   6187   
  6660   6188   
  6661   6189   #--------------------------------------------------------------------
  6662   6190   # This macro figures out what flags to use with the compiler/linker
  6663   6191   # when building shared/static debug/optimized objects.  This information
  6664   6192   # can be taken from the tclConfig.sh file, but this figures it all out.
................................................................................
  7604   7132   	    CC_SEARCH_FLAGS=""
  7605   7133   	    LD_SEARCH_FLAGS=""
  7606   7134   	    ;;
  7607   7135   	Haiku*)
  7608   7136   	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  7609   7137   	    SHLIB_CFLAGS="-fPIC"
  7610   7138   	    SHLIB_SUFFIX=".so"
  7611         -	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
         7139  +	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
  7612   7140   	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnetwork" >&5
  7613   7141   $as_echo_n "checking for inet_ntoa in -lnetwork... " >&6; }
  7614   7142   if ${ac_cv_lib_network_inet_ntoa+:} false; then :
  7615   7143     $as_echo_n "(cached) " >&6
  7616   7144   else
  7617   7145     ac_check_lib_save_LIBS=$LIBS
  7618   7146   LIBS="-lnetwork  $LIBS"
................................................................................
  7831   7359   	    SHLIB_CFLAGS="-fPIC"
  7832   7360   	    SHLIB_SUFFIX=".so"
  7833   7361   
  7834   7362   	    # TEA specific:
  7835   7363   	    CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
  7836   7364   
  7837   7365   	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
  7838         -	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}'
         7366  +	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS_DEFAULT} -shared'
  7839   7367   	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  7840   7368   	    if test $doRpath = yes; then :
  7841   7369   
  7842   7370   		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  7843   7371   fi
  7844   7372   	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  7845   7373   	    if test "`uname -m`" = "alpha"; then :
................................................................................
  7907   7435   		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  7908   7436   		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  7909   7437   fi
  7910   7438   	    ;;
  7911   7439   	OpenBSD-*)
  7912   7440   	    arch=`arch -s`
  7913   7441   	    case "$arch" in
  7914         -	    vax)
  7915         -		SHLIB_SUFFIX=""
  7916         -		SHARED_LIB_SUFFIX=""
  7917         -		LDFLAGS=""
         7442  +	    alpha|sparc64)
         7443  +		SHLIB_CFLAGS="-fPIC"
  7918   7444   		;;
  7919   7445   	    *)
  7920         -		case "$arch" in
  7921         -		alpha|sparc64)
  7922         -		    SHLIB_CFLAGS="-fPIC"
  7923         -		    ;;
  7924         -		*)
  7925         -		    SHLIB_CFLAGS="-fpic"
  7926         -		    ;;
  7927         -		esac
  7928         -		SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
  7929         -		SHLIB_SUFFIX=".so"
  7930         -		if test $doRpath = yes; then :
  7931         -
  7932         -		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  7933         -fi
  7934         -		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  7935         -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  7936         -		LDFLAGS="-Wl,-export-dynamic"
         7446  +		SHLIB_CFLAGS="-fpic"
  7937   7447   		;;
  7938   7448   	    esac
  7939         -	    case "$arch" in
  7940         -	    vax)
  7941         -		CFLAGS_OPTIMIZE="-O1"
  7942         -		;;
  7943         -	    *)
  7944         -		CFLAGS_OPTIMIZE="-O2"
  7945         -		;;
  7946         -	    esac
         7449  +	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
         7450  +	    SHLIB_SUFFIX=".so"
         7451  +	    if test $doRpath = yes; then :
         7452  +
         7453  +		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
         7454  +fi
         7455  +	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
         7456  +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
         7457  +	    LDFLAGS="-Wl,-export-dynamic"
         7458  +	    CFLAGS_OPTIMIZE="-O2"
  7947   7459   	    if test "${TCL_THREADS}" = "1"; then :
  7948   7460   
  7949   7461   		# On OpenBSD:	Compile with -pthread
  7950   7462   		#		Don't link with -lpthread
  7951   7463   		LIBS=`echo $LIBS | sed s/-lpthread//`
  7952   7464   		CFLAGS="$CFLAGS -pthread"
  7953   7465   
................................................................................
  7955   7467   	    # OpenBSD doesn't do version numbers with dots.
  7956   7468   	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
  7957   7469   	    TCL_LIB_VERSIONS_OK=nodots
  7958   7470   	    ;;
  7959   7471   	NetBSD-*)
  7960   7472   	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
  7961   7473   	    SHLIB_CFLAGS="-fPIC"
  7962         -	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
         7474  +	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
  7963   7475   	    SHLIB_SUFFIX=".so"
  7964   7476   	    LDFLAGS="$LDFLAGS -export-dynamic"
  7965   7477   	    if test $doRpath = yes; then :
  7966   7478   
  7967   7479   		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  7968   7480   fi
  7969   7481   	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
................................................................................
  8606   8118       # standard manufacturer compiler.
  8607   8119   
  8608   8120       if test "$GCC" = yes; then :
  8609   8121   
  8610   8122   	case $system in
  8611   8123   	    AIX-*) ;;
  8612   8124   	    BSD/OS*) ;;
  8613         -	    CYGWIN_*|MINGW32_*) ;;
         8125  +	    CYGWIN_*|MINGW32_*|MINGW64_*) ;;
  8614   8126   	    IRIX*) ;;
  8615   8127   	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
  8616   8128   	    Darwin-*) ;;
  8617   8129   	    SCO_SV-3.2*) ;;
  8618   8130   	    windows) ;;
  8619   8131   	    *) SHLIB_CFLAGS="-fPIC" ;;
  8620   8132   	esac
................................................................................
  9169   8681   $as_echo "no" >&6; }
  9170   8682   	fi
  9171   8683       fi
  9172   8684   
  9173   8685   
  9174   8686   
  9175   8687   #--------------------------------------------------------------------
  9176         -# Set the default compiler switches based on the --enable-symbols
  9177         -# option.
         8688  +# Set the default compiler switches based on the --enable-symbols option.
  9178   8689   #--------------------------------------------------------------------
  9179   8690   
  9180   8691   
  9181   8692   
  9182   8693       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5
  9183   8694   $as_echo_n "checking for build with symbols... " >&6; }
  9184   8695       # Check whether --enable-symbols was given.
................................................................................
  9224   8735   	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
  9225   8736   $as_echo "enabled $tcl_ok debugging" >&6; }
  9226   8737   	fi
  9227   8738       fi
  9228   8739   
  9229   8740   
  9230   8741   #--------------------------------------------------------------------
  9231         -# Everyone should be linking against the Tcl stub library.  If you
  9232         -# can't for some reason, remove this definition.  If you aren't using
  9233         -# stubs, you also need to modify the SHLIB_LD_LIBS setting below to
  9234         -# link against the non-stubbed Tcl library.
         8742  +# Itcl stubs
  9235   8743   #--------------------------------------------------------------------
  9236   8744   
  9237   8745   if test "${SHARED_BUILD}" = "1" ; then
  9238         -    $as_echo "#define USE_TCL_STUBS 1" >>confdefs.h
  9239         -
  9240         -    $as_echo "#define USE_TK_STUBS 1" >>confdefs.h
  9241         -
  9242   8746       $as_echo "#define USE_ITCL_STUBS 1" >>confdefs.h
  9243   8747   
  9244   8748   fi
  9245   8749   
  9246   8750   #--------------------------------------------------------------------
  9247   8751   # This macro generates a line to use when building a library.  It
  9248   8752   # depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
................................................................................
  9349   8853   
  9350   8854   
  9351   8855   
  9352   8856   
  9353   8857   
  9354   8858   
  9355   8859   #--------------------------------------------------------------------
  9356         -# __CHANGE__
  9357         -# Change the name from exampeA_LIB_FILE to match your package name.
  9358         -# Use the stub_LIB_FILE substitution if your package creates a stub
  9359         -# library.
  9360         -#--------------------------------------------------------------------
  9361         -
  9362         -
  9363         -
  9364         -
  9365         -#--------------------------------------------------------------------
  9366         -# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
  9367         -# file during the install process.  Don't run the TCLSH_PROG through
  9368         -# ${CYGPATH} because it's being used directly by make.
  9369         -# Require that we use a tclsh shell version 8.2 or later since earlier
  9370         -# versions have bugs in the pkg_mkIndex routine.
         8860  +# Determine the name of the tclsh and/or wish executables in the
         8861  +# Tcl and Tk build directories or the location they were installed
         8862  +# into. These paths are used to support running test cases only,
         8863  +# the Makefile should not be making use of these paths to generate
         8864  +# a pkgIndex.tcl file or anything else at extension build time.
  9371   8865   #--------------------------------------------------------------------
  9372   8866   
  9373   8867   
  9374   8868       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
  9375   8869   $as_echo_n "checking for tclsh... " >&6; }
  9376   8870       if test -f "${TCL_BIN_DIR}/Makefile" ; then
  9377   8871           # tclConfig.sh is in Tcl build directory
  9378   8872           if test "${TEA_PLATFORM}" = "windows"; then
         8873  +          if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" ; then
  9379   8874               TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}"
         8875  +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}" ; then
         8876  +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}"
         8877  +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}" ; then
         8878  +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}"
         8879  +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}" ; then
         8880  +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}"
         8881  +          fi
  9380   8882           else
  9381   8883               TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
  9382   8884           fi
  9383   8885       else
  9384   8886           # tclConfig.sh is in install location
  9385   8887           if test "${TEA_PLATFORM}" = "windows"; then
  9386   8888               TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}"
................................................................................
  9404   8906   
  9405   8907   
  9406   8908       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wish" >&5
  9407   8909   $as_echo_n "checking for wish... " >&6; }
  9408   8910       if test -f "${TK_BIN_DIR}/Makefile" ; then
  9409   8911           # tkConfig.sh is in Tk build directory
  9410   8912           if test "${TEA_PLATFORM}" = "windows"; then
         8913  +          if test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}" ; then
  9411   8914               WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}"
         8915  +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}s${EXEEXT}" ; then
         8916  +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}$s{EXEEXT}"
         8917  +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}" ; then
         8918  +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}"
         8919  +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}" ; then
         8920  +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}"
         8921  +          fi
  9412   8922           else
  9413   8923               WISH_PROG="${TK_BIN_DIR}/wish"
  9414   8924           fi
  9415   8925       else
  9416   8926           # tkConfig.sh is in install location
  9417   8927           if test "${TEA_PLATFORM}" = "windows"; then
  9418   8928               WISH_PROG="wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}"
................................................................................
  9433   8943       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WISH_PROG}" >&5
  9434   8944   $as_echo "${WISH_PROG}" >&6; }
  9435   8945   
  9436   8946   
  9437   8947   
  9438   8948   #--------------------------------------------------------------------
  9439   8949   # Finally, substitute all of the various values into the Makefile.
         8950  +# You may alternatively have a special pkgIndex.tcl.in or other files
         8951  +# which require substituting the AC variables in. Include these here.
  9440   8952   #--------------------------------------------------------------------
  9441   8953   
  9442   8954   ac_config_files="$ac_config_files Makefile pkgIndex.tcl itkConfig.sh"
  9443   8955   
  9444   8956   cat >confcache <<\_ACEOF
  9445   8957   # This file is a shell script that caches the results of configure
  9446   8958   # tests run on this system so they can be shared between configure

Name change from configure.in to configure.ac.

     1      1   #!/bin/bash -norc
     2         -#--------------------------------------------------------------------
     3         -# Sample configure.in for Tcl Extensions.  The only places you should
            2  +dnl	This file is an input file used by the GNU "autoconf" program to
            3  +dnl	generate the file "configure", which is run during Tcl installation
            4  +dnl	to configure the system for the local environment.
            5  +
            6  +#-----------------------------------------------------------------------
            7  +# Sample configure.ac for Tcl Extensions.  The only places you should
     4      8   # need to modify this file are marked by the string __CHANGE__
     5         -#--------------------------------------------------------------------
            9  +#-----------------------------------------------------------------------
     6     10   
     7     11   #-----------------------------------------------------------------------
           12  +# __CHANGE__
           13  +# Set your package name and version numbers here.
           14  +#
     8     15   # This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION
     9     16   # set as provided.  These will also be added as -D defs in your Makefile
    10     17   # so you can encode the package version directly into the source files.
           18  +# This will also define a special symbol for Windows (BUILD_<PACKAGE_NAME>
           19  +# so that we create the export library with the dll.
    11     20   #-----------------------------------------------------------------------
    12     21   
    13     22   AC_INIT([itk], [4.1.0])
    14     23   
    15     24   #--------------------------------------------------------------------
    16     25   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
    17     26   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
    18     27   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
    19     28   #--------------------------------------------------------------------
    20     29   
    21         -TEA_INIT([3.9])
           30  +TEA_INIT()
           31  +
           32  +#--------------------------------------------------------------------
           33  +# Try to ensure the existence of a tclconfig directory in either
           34  +# $srcdir or the current dir, if one can't be found in $srcdir.
           35  +# If this package is being built as part of a bundle then a tclconfig
           36  +# directory might exist in $srcdir's parent directory.
           37  +#--------------------------------------------------------------------
    22     38   
    23     39   AC_PROG_LN_S
    24     40   CONFIG_CLEAN_FILES=
    25     41   if test ! -d $srcdir/tclconfig ; then
    26     42       if test -d $srcdir/../tclconfig ; then
    27         -        $LN_S $srcdir/../tclconfig tclconfig
           43  +	$LN_S $srcdir/../tclconfig tclconfig
    28     44   	CONFIG_CLEAN_FILES=tclconfig
    29     45       fi
    30     46   fi
    31     47   AC_SUBST(CONFIG_CLEAN_FILES)
           48  +
           49  +#--------------------------------------------------------------------
           50  +# Tell autoconf where to find tcl.m4 and install.sh.
           51  +#--------------------------------------------------------------------
    32     52   
    33     53   AC_CONFIG_AUX_DIR(tclconfig)
    34     54   
    35     55   #--------------------------------------------------------------------
    36     56   # Load the tclConfig.sh file
    37     57   #--------------------------------------------------------------------
    38     58   
    39     59   TEA_PATH_TCLCONFIG
    40     60   TEA_LOAD_TCLCONFIG
    41     61   
    42     62   #--------------------------------------------------------------------
    43         -# Load the tkConfig.sh file
           63  +# Load the tkConfig.sh file if necessary (Tk extension)
    44     64   #--------------------------------------------------------------------
    45     65   
    46     66   TEA_PATH_TKCONFIG
    47     67   TEA_LOAD_TKCONFIG
           68  +
           69  +#--------------------------------------------------------------------
           70  +# Load the itclConfig.sh file
           71  +#--------------------------------------------------------------------
    48     72   
    49     73   TEA_PATH_CONFIG(itcl)
    50     74   TEA_LOAD_CONFIG(itcl)
    51     75   
    52     76   ITCL_INCLUDES="-I\"`${CYGPATH} ${itcl_SRC_DIR}/generic`\""
    53     77   
    54         -#--------------------------------------------------------------------
           78  +#-----------------------------------------------------------------------
    55     79   # Handle the --prefix=... option by defaulting to what Tcl gave.
    56         -# Must be called after TEA_LOAD_TCLCONFIG and before $prefix is used.
    57         -#--------------------------------------------------------------------
           80  +# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
           81  +#-----------------------------------------------------------------------
    58     82   
    59     83   TEA_PREFIX
    60     84   
    61         -#------------------------------------------------------------------------
           85  +#-----------------------------------------------------------------------
    62     86   # Standard compiler checks.
    63     87   # This sets up CC by using the CC env var, or looks for gcc otherwise.
    64         -# This also calls AC_PROG_CC, AC_PROG_INSTALL and a few others to create
    65         -# the basic setup necessary to compile executables.
    66         -#------------------------------------------------------------------------
           88  +# This also calls AC_PROG_CC and a few others to create the basic setup
           89  +# necessary to compile executables.
           90  +#-----------------------------------------------------------------------
    67     91   
    68     92   TEA_SETUP_COMPILER
    69     93   
    70     94   #-----------------------------------------------------------------------
    71     95   # __CHANGE__
    72     96   # Specify the C source files to compile in TEA_ADD_SOURCES,
    73     97   # public headers that need to be installed in TEA_ADD_HEADERS,
................................................................................
    96    120                   library/Toplevel.itk
    97    121                   library/Widget.itk
    98    122                   library/itk.tcl
    99    123                   library/tclIndex])
   100    124   
   101    125   #--------------------------------------------------------------------
   102    126   # __CHANGE__
   103         -# A few miscellaneous platform-specific items:
   104    127   #
   105         -# Define a special symbol for Windows (BUILD_itk in this case) so
   106         -# that we create the export library with the dll.  See sha1.h on how
   107         -# to use this.
          128  +# You can add more files to clean if your extension creates any extra
          129  +# files by extending CLEANFILES.
          130  +# Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure
          131  +# and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var.
   108    132   #
   109         -# Windows creates a few extra files that need to be cleaned up.
   110         -# You can add more files to clean if your extension creates any extra
   111         -# files.
   112         -#
   113         -# Define any extra compiler flags in the PACKAGE_CFLAGS variable.
   114         -# These will be appended to the current set of compiler flags for
   115         -# your system.
          133  +# A few miscellaneous platform-specific items:
          134  +# TEA_ADD_* any platform specific compiler/build info here.
   116    135   #--------------------------------------------------------------------
   117    136   
          137  +#CLEANFILES="$CLEANFILES pkgIndex.tcl"
   118    138   if test "${TEA_PLATFORM}" = "windows" ; then
          139  +    # Ensure no empty if clauses
          140  +    :
          141  +    #TEA_ADD_SOURCES([win/winFile.c])
          142  +    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
   119    143       TEA_ADD_SOURCES([dllEntryPoint.c])
          144  +else
          145  +    # Ensure no empty else clauses
          146  +    :
          147  +    #TEA_ADD_SOURCES([unix/unixFile.c])
          148  +    #TEA_ADD_LIBS([-lsuperfly])
   120    149   fi
   121    150   
   122    151   #--------------------------------------------------------------------
   123    152   # __CHANGE__
   124    153   # Choose which headers you need.  Extension authors should try very
   125    154   # hard to only rely on the Tcl public header files.  Internal headers
   126    155   # contain private data structures and are subject to change without
   127    156   # notice.
   128         -# This must be done AFTER calling TEA_PATH_TCLCONFIG/TEA_LOAD_TCLCONFIG
   129         -# so that we can extract TCL_SRC_DIR from the config file (in the case
   130         -# of private headers
          157  +# This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG
   131    158   #--------------------------------------------------------------------
   132    159   
   133    160   #TEA_PUBLIC_TCL_HEADERS
   134    161   TEA_PRIVATE_TCL_HEADERS
   135    162   
   136    163   TEA_PUBLIC_TK_HEADERS
   137    164   #TEA_PRIVATE_TK_HEADERS
   138         -
   139         -#--------------------------------------------------------------------
   140         -# For Unix/Tk builds, make sure that the X libraries/headers are found.
   141         -#--------------------------------------------------------------------
   142         -
   143    165   TEA_PATH_X
   144    166   
   145    167   #--------------------------------------------------------------------
   146    168   # We need to enable the threading macros found in tcl.h and tclInt.h.
   147    169   # The use of the threading features is determined by the core the
   148    170   # extension is loaded into, but we need to compile with these macros
   149    171   # turned on.
   150    172   #--------------------------------------------------------------------
   151    173   
   152    174   AC_DEFINE(TCL_THREADS)
          175  +
   153    176   #--------------------------------------------------------------------
   154    177   # Check whether --enable-threads or --disable-threads was given.
   155    178   # This auto-enables if Tcl was compiled threaded.
   156    179   #--------------------------------------------------------------------
   157    180   
   158    181   #TEA_ENABLE_THREADS
   159    182   
................................................................................
   169    192   # when building shared/static debug/optimized objects.  This information
   170    193   # can be taken from the tclConfig.sh file, but this figures it all out.
   171    194   #--------------------------------------------------------------------
   172    195   
   173    196   TEA_CONFIG_CFLAGS
   174    197   
   175    198   #--------------------------------------------------------------------
   176         -# Set the default compiler switches based on the --enable-symbols 
   177         -# option.
          199  +# Set the default compiler switches based on the --enable-symbols option.
   178    200   #--------------------------------------------------------------------
   179    201   
   180    202   TEA_ENABLE_SYMBOLS
   181    203   
   182    204   #--------------------------------------------------------------------
   183         -# Everyone should be linking against the Tcl stub library.  If you
   184         -# can't for some reason, remove this definition.  If you aren't using
   185         -# stubs, you also need to modify the SHLIB_LD_LIBS setting below to
   186         -# link against the non-stubbed Tcl library.
          205  +# Itcl stubs
   187    206   #--------------------------------------------------------------------
   188    207   
   189    208   if test "${SHARED_BUILD}" = "1" ; then
   190         -    AC_DEFINE(USE_TCL_STUBS)
   191         -    AC_DEFINE(USE_TK_STUBS)
   192    209       AC_DEFINE(USE_ITCL_STUBS)
   193    210   fi
   194    211   
   195    212   #--------------------------------------------------------------------
   196    213   # This macro generates a line to use when building a library.  It
   197    214   # depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
   198    215   # and TEA_LOAD_TCLCONFIG macros above.
   199    216   #--------------------------------------------------------------------
   200    217   
   201    218   TEA_MAKE_LIB
   202    219   
   203    220   #--------------------------------------------------------------------
   204         -# __CHANGE__
   205         -# Change the name from exampeA_LIB_FILE to match your package name.
   206         -# Use the stub_LIB_FILE substitution if your package creates a stub
   207         -# library.
   208         -#--------------------------------------------------------------------
   209         -
   210         -AC_SUBST(itkstub_LIB_FILE)
   211         -AC_SUBST(itk_LIB_FILE)
   212         -
   213         -#--------------------------------------------------------------------
   214         -# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
   215         -# file during the install process.  Don't run the TCLSH_PROG through
   216         -# ${CYGPATH} because it's being used directly by make.
   217         -# Require that we use a tclsh shell version 8.2 or later since earlier
   218         -# versions have bugs in the pkg_mkIndex routine.
          221  +# Determine the name of the tclsh and/or wish executables in the
          222  +# Tcl and Tk build directories or the location they were installed
          223  +# into. These paths are used to support running test cases only,
          224  +# the Makefile should not be making use of these paths to generate
          225  +# a pkgIndex.tcl file or anything else at extension build time.
   219    226   #--------------------------------------------------------------------
   220    227   
   221    228   TEA_PROG_TCLSH
   222    229   TEA_PROG_WISH
   223    230   
   224    231   #--------------------------------------------------------------------
   225    232   # Finally, substitute all of the various values into the Makefile.
          233  +# You may alternatively have a special pkgIndex.tcl.in or other files
          234  +# which require substituting the AC variables in. Include these here.
   226    235   #--------------------------------------------------------------------
   227    236   
   228    237   AC_OUTPUT([Makefile pkgIndex.tcl itkConfig.sh])

Changes to doc/man.macros.

     1         -'\" The definitions below are for supplemental macros used in Tcl/Tk
     2         -'\" manual entries.
     3         -'\"
     4         -'\" .AP type name in/out ?indent?
     5         -'\"	Start paragraph describing an argument to a library procedure.
     6         -'\"	type is type of argument (int, etc.), in/out is either "in", "out",
     7         -'\"	or "in/out" to describe whether procedure reads or modifies arg,
     8         -'\"	and indent is equivalent to second arg of .IP (shouldn't ever be
     9         -'\"	needed;  use .AS below instead)
    10         -'\"
    11         -'\" .AS ?type? ?name?
    12         -'\"	Give maximum sizes of arguments for setting tab stops.  Type and
    13         -'\"	name are examples of largest possible arguments that will be passed
    14         -'\"	to .AP later.  If args are omitted, default tab stops are used.
    15         -'\"
    16         -'\" .BS
    17         -'\"	Start box enclosure.  From here until next .BE, everything will be
    18         -'\"	enclosed in one large box.
    19         -'\"
    20         -'\" .BE
    21         -'\"	End of box enclosure.
    22         -'\"
    23         -'\" .CS
    24         -'\"	Begin code excerpt.
    25         -'\"
    26         -'\" .CE
    27         -'\"	End code excerpt.
    28         -'\"
    29         -'\" .VS ?version? ?br?
    30         -'\"	Begin vertical sidebar, for use in marking newly-changed parts
    31         -'\"	of man pages.  The first argument is ignored and used for recording
    32         -'\"	the version when the .VS was added, so that the sidebars can be
    33         -'\"	found and removed when they reach a certain age.  If another argument
    34         -'\"	is present, then a line break is forced before starting the sidebar.
    35         -'\"
    36         -'\" .VE
    37         -'\"	End of vertical sidebar.
    38         -'\"
    39         -'\" .DS
    40         -'\"	Begin an indented unfilled display.
    41         -'\"
    42         -'\" .DE
    43         -'\"	End of indented unfilled display.
    44         -'\"
    45         -'\" .SO
    46         -'\"	Start of list of standard options for a Tk widget.  The
    47         -'\"	options follow on successive lines, in four columns separated
    48         -'\"	by tabs.
    49         -'\"
    50         -'\" .SE
    51         -'\"	End of list of standard options for a Tk widget.
    52         -'\"
    53         -'\" .OP cmdName dbName dbClass
    54         -'\"	Start of description of a specific option.  cmdName gives the
    55         -'\"	option's name as specified in the class command, dbName gives
    56         -'\"	the option's name in the option database, and dbClass gives
    57         -'\"	the option's class in the option database.
    58         -'\"
    59         -'\" .UL arg1 arg2
    60         -'\"	Print arg1 underlined, then print arg2 normally.
    61         -'\"
    62         -'\" SCCS: @(#) man.macros 1.9 97/08/22 18:50:59
    63         -'\"
    64         -'\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
            1  +.\" The -*- nroff -*- definitions below are for supplemental macros used
            2  +.\" in Tcl/Tk manual entries.
            3  +.\"
            4  +.\" .AP type name in/out ?indent?
            5  +.\"	Start paragraph describing an argument to a library procedure.
            6  +.\"	type is type of argument (int, etc.), in/out is either "in", "out",
            7  +.\"	or "in/out" to describe whether procedure reads or modifies arg,
            8  +.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
            9  +.\"	needed;  use .AS below instead)
           10  +.\"
           11  +.\" .AS ?type? ?name?
           12  +.\"	Give maximum sizes of arguments for setting tab stops.  Type and
           13  +.\"	name are examples of largest possible arguments that will be passed
           14  +.\"	to .AP later.  If args are omitted, default tab stops are used.
           15  +.\"
           16  +.\" .BS
           17  +.\"	Start box enclosure.  From here until next .BE, everything will be
           18  +.\"	enclosed in one large box.
           19  +.\"
           20  +.\" .BE
           21  +.\"	End of box enclosure.
           22  +.\"
           23  +.\" .CS
           24  +.\"	Begin code excerpt.
           25  +.\"
           26  +.\" .CE
           27  +.\"	End code excerpt.
           28  +.\"
           29  +.\" .VS ?version? ?br?
           30  +.\"	Begin vertical sidebar, for use in marking newly-changed parts
           31  +.\"	of man pages.  The first argument is ignored and used for recording
           32  +.\"	the version when the .VS was added, so that the sidebars can be
           33  +.\"	found and removed when they reach a certain age.  If another argument
           34  +.\"	is present, then a line break is forced before starting the sidebar.
           35  +.\"
           36  +.\" .VE
           37  +.\"	End of vertical sidebar.
           38  +.\"
           39  +.\" .DS
           40  +.\"	Begin an indented unfilled display.
           41  +.\"
           42  +.\" .DE
           43  +.\"	End of indented unfilled display.
           44  +.\"
           45  +.\" .SO ?manpage?
           46  +.\"	Start of list of standard options for a Tk widget. The manpage
           47  +.\"	argument defines where to look up the standard options; if
           48  +.\"	omitted, defaults to "options". The options follow on successive
           49  +.\"	lines, in three columns separated by tabs.
           50  +.\"
           51  +.\" .SE
           52  +.\"	End of list of standard options for a Tk widget.
           53  +.\"
           54  +.\" .OP cmdName dbName dbClass
           55  +.\"	Start of description of a specific option.  cmdName gives the
           56  +.\"	option's name as specified in the class command, dbName gives
           57  +.\"	the option's name in the option database, and dbClass gives
           58  +.\"	the option's class in the option database.
           59  +.\"
           60  +.\" .UL arg1 arg2
           61  +.\"	Print arg1 underlined, then print arg2 normally.
           62  +.\"
           63  +.\" .QW arg1 ?arg2?
           64  +.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
           65  +.\"
           66  +.\" .PQ arg1 ?arg2?
           67  +.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
           68  +.\"	(for trailing punctuation) and then a closing parenthesis.
           69  +.\"
           70  +.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
    65     71   .if t .wh -1.3i ^B
    66     72   .nr ^l \n(.l
    67     73   .ad b
    68         -'\"	# Start an argument description
           74  +.\"	# Start an argument description
    69     75   .de AP
    70     76   .ie !"\\$4"" .TP \\$4
    71     77   .el \{\
    72     78   .   ie !"\\$2"" .TP \\n()Cu
    73     79   .   el          .TP 15
    74     80   .\}
    75         -.ie !"\\$3"" \{\
    76     81   .ta \\n()Au \\n()Bu
    77         -\&\\$1	\\fI\\$2\\fP	(\\$3)
           82  +.ie !"\\$3"" \{\
           83  +\&\\$1 \\fI\\$2\\fP (\\$3)
    78     84   .\".b
    79     85   .\}
    80     86   .el \{\
    81     87   .br
    82     88   .ie !"\\$2"" \{\
    83     89   \&\\$1	\\fI\\$2\\fP
    84     90   .\}
    85     91   .el \{\
    86     92   \&\\fI\\$1\\fP
    87     93   .\}
    88     94   .\}
    89     95   ..
    90         -'\"	# define tabbing values for .AP
           96  +.\"	# define tabbing values for .AP
    91     97   .de AS
    92     98   .nr )A 10n
    93     99   .if !"\\$1"" .nr )A \\w'\\$1'u+3n
    94    100   .nr )B \\n()Au+15n
    95    101   .\"
    96    102   .if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
    97    103   .nr )C \\n()Bu+\\w'(in/out)'u+2n
    98    104   ..
    99    105   .AS Tcl_Interp Tcl_CreateInterp in/out
   100         -'\"	# BS - start boxed text
   101         -'\"	# ^y = starting y location
   102         -'\"	# ^b = 1
          106  +.\"	# BS - start boxed text
          107  +.\"	# ^y = starting y location
          108  +.\"	# ^b = 1
   103    109   .de BS
   104    110   .br
   105    111   .mk ^y
   106    112   .nr ^b 1u
   107    113   .if n .nf
   108    114   .if n .ti 0
   109    115   .if n \l'\\n(.lu\(ul'
   110    116   .if n .fi
   111    117   ..
   112         -'\"	# BE - end boxed text (draw box now)
          118  +.\"	# BE - end boxed text (draw box now)
   113    119   .de BE
   114    120   .nf
   115    121   .ti 0
   116    122   .mk ^t
   117    123   .ie n \l'\\n(^lu\(ul'
   118    124   .el \{\
   119    125   .\"	Draw four-sided box normally, but don't draw top of
................................................................................
   125    131   \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
   126    132   .\}
   127    133   .\}
   128    134   .fi
   129    135   .br
   130    136   .nr ^b 0
   131    137   ..
   132         -'\"	# VS - start vertical sidebar
   133         -'\"	# ^Y = starting y location
   134         -'\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
          138  +.\"	# VS - start vertical sidebar
          139  +.\"	# ^Y = starting y location
          140  +.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
   135    141   .de VS
   136    142   .if !"\\$2"" .br
   137    143   .mk ^Y
   138    144   .ie n 'mc \s12\(br\s0
   139    145   .el .nr ^v 1u
   140    146   ..
   141         -'\"	# VE - end of vertical sidebar
          147  +.\"	# VE - end of vertical sidebar
   142    148   .de VE
   143    149   .ie n 'mc
   144    150   .el \{\
   145    151   .ev 2
   146    152   .nf
   147    153   .ti 0
   148    154   .mk ^t
................................................................................
   149    155   \h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
   150    156   .sp -1
   151    157   .fi
   152    158   .ev
   153    159   .\}
   154    160   .nr ^v 0
   155    161   ..
   156         -'\"	# Special macro to handle page bottom:  finish off current
   157         -'\"	# box/sidebar if in box/sidebar mode, then invoked standard
   158         -'\"	# page bottom macro.
          162  +.\"	# Special macro to handle page bottom:  finish off current
          163  +.\"	# box/sidebar if in box/sidebar mode, then invoked standard
          164  +.\"	# page bottom macro.
   159    165   .de ^B
   160    166   .ev 2
   161    167   'ti 0
   162    168   'nf
   163    169   .mk ^t
   164    170   .if \\n(^b \{\
   165    171   .\"	Draw three-sided box if this is the box's first page,
................................................................................
   178    184   .mk ^y
   179    185   .nr ^b 2
   180    186   .\}
   181    187   .if \\n(^v \{\
   182    188   .mk ^Y
   183    189   .\}
   184    190   ..
   185         -'\"	# DS - begin display
          191  +.\"	# DS - begin display
   186    192   .de DS
   187    193   .RS
   188    194   .nf
   189    195   .sp
   190    196   ..
   191         -'\"	# DE - end display
          197  +.\"	# DE - end display
   192    198   .de DE
   193    199   .fi
   194    200   .RE
   195    201   .sp
   196    202   ..
   197         -'\"	# SO - start of list of standard options
          203  +.\"	# SO - start of list of standard options
   198    204   .de SO
          205  +'ie '\\$1'' .ds So \\fBoptions\\fR
          206  +'el .ds So \\fB\\$1\\fR
   199    207   .SH "STANDARD OPTIONS"
   200    208   .LP
   201    209   .nf
   202         -.ta 4c 8c 12c
          210  +.ta 5.5c 11c
   203    211   .ft B
   204    212   ..
   205         -'\"	# SE - end of list of standard options
          213  +.\"	# SE - end of list of standard options
   206    214   .de SE
   207    215   .fi
   208    216   .ft R
   209    217   .LP
   210         -See the \\fBoptions\\fR manual entry for details on the standard options.
          218  +See the \\*(So manual entry for details on the standard options.
   211    219   ..
   212         -'\"	# OP - start of full description for a single option
          220  +.\"	# OP - start of full description for a single option
   213    221   .de OP
   214    222   .LP
   215    223   .nf
   216    224   .ta 4c
   217    225   Command-Line Name:	\\fB\\$1\\fR
   218    226   Database Name:	\\fB\\$2\\fR
   219    227   Database Class:	\\fB\\$3\\fR
   220    228   .fi
   221    229   .IP
   222    230   ..
   223         -'\"	# CS - begin code excerpt
          231  +.\"	# CS - begin code excerpt
   224    232   .de CS
   225    233   .RS
   226    234   .nf
   227    235   .ta .25i .5i .75i 1i
   228    236   ..
   229         -'\"	# CE - end code excerpt
          237  +.\"	# CE - end code excerpt
   230    238   .de CE
   231    239   .fi
   232    240   .RE
   233    241   ..
          242  +.\"	# UL - underline word
   234    243   .de UL
   235    244   \\$1\l'|0\(ul'\\$2
          245  +..
          246  +.\"	# QW - apply quotation marks to word
          247  +.de QW
          248  +.ie '\\*(lq'"' ``\\$1''\\$2
          249  +.\"" fix emacs highlighting
          250  +.el \\*(lq\\$1\\*(rq\\$2
          251  +..
          252  +.\"	# PQ - apply parens and quotation marks to word
          253  +.de PQ
          254  +.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
          255  +.\"" fix emacs highlighting
          256  +.el (\\*(lq\\$1\\*(rq\\$2)\\$3
          257  +..
          258  +.\"	# QR - quoted range
          259  +.de QR
          260  +.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
          261  +.\"" fix emacs highlighting
          262  +.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
          263  +..
          264  +.\"	# MT - "empty" string
          265  +.de MT
          266  +.QW ""
   236    267   ..

Changes to pkgIndex.tcl.in.

     1         -# Tcl package index file, version 1.0
     2         -
            1  +#
            2  +# Tcl package index file
            3  +#
     3      4   if {![package vsatisfies [package provide Tcl] 8.6]} return
     4      5   if {[string length [package provide Itcl]] && ![package vsatisfies [package provide Itcl] 4.1]} return
     5      6   package ifneeded itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
     6      7   package ifneeded Itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]

Changes to tests/all.tcl.

     3      3   # This file contains a top-level script to run all of the Tcl
     4      4   # tests.  Execute it by invoking "source all.test" when running tcltest
     5      5   # in this directory.
     6      6   #
     7      7   # Copyright (c) 1998-2000 by Ajuba Solutions
     8      8   # All rights reserved.
     9      9   
    10         -package require tcltest 2.1
           10  +package prefer latest
           11  +
           12  +package require Tcl 8.6
           13  +package require tcltest 2.2
    11     14   
    12         -tcltest::testsDirectory [file dir [info script]]
           15  +tcltest::configure {*}$argv -testdir [file dir [info script]]
    13     16   tcltest::runAllTests
    14     17   
    15     18   return