* unix/tcl.m4: New macro SC_CONFIG_MANPAGES.

	* unix/configure.in: Added support for symlinks and compression
	* unix/Makefile.in:  when installing the manpages. [Patch 518052]
	                     Default is still hardlinks and no compression.

	* unix/mkLinks:      generated
	* unix/configure:

	* unix/README:       Added documentation for the new features.

7 files changed, 1283 insertions, 762 deletions

diff --git a/ChangeLog b/ChangeLog
index df565ec..b638a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,16 @@
 
 2002-06-25  Reinhard Max  <max@suse.de>
 
+	* unix/tcl.m4:       New macro SC_CONFIG_MANPAGES.
+	* unix/configure.in: Added support for symlinks and compression
+	* unix/Makefile.in:  when installing the manpages. [Patch 518052]
+	                     Default is still hardlinks and no compression.
+
+	* unix/mkLinks:      generated
+	* unix/configure:
+
+	* unix/README:       Added documentation for the new features.
+
 	* unix/configure:                  Replaced ${exec_prefix}/lib
 	* unix/tcl.m4 (SC_PATH_TCLCONFIG): by ${libdir}.
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 62f9bec..a756044 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.71 2002/06/21 23:09:53 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.72 2002/06/25 16:45:12 rmax Exp $
 
 # Current Tk version;  used in various names.
 
@@ -242,6 +242,10 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
 # either.
 #----------------------------------------------------------------
 
+# Flags to be passed to mkLinks to control whether the manpages
+# should be compressed and linked with softlinks
+MKLINKS_FLAGS           = @MKLINKS_FLAGS@
+
 CC			= @CC@
 
 CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
@@ -490,9 +494,6 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	@if test ! -x $(UNIX_DIR)/install-sh; then \
 	    chmod +x $(UNIX_DIR)/install-sh; \
 	    fi
-	@if test ! -x $(UNIX_DIR)/mkLinks; then \
-	    chmod +x $(UNIX_DIR)/mkLinks; \
-	    fi
 	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
 	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@@ -587,6 +588,9 @@ install-demos:
 	    done;
 
 install-doc:
+	@if test ! -x $(UNIX_DIR)/mkLinks; then \
+	    chmod +x $(UNIX_DIR)/mkLinks; \
+	    fi
 	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
@@ -605,7 +609,7 @@ install-doc:
 	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
 	    done;
 	@echo "Cross-linking top-level (.1) docs";
-	@$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
 	@echo "Installing C API (.3) docs";
 	@cd $(SRC_DIR)/doc; for i in *.3; \
 	    do \
@@ -615,7 +619,7 @@ install-doc:
 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
 	    done;
 	@echo "Cross-linking top-level (.3) docs";
-	@$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
 	@echo "Installing command (.n) docs";
 	@cd $(SRC_DIR)/doc; for i in *.n; \
 	    do \
@@ -625,7 +629,7 @@ install-doc:
 	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
 	    done;
 	@echo "Cross-linking command (.n) docs";
-	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
+	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
 
 Makefile: $(UNIX_DIR)/Makefile.in
 	$(SHELL) config.status
@@ -1010,6 +1014,11 @@ rpm: all /bin/rpm
 	mv RPMS/i386/*.rpm .
 	rm -rf RPMS THIS.TK.SPEC
 
+mklinks:
+	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl \
+		$(UNIX_DIR)/../doc/*.[13n] > $(UNIX_DIR)/mkLinks
+	chmod +x $(UNIX_DIR)/mkLinks
+
 #
 # Target to create a proper Tk distribution from information in the
 # master source directory.  DISTDIR must be defined to indicate where
@@ -1024,7 +1033,7 @@ TCLDIR = 	@TCL_SRC_DIR@
 $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in
 	autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure
 
-dist:   $(UNIX_DIR)/configure
+dist:   $(UNIX_DIR)/configure mklinks
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)
 	mkdir $(DISTDIR)/unix
@@ -1034,12 +1043,9 @@ dist:   $(UNIX_DIR)/configure
 	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
 		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
-		$(UNIX_DIR)/README $(DISTDIR)/unix
+		$(UNIX_DIR)/README $(UNIX_DIR)/mkLinks $(DISTDIR)/unix
 	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
 	chmod +x $(DISTDIR)/unix/install-sh
-	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl $(TOP_DIR)/doc/*.[13n] \
-		> $(DISTDIR)/unix/mkLinks
-	chmod +x $(DISTDIR)/unix/mkLinks
 	mkdir $(DISTDIR)/bitmaps
 	@(cd $(TOP_DIR); for i in bitmaps/* ; do \
 	    if [ -f $$i ] ; then \
diff --git a/unix/README b/unix/README
index 8c65b7b..6c19bc6 100644
--- a/unix/README
+++ b/unix/README
@@ -20,7 +20,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for a Macintosh, see the README file in the directory ../mac.
 
-RCS: @(#) $Id: README,v 1.14 2002/03/05 20:34:15 hobbs Exp $
+RCS: @(#) $Id: README,v 1.15 2002/06/25 16:45:12 rmax Exp $
 
 How To Compile And Install Tk:
 ------------------------------
@@ -64,6 +64,10 @@ How To Compile And Install Tk:
 	--disable-64bit		disable 64bit support (where applicable)
 	--enable-64bit-vis	enable 64bit Sparc VIS support
 	--disable-64bit-vis	disable 64bit Sparc VIS support
+	--enable-man-symlinks	Use symlinks for linking the manpages that
+				should be reachable under several names.
+	--enable-man-compression=PROG
+				Compress the manpages using PROG.
 
     Note: by default gcc will be used if it can be located on the PATH.
     if you want to use cc instead of gcc, set the CC environment variable
diff --git a/unix/configure b/unix/configure
index e0a6eb4..791dad6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -12,6 +12,11 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
+  --enable-man-symlinks   use symlinks for the manpages"
+ac_help="$ac_help
+  --enable-man-compression=PROG
+                          compress the manpages with PROG"
+ac_help="$ac_help
   --enable-threads        build with threads"
 ac_help="$ac_help
   --with-tcl              directory containing tcl configuration (tclConfig.sh)"
@@ -562,6 +567,39 @@ srcdir=`cd $srcdir ; pwd`
 TK_SRC_DIR=`cd $srcdir/..; pwd`
 
 #------------------------------------------------------------------------
+# Compress and/or soft link the manpages?
+#------------------------------------------------------------------------
+
+
+	echo $ac_n "checking whether to use symlinks for manpages""... $ac_c" 1>&6
+echo "configure:576: checking whether to use symlinks for manpages" >&5
+	# Check whether --enable-man-symlinks or --disable-man-symlinks was given.
+if test "${enable_man_symlinks+set}" = set; then
+  enableval="$enable_man_symlinks"
+  test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --symlinks"
+else
+  enableval="no"
+fi
+
+	echo "$ac_t""$enableval" 1>&6
+
+	echo $ac_n "checking compression for manpages""... $ac_c" 1>&6
+echo "configure:588: checking compression for manpages" >&5
+	# Check whether --enable-man-compression or --disable-man-compression was given.
+if test "${enable_man_compression+set}" = set; then
+  enableval="$enable_man_compression"
+  test "$enableval" = "yes" && echo && { echo "configure: error: missing argument to --enable-man-compression" 1>&2; exit 1; }
+		test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --compress $enableval"
+else
+  enableval="no"
+fi
+
+	echo "$ac_t""$enableval" 1>&6
+
+	
+
+
+#------------------------------------------------------------------------
 # Standard compiler checks
 #------------------------------------------------------------------------
 
@@ -574,7 +612,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:578: checking for $ac_word" >&5
+echo "configure:616: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -604,7 +642,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:608: checking for $ac_word" >&5
+echo "configure:646: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -655,7 +693,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:659: checking for $ac_word" >&5
+echo "configure:697: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -687,7 +725,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:691: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -698,12 +736,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 702 "configure"
+#line 740 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -729,12 +767,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:738: checking whether we are using GNU C" >&5
+echo "configure:776: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -743,7 +781,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -762,7 +800,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:766: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:804: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -796,7 +834,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:800: checking for $ac_word" >&5
+echo "configure:838: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -829,7 +867,7 @@ fi
 #------------------------------------------------------------------------
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:833: checking how to run the C preprocessor" >&5
+echo "configure:871: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -844,13 +882,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 848 "configure"
+#line 886 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -861,13 +899,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 865 "configure"
+#line 903 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -878,13 +916,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 882 "configure"
+#line 920 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -912,17 +950,17 @@ for ac_hdr in unistd.h limits.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:916: checking for $ac_hdr" >&5
+echo "configure:954: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 921 "configure"
+#line 959 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -955,7 +993,7 @@ done
 
 
     echo $ac_n "checking for building with threads""... $ac_c" 1>&6
-echo "configure:959: checking for building with threads" >&5
+echo "configure:997: checking for building with threads" >&5
     # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
@@ -987,7 +1025,7 @@ EOF
 EOF
 
 	echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:991: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:1029: checking for pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -995,7 +1033,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 999 "configure"
+#line 1037 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1006,7 +1044,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1034,7 +1072,7 @@ fi
 	    # pthread.h, but that will work with libpthread really doesn't
 	    # exist, like AIX 4.2.  [Bug: 4359]
 	    echo $ac_n "checking for __pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:1038: checking for __pthread_mutex_init in -lpthread" >&5
+echo "configure:1076: checking for __pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'__pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1042,7 +1080,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1046 "configure"
+#line 1084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1053,7 +1091,7 @@ int main() {
 __pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1081,7 +1119,7 @@ fi
 	    THREADS_LIBS=" -lpthread"
 	else
 	    echo $ac_n "checking for pthread_mutex_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:1085: checking for pthread_mutex_init in -lpthreads" >&5
+echo "configure:1123: checking for pthread_mutex_init in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1089,7 +1127,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1093 "configure"
+#line 1131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1100,7 +1138,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1126,7 +1164,7 @@ fi
 		THREADS_LIBS=" -lpthreads"
 	    else
 		echo $ac_n "checking for pthread_mutex_init in -lc""... $ac_c" 1>&6
-echo "configure:1130: checking for pthread_mutex_init in -lc" >&5
+echo "configure:1168: checking for pthread_mutex_init in -lc" >&5
 ac_lib_var=`echo c'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1134,7 +1172,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1138 "configure"
+#line 1176 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1145,7 +1183,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1168,7 +1206,7 @@ fi
 
 	    	if test "$tcl_ok" = "no"; then
 		    echo $ac_n "checking for pthread_mutex_init in -lc_r""... $ac_c" 1>&6
-echo "configure:1172: checking for pthread_mutex_init in -lc_r" >&5
+echo "configure:1210: checking for pthread_mutex_init in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1176,7 +1214,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1180 "configure"
+#line 1218 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1187,7 +1225,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1225,12 +1263,12 @@ fi
 	for ac_func in pthread_attr_setstacksize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_func" >&5
+echo "configure:1267: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1234 "configure"
+#line 1272 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1253,7 +1291,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1292,18 +1330,18 @@ done
 if test -z "$no_pipe"; then
 if test -n "$GCC"; then
   echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6
-echo "configure:1296: checking if the compiler understands -pipe" >&5
+echo "configure:1334: checking if the compiler understands -pipe" >&5
   OLDCC="$CC"  
   CC="$CC -pipe"
   cat > conftest.$ac_ext <<EOF
-#line 1300 "configure"
+#line 1338 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1323,21 +1361,21 @@ fi
 
 
     echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6
-echo "configure:1327: checking for required early compiler flags" >&5
+echo "configure:1365: checking for required early compiler flags" >&5
     tcl_flags=""
     
     if eval "test \"`echo '$''{'tcl_cv_flag__isoc99_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1334 "configure"
+#line 1372 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
 char *p = (char *)strtoll; char *q = (char *)strtoull;
 ; return 0; }
 EOF
-if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__isoc99_source=no
 else
@@ -1345,7 +1383,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 1349 "configure"
+#line 1387 "configure"
 #include "confdefs.h"
 #define _ISOC99_SOURCE 1
 #include <stdlib.h>
@@ -1353,7 +1391,7 @@ int main() {
 char *p = (char *)strtoll; char *q = (char *)strtoull;
 ; return 0; }
 EOF
-if { (eval echo configure:1357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__isoc99_source=yes
 else
@@ -1379,14 +1417,14 @@ EOF
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1383 "configure"
+#line 1421 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 int main() {
 struct stat64 buf; int i = stat64("/", &buf);
 ; return 0; }
 EOF
-if { (eval echo configure:1390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__largefile64_source=no
 else
@@ -1394,7 +1432,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 1398 "configure"
+#line 1436 "configure"
 #include "confdefs.h"
 #define _LARGEFILE64_SOURCE 1
 #include <sys/stat.h>
@@ -1402,7 +1440,7 @@ int main() {
 struct stat64 buf; int i = stat64("/", &buf);
 ; return 0; }
 EOF
-if { (eval echo configure:1406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__largefile64_source=yes
 else
@@ -1431,20 +1469,20 @@ EOF
 
 
     echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6
-echo "configure:1435: checking for 64-bit integer type" >&5
+echo "configure:1473: checking for 64-bit integer type" >&5
     if eval "test \"`echo '$''{'tcl_cv_type_64bit'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 1441 "configure"
+#line 1479 "configure"
 #include "confdefs.h"
 
 int main() {
 __int64 value = (__int64) 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_type_64bit=__int64
 else
@@ -1456,13 +1494,13 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1460 "configure"
+#line 1498 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 		int main() {exit(!(sizeof(long long) > sizeof(long)));}
 		
 EOF
-if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   tcl_cv_type_64bit="long long"
 else
@@ -1487,13 +1525,13 @@ EOF
 
 	# Now check for auxiliary declarations
 	echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6
-echo "configure:1491: checking for struct dirent64" >&5
+echo "configure:1529: checking for struct dirent64" >&5
 	if eval "test \"`echo '$''{'tcl_cv_struct_dirent64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	    cat > conftest.$ac_ext <<EOF
-#line 1497 "configure"
+#line 1535 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/dirent.h>
@@ -1501,7 +1539,7 @@ int main() {
 struct dirent64 p;
 ; return 0; }
 EOF
-if { (eval echo configure:1505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_struct_dirent64=yes
 else
@@ -1522,13 +1560,13 @@ EOF
 	echo "$ac_t""${tcl_cv_struct_dirent64}" 1>&6
 
 	echo $ac_n "checking for struct stat64""... $ac_c" 1>&6
-echo "configure:1526: checking for struct stat64" >&5
+echo "configure:1564: checking for struct stat64" >&5
 	if eval "test \"`echo '$''{'tcl_cv_struct_stat64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	    cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1570 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 int main() {
@@ -1536,7 +1574,7 @@ struct stat64 p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_struct_stat64=yes
 else
@@ -1557,13 +1595,13 @@ EOF
 	echo "$ac_t""${tcl_cv_struct_stat64}" 1>&6
 
 	echo $ac_n "checking for off64_t""... $ac_c" 1>&6
-echo "configure:1561: checking for off64_t" >&5
+echo "configure:1599: checking for off64_t" >&5
 	if eval "test \"`echo '$''{'tcl_cv_type_off64_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	    cat > conftest.$ac_ext <<EOF
-#line 1567 "configure"
+#line 1605 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -1571,7 +1609,7 @@ off64_t offset;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_type_off64_t=yes
 else
@@ -1613,7 +1651,7 @@ if test "${with_tcl+set}" = set; then
 fi
 
 	echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
-echo "configure:1617: checking for Tcl configuration" >&5
+echo "configure:1655: checking for Tcl configuration" >&5
 	if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1686,7 +1724,7 @@ fi
 
 
     echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1690: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1728: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
 
     if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
         echo "$ac_t""loading" 1>&6
@@ -1741,7 +1779,7 @@ echo "configure:1690: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
 
 
     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1745: checking how to build libraries" >&5
+echo "configure:1783: checking how to build libraries" >&5
     # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1776,7 +1814,7 @@ EOF
     # Step 0.a: Enable 64 bit support?
 
     echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1780: checking if 64bit support is requested" >&5
+echo "configure:1818: checking if 64bit support is requested" >&5
     # Check whether --enable-64bit or --disable-64bit was given.
 if test "${enable_64bit+set}" = set; then
   enableval="$enable_64bit"
@@ -1796,7 +1834,7 @@ fi
     # Step 0.b: Enable Solaris 64 bit VIS support?
 
     echo $ac_n "checking if 64bit Sparc VIS support is requested""... $ac_c" 1>&6
-echo "configure:1800: checking if 64bit Sparc VIS support is requested" >&5
+echo "configure:1838: checking if 64bit Sparc VIS support is requested" >&5
     # Check whether --enable-64bit-vis or --disable-64bit-vis was given.
 if test "${enable_64bit_vis+set}" = set; then
   enableval="$enable_64bit_vis"
@@ -1820,7 +1858,7 @@ fi
     # there are a few systems, like Next, where this doesn't work.
 
     echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6
-echo "configure:1824: checking system version (for dynamic loading)" >&5
+echo "configure:1862: checking system version (for dynamic loading)" >&5
     if test -f /usr/lib/NextStep/software_version; then
 	system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
     else
@@ -1846,7 +1884,7 @@ echo "configure:1824: checking system version (for dynamic loading)" >&5
     # Linux can use either -ldl or -ldld for dynamic loading.
 
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1850: checking for dlopen in -ldl" >&5
+echo "configure:1888: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1854,7 +1892,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1858 "configure"
+#line 1896 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1865,7 +1903,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1909,7 +1947,7 @@ fi
     # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1913: checking for $ac_word" >&5
+echo "configure:1951: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2015,7 +2053,7 @@ fi
 	    # known GMT value.
 
 	    echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:2019: checking for gettimeofday in -lbsd" >&5
+echo "configure:2057: checking for gettimeofday in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2023,7 +2061,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2027 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2034,7 +2072,7 @@ int main() {
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2113,7 +2151,7 @@ EOF
 
 	    SHLIB_SUFFIX=".sl"
 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:2117: checking for shl_load in -ldld" >&5
+echo "configure:2155: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2121,7 +2159,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2125 "configure"
+#line 2163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2132,7 +2170,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2177,7 +2215,7 @@ fi
 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	    SHLIB_SUFFIX=".sl"
 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:2181: checking for shl_load in -ldld" >&5
+echo "configure:2219: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2185,7 +2223,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2189 "configure"
+#line 2227 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2196,7 +2234,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:2200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2303,17 +2341,17 @@ fi
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2307: checking for dld.h" >&5
+echo "configure:2345: checking for dld.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2312 "configure"
+#line 2350 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2370,17 +2408,17 @@ fi
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2374: checking for dld.h" >&5
+echo "configure:2412: checking for dld.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2379 "configure"
+#line 2417 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2435,17 +2473,17 @@ fi
 	    # Not available on all versions:  check for include file.
 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:2439: checking for dlfcn.h" >&5
+echo "configure:2477: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2444 "configure"
+#line 2482 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2472,9 +2510,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 		LDFLAGS=""
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2476: checking for ELF" >&5
+echo "configure:2514: checking for ELF" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 2478 "configure"
+#line 2516 "configure"
 #include "confdefs.h"
 
 #ifdef __ELF__
@@ -2805,17 +2843,17 @@ EOF
 	    # that don't grok the -Bexport option.  Test that it does.
 	    hold_ldflags=$LDFLAGS
 	    echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
-echo "configure:2809: checking for ld accepts -Bexport flag" >&5
+echo "configure:2847: checking for ld accepts -Bexport flag" >&5
 	    LDFLAGS="${LDFLAGS} -Wl,-Bexport"
 	    cat > conftest.$ac_ext <<EOF
-#line 2812 "configure"
+#line 2850 "configure"
 #include "confdefs.h"
 
 int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   found=yes
 else
@@ -2861,9 +2899,9 @@ rm -f conftest*
 
     if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
 	echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
-echo "configure:2865: checking sys/exec.h" >&5
+echo "configure:2903: checking sys/exec.h" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+#line 2905 "configure"
 #include "confdefs.h"
 #include <sys/exec.h>
 int main() {
@@ -2881,7 +2919,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -2899,9 +2937,9 @@ EOF
 
 	else
 	    echo $ac_n "checking a.out.h""... $ac_c" 1>&6
-echo "configure:2903: checking a.out.h" >&5
+echo "configure:2941: checking a.out.h" >&5
 	    cat > conftest.$ac_ext <<EOF
-#line 2905 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 #include <a.out.h>
 int main() {
@@ -2919,7 +2957,7 @@ int main() {
 	    
 ; return 0; }
 EOF
-if { (eval echo configure:2923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -2937,9 +2975,9 @@ EOF
 
 	    else
 		echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
-echo "configure:2941: checking sys/exec_aout.h" >&5
+echo "configure:2979: checking sys/exec_aout.h" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 2943 "configure"
+#line 2981 "configure"
 #include "confdefs.h"
 #include <sys/exec_aout.h>
 int main() {
@@ -2957,7 +2995,7 @@ int main() {
 		
 ; return 0; }
 EOF
-if { (eval echo configure:2961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -3054,7 +3092,7 @@ fi
 
 
     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:3058: checking for build with symbols" >&5
+echo "configure:3096: checking for build with symbols" >&5
     # Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
   enableval="$enable_symbols"
@@ -3098,12 +3136,12 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:3102: checking for sin" >&5
+echo "configure:3140: checking for sin" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3107 "configure"
+#line 3145 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -3126,7 +3164,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -3147,7 +3185,7 @@ MATH_LIBS="-lm"
 fi
 
 echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
-echo "configure:3151: checking for main in -lieee" >&5
+echo "configure:3189: checking for main in -lieee" >&5
 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3155,14 +3193,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lieee  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3197 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3193,7 +3231,7 @@ fi
 libbsd=no
 if test "`uname -s`" = "AIX" ; then
     echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:3197: checking for gettimeofday in -lbsd" >&5
+echo "configure:3235: checking for gettimeofday in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3201,7 +3239,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3205 "configure"
+#line 3243 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3212,7 +3250,7 @@ int main() {
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3243,9 +3281,9 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
-echo "configure:3247: checking stdlib.h" >&5
+echo "configure:3285: checking stdlib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3249 "configure"
+#line 3287 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3260,7 +3298,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 3264 "configure"
+#line 3302 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3274,7 +3312,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 3278 "configure"
+#line 3316 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3306,16 +3344,16 @@ echo "$ac_t""$tk_ok" 1>&6
 #--------------------------------------------------------------------
 
 echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
-echo "configure:3310: checking fd_set and sys/select" >&5
+echo "configure:3348: checking fd_set and sys/select" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3312 "configure"
+#line 3350 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 fd_set readMask, writeMask;
 ; return 0; }
 EOF
-if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tk_ok=yes
 else
@@ -3327,7 +3365,7 @@ fi
 rm -f conftest*
 if test $tk_ok = no; then
     cat > conftest.$ac_ext <<EOF
-#line 3331 "configure"
+#line 3369 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
@@ -3359,12 +3397,12 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3363: checking for ANSI C header files" >&5
+echo "configure:3401: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3368 "configure"
+#line 3406 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3372,7 +3410,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3389,7 +3427,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3393 "configure"
+#line 3431 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3407,7 +3445,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3411 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3428,7 +3466,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3432 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3439,7 +3477,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3463,12 +3501,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3467: checking for mode_t" >&5
+echo "configure:3505: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3472 "configure"
+#line 3510 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3496,12 +3534,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3500: checking for pid_t" >&5
+echo "configure:3538: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3505 "configure"
+#line 3543 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3529,12 +3567,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3533: checking for size_t" >&5
+echo "configure:3571: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3538 "configure"
+#line 3576 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3562,12 +3600,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3566: checking for uid_t in sys/types.h" >&5
+echo "configure:3604: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3571 "configure"
+#line 3609 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3604,17 +3642,17 @@ for ac_hdr in sys/time.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3608: checking for $ac_hdr" >&5
+echo "configure:3646: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3613 "configure"
+#line 3651 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3641,12 +3679,12 @@ fi
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3645: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3683: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3650 "configure"
+#line 3688 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3655,7 +3693,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3681,16 +3719,16 @@ fi
 #-------------------------------------------
 
 echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
-echo "configure:3685: checking pw_gecos in struct pwd" >&5
+echo "configure:3723: checking pw_gecos in struct pwd" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3687 "configure"
+#line 3725 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 struct passwd pwd; pwd.pw_gecos;
 ; return 0; }
 EOF
-if { (eval echo configure:3694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tk_ok=yes
 else
@@ -3723,7 +3761,7 @@ fi
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3727: checking for X" >&5
+echo "configure:3765: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -3785,12 +3823,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3789 "configure"
+#line 3827 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3859,14 +3897,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3863 "configure"
+#line 3901 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -3956,12 +3994,12 @@ fi
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
 	    cat > conftest.$ac_ext <<EOF
-#line 3960 "configure"
+#line 3998 "configure"
 #include "confdefs.h"
 #include <X11/XIntrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3981,15 +4019,15 @@ rm -f conftest*
     fi
     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
 	echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
-echo "configure:3985: checking for X11 header files" >&5
+echo "configure:4023: checking for X11 header files" >&5
 	XINCLUDES="# no special path needed"
 	cat > conftest.$ac_ext <<EOF
-#line 3988 "configure"
+#line 4026 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -4025,7 +4063,7 @@ rm -f conftest*
 
     if test "$no_x" = yes; then
 	echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
-echo "configure:4029: checking for X11 libraries" >&5
+echo "configure:4067: checking for X11 libraries" >&5
 	XLIBSW=nope
 	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
 	for i in $dirs ; do
@@ -4045,7 +4083,7 @@ echo "configure:4029: checking for X11 libraries" >&5
     fi
     if test "$XLIBSW" = nope ; then
 	echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6
-echo "configure:4049: checking for XCreateWindow in -lXwindow" >&5
+echo "configure:4087: checking for XCreateWindow in -lXwindow" >&5
 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4053,7 +4091,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXwindow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4057 "configure"
+#line 4095 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4064,7 +4102,7 @@ int main() {
 XCreateWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4149,7 +4187,7 @@ esac
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:4153: checking for main in -lXbsd" >&5
+echo "configure:4191: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4157,14 +4195,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4161 "configure"
+#line 4199 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4187,12 +4225,12 @@ fi
 
 tk_checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4191: checking for connect" >&5
+echo "configure:4229: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4196 "configure"
+#line 4234 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4215,7 +4253,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4237,7 +4275,7 @@ fi
 
 if test "$tk_checkSocket" = 1; then
     echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:4241: checking for main in -lsocket" >&5
+echo "configure:4279: checking for main in -lsocket" >&5
 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4245,14 +4283,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4249 "configure"
+#line 4287 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4278,12 +4316,12 @@ if test "$tk_checkBoth" = 1; then
     tk_oldLibs=$LIBS
     LIBS="$LIBS -lsocket -lnsl"
     echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:4282: checking for accept" >&5
+echo "configure:4320: checking for accept" >&5
 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4287 "configure"
+#line 4325 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -4306,7 +4344,7 @@ accept();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_accept=yes"
 else
@@ -4328,12 +4366,12 @@ fi
 
 fi
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4332: checking for gethostbyname" >&5
+echo "configure:4370: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4337 "configure"
+#line 4375 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4356,7 +4394,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4374,7 +4412,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:4378: checking for main in -lnsl" >&5
+echo "configure:4416: checking for main in -lnsl" >&5
 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4382,14 +4420,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4386 "configure"
+#line 4424 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4429,13 +4467,13 @@ LIBS="$LIBS$THREADS_LIBS"
 
 if test -d /usr/include/mit ; then
     echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
-echo "configure:4433: checking MIT X libraries" >&5
+echo "configure:4471: checking MIT X libraries" >&5
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -I/usr/include/mit"
     tk_oldLibs=$LIBS
     LIBS="$LIBS -lX11-mit"
     cat > conftest.$ac_ext <<EOF
-#line 4439 "configure"
+#line 4477 "configure"
 #include "confdefs.h"
 
 	#include <X11/Xlib.h>
@@ -4446,7 +4484,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 	echo "$ac_t""yes" 1>&6
@@ -4473,12 +4511,12 @@ fi
 
 MATH_LIBS=""
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4477: checking for sin" >&5
+echo "configure:4515: checking for sin" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4482 "configure"
+#line 4520 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4501,7 +4539,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4522,7 +4560,7 @@ MATH_LIBS="-lm"
 fi
 
 echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
-echo "configure:4526: checking for main in -lieee" >&5
+echo "configure:4564: checking for main in -lieee" >&5
 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4530,14 +4568,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lieee  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4534 "configure"
+#line 4572 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4564,14 +4602,14 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:4568: checking whether char is unsigned" >&5
+echo "configure:4606: checking whether char is unsigned" >&5
 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
 cat > conftest.$ac_ext <<EOF
-#line 4575 "configure"
+#line 4613 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -4593,7 +4631,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4597 "configure"
+#line 4635 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -4603,7 +4641,7 @@ main() {
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_char_unsigned=yes
 else
@@ -4636,12 +4674,12 @@ fi
 
 
     echo $ac_n "checking for strtod""... $ac_c" 1>&6
-echo "configure:4640: checking for strtod" >&5
+echo "configure:4678: checking for strtod" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4645 "configure"
+#line 4683 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strtod(); below.  */
@@ -4664,7 +4702,7 @@ strtod();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_strtod=yes"
 else
@@ -4686,12 +4724,12 @@ fi
 
     if test "$tcl_strtod" = 1; then
 	echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
-echo "configure:4690: checking for Solaris2.4/Tru64 strtod bugs" >&5
+echo "configure:4728: checking for Solaris2.4/Tru64 strtod bugs" >&5
 	if test "$cross_compiling" = yes; then
   tcl_ok=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4695 "configure"
+#line 4733 "configure"
 #include "confdefs.h"
 
 	    extern double strtod();
@@ -4711,7 +4749,7 @@ else
 		exit(0);
 	    }
 EOF
-if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   tcl_ok=1
 else
@@ -5014,6 +5052,7 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@MKLINKS_FLAGS@%$MKLINKS_FLAGS%g
 s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
 s%@CPP@%$CPP%g
diff --git a/unix/configure.in b/unix/configure.in
index b988a81..0147bca 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.73 2002/06/22 00:02:49 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.74 2002/06/25 16:45:12 rmax Exp $
 
 AC_INIT(../generic/tk.h)
 
@@ -31,6 +31,11 @@ srcdir=`cd $srcdir ; pwd`
 TK_SRC_DIR=`cd $srcdir/..; pwd`
 
 #------------------------------------------------------------------------
+# Compress and/or soft link the manpages?
+#------------------------------------------------------------------------
+SC_CONFIG_MANPAGES
+
+#------------------------------------------------------------------------
 # Standard compiler checks
 #------------------------------------------------------------------------
 
diff --git a/unix/mkLinks b/unix/mkLinks
index c93635d..2c1d98f 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -15,11 +15,34 @@
 # The script takes one argument, which is the name of the directory
 # where the manual entries have been installed.
 
+ZIP=true
+while true; do
+    case $1 in
+        -s | --symlinks )
+            S=-s
+            ;;
+        -z | --compress )
+            ZIP=$2
+            shift
+            ;;
+        *) break
+            ;;
+    esac
+    shift
+done
+
 if test $# != 1; then
-    echo "Usage: mkLinks dir"
+    echo "Usage: mkLinks <options> dir"
     exit 1
 fi
 
+if test "x$ZIP" != "xtrue"; then
+    touch TeST
+    $ZIP TeST
+    Z=`ls TeST* | sed 's/^[^.]*//'`
+    rm -f TeST*
+fi
+
 cd $1
 echo foo > xyzzyTestingAVeryLongFileName.foo
 x=`echo xyzzyTe*`
@@ -34,737 +57,1129 @@ if test "$y" != "xyzzyTestingaverylongfilename.foo"; then
 fi
 
 if test -r 3DBorder.3; then
-    rm -f Tk_Alloc3DBorderFromObj.3
-    rm -f Tk_Get3DBorder.3
-    rm -f Tk_Get3DBorderFromObj.3
-    rm -f Tk_Draw3DRectangle.3
-    rm -f Tk_Fill3DRectangle.3
-    rm -f Tk_Draw3DPolygon.3
-    rm -f Tk_Fill3DPolygon.3
-    rm -f Tk_3DVerticalBevel.3
-    rm -f Tk_3DHorizontalBevel.3
-    rm -f Tk_SetBackgroundFromBorder.3
-    rm -f Tk_NameOf3DBorder.3
-    rm -f Tk_3DBorderColor.3
-    rm -f Tk_3DBorderGC.3
-    rm -f Tk_Free3DBorderFromObj.3
-    rm -f Tk_Free3DBorder.3
-    ln 3DBorder.3 Tk_Alloc3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Get3DBorder.3
-    ln 3DBorder.3 Tk_Get3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Draw3DRectangle.3
-    ln 3DBorder.3 Tk_Fill3DRectangle.3
-    ln 3DBorder.3 Tk_Draw3DPolygon.3
-    ln 3DBorder.3 Tk_Fill3DPolygon.3
-    ln 3DBorder.3 Tk_3DVerticalBevel.3
-    ln 3DBorder.3 Tk_3DHorizontalBevel.3
-    ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
-    ln 3DBorder.3 Tk_NameOf3DBorder.3
-    ln 3DBorder.3 Tk_3DBorderColor.3
-    ln 3DBorder.3 Tk_3DBorderGC.3
-    ln 3DBorder.3 Tk_Free3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Free3DBorder.3
+    rm -f 3DBorder.3.*
+    $ZIP 3DBorder.3
+    rm -f Tk_Alloc3DBorderFromObj.3 Tk_Alloc3DBorderFromObj.3.* 
+    rm -f Tk_Get3DBorder.3 Tk_Get3DBorder.3.* 
+    rm -f Tk_Get3DBorderFromObj.3 Tk_Get3DBorderFromObj.3.* 
+    rm -f Tk_Draw3DRectangle.3 Tk_Draw3DRectangle.3.* 
+    rm -f Tk_Fill3DRectangle.3 Tk_Fill3DRectangle.3.* 
+    rm -f Tk_Draw3DPolygon.3 Tk_Draw3DPolygon.3.* 
+    rm -f Tk_Fill3DPolygon.3 Tk_Fill3DPolygon.3.* 
+    rm -f Tk_3DVerticalBevel.3 Tk_3DVerticalBevel.3.* 
+    rm -f Tk_3DHorizontalBevel.3 Tk_3DHorizontalBevel.3.* 
+    rm -f Tk_SetBackgroundFromBorder.3 Tk_SetBackgroundFromBorder.3.* 
+    rm -f Tk_NameOf3DBorder.3 Tk_NameOf3DBorder.3.* 
+    rm -f Tk_3DBorderColor.3 Tk_3DBorderColor.3.* 
+    rm -f Tk_3DBorderGC.3 Tk_3DBorderGC.3.* 
+    rm -f Tk_Free3DBorderFromObj.3 Tk_Free3DBorderFromObj.3.* 
+    rm -f Tk_Free3DBorder.3 Tk_Free3DBorder.3.* 
+    ln $S 3DBorder.3$Z Tk_Alloc3DBorderFromObj.3$Z 
+    ln $S 3DBorder.3$Z Tk_Get3DBorder.3$Z 
+    ln $S 3DBorder.3$Z Tk_Get3DBorderFromObj.3$Z 
+    ln $S 3DBorder.3$Z Tk_Draw3DRectangle.3$Z 
+    ln $S 3DBorder.3$Z Tk_Fill3DRectangle.3$Z 
+    ln $S 3DBorder.3$Z Tk_Draw3DPolygon.3$Z 
+    ln $S 3DBorder.3$Z Tk_Fill3DPolygon.3$Z 
+    ln $S 3DBorder.3$Z Tk_3DVerticalBevel.3$Z 
+    ln $S 3DBorder.3$Z Tk_3DHorizontalBevel.3$Z 
+    ln $S 3DBorder.3$Z Tk_SetBackgroundFromBorder.3$Z 
+    ln $S 3DBorder.3$Z Tk_NameOf3DBorder.3$Z 
+    ln $S 3DBorder.3$Z Tk_3DBorderColor.3$Z 
+    ln $S 3DBorder.3$Z Tk_3DBorderGC.3$Z 
+    ln $S 3DBorder.3$Z Tk_Free3DBorderFromObj.3$Z 
+    ln $S 3DBorder.3$Z Tk_Free3DBorder.3$Z 
 fi
 if test -r AddOption.3; then
-    rm -f Tk_AddOption.3
-    ln AddOption.3 Tk_AddOption.3
+    rm -f AddOption.3.*
+    $ZIP AddOption.3
+    rm -f Tk_AddOption.3 Tk_AddOption.3.* 
+    ln $S AddOption.3$Z Tk_AddOption.3$Z 
 fi
 if test -r BindTable.3; then
-    rm -f Tk_CreateBindingTable.3
-    rm -f Tk_DeleteBindingTable.3
-    rm -f Tk_CreateBinding.3
-    rm -f Tk_DeleteBinding.3
-    rm -f Tk_GetBinding.3
-    rm -f Tk_GetAllBindings.3
-    rm -f Tk_DeleteAllBindings.3
-    rm -f Tk_BindEvent.3
-    ln BindTable.3 Tk_CreateBindingTable.3
-    ln BindTable.3 Tk_DeleteBindingTable.3
-    ln BindTable.3 Tk_CreateBinding.3
-    ln BindTable.3 Tk_DeleteBinding.3
-    ln BindTable.3 Tk_GetBinding.3
-    ln BindTable.3 Tk_GetAllBindings.3
-    ln BindTable.3 Tk_DeleteAllBindings.3
-    ln BindTable.3 Tk_BindEvent.3
+    rm -f BindTable.3.*
+    $ZIP BindTable.3
+    rm -f Tk_CreateBindingTable.3 Tk_CreateBindingTable.3.* 
+    rm -f Tk_DeleteBindingTable.3 Tk_DeleteBindingTable.3.* 
+    rm -f Tk_CreateBinding.3 Tk_CreateBinding.3.* 
+    rm -f Tk_DeleteBinding.3 Tk_DeleteBinding.3.* 
+    rm -f Tk_GetBinding.3 Tk_GetBinding.3.* 
+    rm -f Tk_GetAllBindings.3 Tk_GetAllBindings.3.* 
+    rm -f Tk_DeleteAllBindings.3 Tk_DeleteAllBindings.3.* 
+    rm -f Tk_BindEvent.3 Tk_BindEvent.3.* 
+    ln $S BindTable.3$Z Tk_CreateBindingTable.3$Z 
+    ln $S BindTable.3$Z Tk_DeleteBindingTable.3$Z 
+    ln $S BindTable.3$Z Tk_CreateBinding.3$Z 
+    ln $S BindTable.3$Z Tk_DeleteBinding.3$Z 
+    ln $S BindTable.3$Z Tk_GetBinding.3$Z 
+    ln $S BindTable.3$Z Tk_GetAllBindings.3$Z 
+    ln $S BindTable.3$Z Tk_DeleteAllBindings.3$Z 
+    ln $S BindTable.3$Z Tk_BindEvent.3$Z 
 fi
 if test -r CanvPsY.3; then
-    rm -f Tk_CanvasPsY.3
-    rm -f Tk_CanvasPsBitmap.3
-    rm -f Tk_CanvasPsColor.3
-    rm -f Tk_CanvasPsFont.3
-    rm -f Tk_CanvasPsPath.3
-    rm -f Tk_CanvasPsStipple.3
-    ln CanvPsY.3 Tk_CanvasPsY.3
-    ln CanvPsY.3 Tk_CanvasPsBitmap.3
-    ln CanvPsY.3 Tk_CanvasPsColor.3
-    ln CanvPsY.3 Tk_CanvasPsFont.3
-    ln CanvPsY.3 Tk_CanvasPsPath.3
-    ln CanvPsY.3 Tk_CanvasPsStipple.3
+    rm -f CanvPsY.3.*
+    $ZIP CanvPsY.3
+    rm -f Tk_CanvasPsY.3 Tk_CanvasPsY.3.* 
+    rm -f Tk_CanvasPsBitmap.3 Tk_CanvasPsBitmap.3.* 
+    rm -f Tk_CanvasPsColor.3 Tk_CanvasPsColor.3.* 
+    rm -f Tk_CanvasPsFont.3 Tk_CanvasPsFont.3.* 
+    rm -f Tk_CanvasPsPath.3 Tk_CanvasPsPath.3.* 
+    rm -f Tk_CanvasPsStipple.3 Tk_CanvasPsStipple.3.* 
+    ln $S CanvPsY.3$Z Tk_CanvasPsY.3$Z 
+    ln $S CanvPsY.3$Z Tk_CanvasPsBitmap.3$Z 
+    ln $S CanvPsY.3$Z Tk_CanvasPsColor.3$Z 
+    ln $S CanvPsY.3$Z Tk_CanvasPsFont.3$Z 
+    ln $S CanvPsY.3$Z Tk_CanvasPsPath.3$Z 
+    ln $S CanvPsY.3$Z Tk_CanvasPsStipple.3$Z 
 fi
 if test -r CanvTkwin.3; then
-    rm -f Tk_CanvasTkwin.3
-    rm -f Tk_CanvasGetCoord.3
-    rm -f Tk_CanvasDrawableCoords.3
-    rm -f Tk_CanvasSetStippleOrigin.3
-    rm -f Tk_CanvasWindowCoords.3
-    rm -f Tk_CanvasEventuallyRedraw.3
-    rm -f Tk_CanvasTagsOption.3
-    ln CanvTkwin.3 Tk_CanvasTkwin.3
-    ln CanvTkwin.3 Tk_CanvasGetCoord.3
-    ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
-    ln CanvTkwin.3 Tk_CanvasSetStippleOrigin.3
-    ln CanvTkwin.3 Tk_CanvasWindowCoords.3
-    ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
-    ln CanvTkwin.3 Tk_CanvasTagsOption.3
+    rm -f CanvTkwin.3.*
+    $ZIP CanvTkwin.3
+    rm -f Tk_CanvasTkwin.3 Tk_CanvasTkwin.3.* 
+    rm -f Tk_CanvasGetCoord.3 Tk_CanvasGetCoord.3.* 
+    rm -f Tk_CanvasDrawableCoords.3 Tk_CanvasDrawableCoords.3.* 
+    rm -f Tk_CanvasSetStippleOrigin.3 Tk_CanvasSetStippleOrigin.3.* 
+    rm -f Tk_CanvasWindowCoords.3 Tk_CanvasWindowCoords.3.* 
+    rm -f Tk_CanvasEventuallyRedraw.3 Tk_CanvasEventuallyRedraw.3.* 
+    rm -f Tk_CanvasTagsOption.3 Tk_CanvasTagsOption.3.* 
+    ln $S CanvTkwin.3$Z Tk_CanvasTkwin.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasGetCoord.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasDrawableCoords.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasSetStippleOrigin.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasWindowCoords.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasEventuallyRedraw.3$Z 
+    ln $S CanvTkwin.3$Z Tk_CanvasTagsOption.3$Z 
 fi
 if test -r CanvTxtInfo.3; then
-    rm -f Tk_CanvasTextInfo.3
-    ln CanvTxtInfo.3 Tk_CanvasTextInfo.3
+    rm -f CanvTxtInfo.3.*
+    $ZIP CanvTxtInfo.3
+    rm -f Tk_CanvasTextInfo.3 Tk_CanvasTextInfo.3.* 
+    ln $S CanvTxtInfo.3$Z Tk_CanvasTextInfo.3$Z 
 fi
 if test -r Clipboard.3; then
-    rm -f Tk_ClipboardClear.3
-    rm -f Tk_ClipboardAppend.3
-    ln Clipboard.3 Tk_ClipboardClear.3
-    ln Clipboard.3 Tk_ClipboardAppend.3
+    rm -f Clipboard.3.*
+    $ZIP Clipboard.3
+    rm -f Tk_ClipboardClear.3 Tk_ClipboardClear.3.* 
+    rm -f Tk_ClipboardAppend.3 Tk_ClipboardAppend.3.* 
+    ln $S Clipboard.3$Z Tk_ClipboardClear.3$Z 
+    ln $S Clipboard.3$Z Tk_ClipboardAppend.3$Z 
 fi
 if test -r ClrSelect.3; then
-    rm -f Tk_ClearSelection.3
-    ln ClrSelect.3 Tk_ClearSelection.3
+    rm -f ClrSelect.3.*
+    $ZIP ClrSelect.3
+    rm -f Tk_ClearSelection.3 Tk_ClearSelection.3.* 
+    ln $S ClrSelect.3$Z Tk_ClearSelection.3$Z 
 fi
 if test -r ConfigWidg.3; then
-    rm -f Tk_ConfigureWidget.3
-    rm -f Tk_Offset.3
-    rm -f Tk_ConfigureInfo.3
-    rm -f Tk_ConfigureValue.3
-    rm -f Tk_FreeOptions.3
-    ln ConfigWidg.3 Tk_ConfigureWidget.3
-    ln ConfigWidg.3 Tk_Offset.3
-    ln ConfigWidg.3 Tk_ConfigureInfo.3
-    ln ConfigWidg.3 Tk_ConfigureValue.3
-    ln ConfigWidg.3 Tk_FreeOptions.3
+    rm -f ConfigWidg.3.*
+    $ZIP ConfigWidg.3
+    rm -f Tk_ConfigureWidget.3 Tk_ConfigureWidget.3.* 
+    rm -f Tk_Offset.3 Tk_Offset.3.* 
+    rm -f Tk_ConfigureInfo.3 Tk_ConfigureInfo.3.* 
+    rm -f Tk_ConfigureValue.3 Tk_ConfigureValue.3.* 
+    rm -f Tk_FreeOptions.3 Tk_FreeOptions.3.* 
+    ln $S ConfigWidg.3$Z Tk_ConfigureWidget.3$Z 
+    ln $S ConfigWidg.3$Z Tk_Offset.3$Z 
+    ln $S ConfigWidg.3$Z Tk_ConfigureInfo.3$Z 
+    ln $S ConfigWidg.3$Z Tk_ConfigureValue.3$Z 
+    ln $S ConfigWidg.3$Z Tk_FreeOptions.3$Z 
 fi
 if test -r ConfigWind.3; then
-    rm -f Tk_ConfigureWindow.3
-    rm -f Tk_MoveWindow.3
-    rm -f Tk_ResizeWindow.3
-    rm -f Tk_MoveResizeWindow.3
-    rm -f Tk_SetWindowBorderWidth.3
-    rm -f Tk_ChangeWindowAttributes.3
-    rm -f Tk_SetWindowBackground.3
-    rm -f Tk_SetWindowBackgroundPixmap.3
-    rm -f Tk_SetWindowBorder.3
-    rm -f Tk_SetWindowBorderPixmap.3
-    rm -f Tk_SetWindowColormap.3
-    rm -f Tk_DefineCursor.3
-    rm -f Tk_UndefineCursor.3
-    ln ConfigWind.3 Tk_ConfigureWindow.3
-    ln ConfigWind.3 Tk_MoveWindow.3
-    ln ConfigWind.3 Tk_ResizeWindow.3
-    ln ConfigWind.3 Tk_MoveResizeWindow.3
-    ln ConfigWind.3 Tk_SetWindowBorderWidth.3
-    ln ConfigWind.3 Tk_ChangeWindowAttributes.3
-    ln ConfigWind.3 Tk_SetWindowBackground.3
-    ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
-    ln ConfigWind.3 Tk_SetWindowBorder.3
-    ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
-    ln ConfigWind.3 Tk_SetWindowColormap.3
-    ln ConfigWind.3 Tk_DefineCursor.3
-    ln ConfigWind.3 Tk_UndefineCursor.3
+    rm -f ConfigWind.3.*
+    $ZIP ConfigWind.3
+    rm -f Tk_ConfigureWindow.3 Tk_ConfigureWindow.3.* 
+    rm -f Tk_MoveWindow.3 Tk_MoveWindow.3.* 
+    rm -f Tk_ResizeWindow.3 Tk_ResizeWindow.3.* 
+    rm -f Tk_MoveResizeWindow.3 Tk_MoveResizeWindow.3.* 
+    rm -f Tk_SetWindowBorderWidth.3 Tk_SetWindowBorderWidth.3.* 
+    rm -f Tk_ChangeWindowAttributes.3 Tk_ChangeWindowAttributes.3.* 
+    rm -f Tk_SetWindowBackground.3 Tk_SetWindowBackground.3.* 
+    rm -f Tk_SetWindowBackgroundPixmap.3 Tk_SetWindowBackgroundPixmap.3.* 
+    rm -f Tk_SetWindowBorder.3 Tk_SetWindowBorder.3.* 
+    rm -f Tk_SetWindowBorderPixmap.3 Tk_SetWindowBorderPixmap.3.* 
+    rm -f Tk_SetWindowColormap.3 Tk_SetWindowColormap.3.* 
+    rm -f Tk_DefineCursor.3 Tk_DefineCursor.3.* 
+    rm -f Tk_UndefineCursor.3 Tk_UndefineCursor.3.* 
+    ln $S ConfigWind.3$Z Tk_ConfigureWindow.3$Z 
+    ln $S ConfigWind.3$Z Tk_MoveWindow.3$Z 
+    ln $S ConfigWind.3$Z Tk_ResizeWindow.3$Z 
+    ln $S ConfigWind.3$Z Tk_MoveResizeWindow.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowBorderWidth.3$Z 
+    ln $S ConfigWind.3$Z Tk_ChangeWindowAttributes.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowBackground.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowBackgroundPixmap.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowBorder.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowBorderPixmap.3$Z 
+    ln $S ConfigWind.3$Z Tk_SetWindowColormap.3$Z 
+    ln $S ConfigWind.3$Z Tk_DefineCursor.3$Z 
+    ln $S ConfigWind.3$Z Tk_UndefineCursor.3$Z 
 fi
 if test -r CoordToWin.3; then
-    rm -f Tk_CoordsToWindow.3
-    ln CoordToWin.3 Tk_CoordsToWindow.3
+    rm -f CoordToWin.3.*
+    $ZIP CoordToWin.3
+    rm -f Tk_CoordsToWindow.3 Tk_CoordsToWindow.3.* 
+    ln $S CoordToWin.3$Z Tk_CoordsToWindow.3$Z 
 fi
 if test -r CrtCmHdlr.3; then
-    rm -f Tk_CreateClientMessageHandler.3
-    rm -f Tk_DeleteClientMessageHandler.3
-    ln CrtCmHdlr.3 Tk_CreateClientMessageHandler.3
-    ln CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3
+    rm -f CrtCmHdlr.3.*
+    $ZIP CrtCmHdlr.3
+    rm -f Tk_CreateClientMessageHandler.3 Tk_CreateClientMessageHandler.3.* 
+    rm -f Tk_DeleteClientMessageHandler.3 Tk_DeleteClientMessageHandler.3.* 
+    ln $S CrtCmHdlr.3$Z Tk_CreateClientMessageHandler.3$Z 
+    ln $S CrtCmHdlr.3$Z Tk_DeleteClientMessageHandler.3$Z 
 fi
 if test -r CrtErrHdlr.3; then
-    rm -f Tk_CreateErrorHandler.3
-    rm -f Tk_DeleteErrorHandler.3
-    ln CrtErrHdlr.3 Tk_CreateErrorHandler.3
-    ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
+    rm -f CrtErrHdlr.3.*
+    $ZIP CrtErrHdlr.3
+    rm -f Tk_CreateErrorHandler.3 Tk_CreateErrorHandler.3.* 
+    rm -f Tk_DeleteErrorHandler.3 Tk_DeleteErrorHandler.3.* 
+    ln $S CrtErrHdlr.3$Z Tk_CreateErrorHandler.3$Z 
+    ln $S CrtErrHdlr.3$Z Tk_DeleteErrorHandler.3$Z 
 fi
 if test -r CrtGenHdlr.3; then
-    rm -f Tk_CreateGenericHandler.3
-    rm -f Tk_DeleteGenericHandler.3
-    ln CrtGenHdlr.3 Tk_CreateGenericHandler.3
-    ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
+    rm -f CrtGenHdlr.3.*
+    $ZIP CrtGenHdlr.3
+    rm -f Tk_CreateGenericHandler.3 Tk_CreateGenericHandler.3.* 
+    rm -f Tk_DeleteGenericHandler.3 Tk_DeleteGenericHandler.3.* 
+    ln $S CrtGenHdlr.3$Z Tk_CreateGenericHandler.3$Z 
+    ln $S CrtGenHdlr.3$Z Tk_DeleteGenericHandler.3$Z 
 fi
 if test -r CrtImgType.3; then
-    rm -f Tk_CreateImageType.3
-    rm -f Tk_GetImageMasterData.3
-    rm -f Tk_InitImageArgs.3
-    ln CrtImgType.3 Tk_CreateImageType.3
-    ln CrtImgType.3 Tk_GetImageMasterData.3
-    ln CrtImgType.3 Tk_InitImageArgs.3
+    rm -f CrtImgType.3.*
+    $ZIP CrtImgType.3
+    rm -f Tk_CreateImageType.3 Tk_CreateImageType.3.* 
+    rm -f Tk_GetImageMasterData.3 Tk_GetImageMasterData.3.* 
+    rm -f Tk_InitImageArgs.3 Tk_InitImageArgs.3.* 
+    ln $S CrtImgType.3$Z Tk_CreateImageType.3$Z 
+    ln $S CrtImgType.3$Z Tk_GetImageMasterData.3$Z 
+    ln $S CrtImgType.3$Z Tk_InitImageArgs.3$Z 
 fi
 if test -r CrtItemType.3; then
-    rm -f Tk_CreateItemType.3
-    rm -f Tk_GetItemTypes.3
-    ln CrtItemType.3 Tk_CreateItemType.3
-    ln CrtItemType.3 Tk_GetItemTypes.3
+    rm -f CrtItemType.3.*
+    $ZIP CrtItemType.3
+    rm -f Tk_CreateItemType.3 Tk_CreateItemType.3.* 
+    rm -f Tk_GetItemTypes.3 Tk_GetItemTypes.3.* 
+    ln $S CrtItemType.3$Z Tk_CreateItemType.3$Z 
+    ln $S CrtItemType.3$Z Tk_GetItemTypes.3$Z 
 fi
 if test -r CrtPhImgFmt.3; then
-    rm -f Tk_CreatePhotoImageFormat.3
-    ln CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3
+    rm -f CrtPhImgFmt.3.*
+    $ZIP CrtPhImgFmt.3
+    rm -f Tk_CreatePhotoImageFormat.3 Tk_CreatePhotoImageFormat.3.* 
+    ln $S CrtPhImgFmt.3$Z Tk_CreatePhotoImageFormat.3$Z 
 fi
 if test -r CrtSelHdlr.3; then
-    rm -f Tk_CreateSelHandler.3
-    rm -f Tk_DeleteSelHandler.3
-    ln CrtSelHdlr.3 Tk_CreateSelHandler.3
-    ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
+    rm -f CrtSelHdlr.3.*
+    $ZIP CrtSelHdlr.3
+    rm -f Tk_CreateSelHandler.3 Tk_CreateSelHandler.3.* 
+    rm -f Tk_DeleteSelHandler.3 Tk_DeleteSelHandler.3.* 
+    ln $S CrtSelHdlr.3$Z Tk_CreateSelHandler.3$Z 
+    ln $S CrtSelHdlr.3$Z Tk_DeleteSelHandler.3$Z 
 fi
 if test -r CrtWindow.3; then
-    rm -f Tk_CreateWindow.3
-    rm -f Tk_CreateWindowFromPath.3
-    rm -f Tk_DestroyWindow.3
-    rm -f Tk_MakeWindowExist.3
-    ln CrtWindow.3 Tk_CreateWindow.3
-    ln CrtWindow.3 Tk_CreateWindowFromPath.3
-    ln CrtWindow.3 Tk_DestroyWindow.3
-    ln CrtWindow.3 Tk_MakeWindowExist.3
+    rm -f CrtWindow.3.*
+    $ZIP CrtWindow.3
+    rm -f Tk_CreateWindow.3 Tk_CreateWindow.3.* 
+    rm -f Tk_CreateWindowFromPath.3 Tk_CreateWindowFromPath.3.* 
+    rm -f Tk_DestroyWindow.3 Tk_DestroyWindow.3.* 
+    rm -f Tk_MakeWindowExist.3 Tk_MakeWindowExist.3.* 
+    ln $S CrtWindow.3$Z Tk_CreateWindow.3$Z 
+    ln $S CrtWindow.3$Z Tk_CreateWindowFromPath.3$Z 
+    ln $S CrtWindow.3$Z Tk_DestroyWindow.3$Z 
+    ln $S CrtWindow.3$Z Tk_MakeWindowExist.3$Z 
 fi
 if test -r DeleteImg.3; then
-    rm -f Tk_DeleteImage.3
-    ln DeleteImg.3 Tk_DeleteImage.3
+    rm -f DeleteImg.3.*
+    $ZIP DeleteImg.3
+    rm -f Tk_DeleteImage.3 Tk_DeleteImage.3.* 
+    ln $S DeleteImg.3$Z Tk_DeleteImage.3$Z 
 fi
 if test -r DrawFocHlt.3; then
-    rm -f Tk_DrawFocusHighlight.3
-    ln DrawFocHlt.3 Tk_DrawFocusHighlight.3
+    rm -f DrawFocHlt.3.*
+    $ZIP DrawFocHlt.3
+    rm -f Tk_DrawFocusHighlight.3 Tk_DrawFocusHighlight.3.* 
+    ln $S DrawFocHlt.3$Z Tk_DrawFocusHighlight.3$Z 
 fi
 if test -r EventHndlr.3; then
-    rm -f Tk_CreateEventHandler.3
-    rm -f Tk_DeleteEventHandler.3
-    ln EventHndlr.3 Tk_CreateEventHandler.3
-    ln EventHndlr.3 Tk_DeleteEventHandler.3
+    rm -f EventHndlr.3.*
+    $ZIP EventHndlr.3
+    rm -f Tk_CreateEventHandler.3 Tk_CreateEventHandler.3.* 
+    rm -f Tk_DeleteEventHandler.3 Tk_DeleteEventHandler.3.* 
+    ln $S EventHndlr.3$Z Tk_CreateEventHandler.3$Z 
+    ln $S EventHndlr.3$Z Tk_DeleteEventHandler.3$Z 
 fi
 if test -r FindPhoto.3; then
-    rm -f Tk_FindPhoto.3
-    rm -f Tk_PhotoPutBlock.3
-    rm -f Tk_PhotoPutZoomedBlock.3
-    rm -f Tk_PhotoGetImage.3
-    rm -f Tk_PhotoBlank.3
-    rm -f Tk_PhotoExpand.3
-    rm -f Tk_PhotoGetSize.3
-    rm -f Tk_PhotoSetSize.3
-    ln FindPhoto.3 Tk_FindPhoto.3
-    ln FindPhoto.3 Tk_PhotoPutBlock.3
-    ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
-    ln FindPhoto.3 Tk_PhotoGetImage.3
-    ln FindPhoto.3 Tk_PhotoBlank.3
-    ln FindPhoto.3 Tk_PhotoExpand.3
-    ln FindPhoto.3 Tk_PhotoGetSize.3
-    ln FindPhoto.3 Tk_PhotoSetSize.3
+    rm -f FindPhoto.3.*
+    $ZIP FindPhoto.3
+    rm -f Tk_FindPhoto.3 Tk_FindPhoto.3.* 
+    rm -f Tk_PhotoPutBlock.3 Tk_PhotoPutBlock.3.* 
+    rm -f Tk_PhotoPutZoomedBlock.3 Tk_PhotoPutZoomedBlock.3.* 
+    rm -f Tk_PhotoGetImage.3 Tk_PhotoGetImage.3.* 
+    rm -f Tk_PhotoBlank.3 Tk_PhotoBlank.3.* 
+    rm -f Tk_PhotoExpand.3 Tk_PhotoExpand.3.* 
+    rm -f Tk_PhotoGetSize.3 Tk_PhotoGetSize.3.* 
+    rm -f Tk_PhotoSetSize.3 Tk_PhotoSetSize.3.* 
+    ln $S FindPhoto.3$Z Tk_FindPhoto.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoPutBlock.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoPutZoomedBlock.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoGetImage.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoBlank.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoExpand.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoGetSize.3$Z 
+    ln $S FindPhoto.3$Z Tk_PhotoSetSize.3$Z 
 fi
 if test -r FontId.3; then
-    rm -f Tk_FontId.3
-    rm -f Tk_GetFontMetrics.3
-    rm -f Tk_PostscriptFontName.3
-    ln FontId.3 Tk_FontId.3
-    ln FontId.3 Tk_GetFontMetrics.3
-    ln FontId.3 Tk_PostscriptFontName.3
+    rm -f FontId.3.*
+    $ZIP FontId.3
+    rm -f Tk_FontId.3 Tk_FontId.3.* 
+    rm -f Tk_GetFontMetrics.3 Tk_GetFontMetrics.3.* 
+    rm -f Tk_PostscriptFontName.3 Tk_PostscriptFontName.3.* 
+    ln $S FontId.3$Z Tk_FontId.3$Z 
+    ln $S FontId.3$Z Tk_GetFontMetrics.3$Z 
+    ln $S FontId.3$Z Tk_PostscriptFontName.3$Z 
 fi
 if test -r FreeXId.3; then
-    rm -f Tk_FreeXId.3
-    ln FreeXId.3 Tk_FreeXId.3
+    rm -f FreeXId.3.*
+    $ZIP FreeXId.3
+    rm -f Tk_FreeXId.3 Tk_FreeXId.3.* 
+    ln $S FreeXId.3$Z Tk_FreeXId.3$Z 
 fi
 if test -r GeomReq.3; then
-    rm -f Tk_GeometryRequest.3
-    rm -f Tk_SetMinimumRequestSize.3
-    rm -f Tk_SetInternalBorder.3
-    rm -f Tk_SetInternalBorderEx.3
-    ln GeomReq.3 Tk_GeometryRequest.3
-    ln GeomReq.3 Tk_SetMinimumRequestSize.3
-    ln GeomReq.3 Tk_SetInternalBorder.3
-    ln GeomReq.3 Tk_SetInternalBorderEx.3
+    rm -f GeomReq.3.*
+    $ZIP GeomReq.3
+    rm -f Tk_GeometryRequest.3 Tk_GeometryRequest.3.* 
+    rm -f Tk_SetMinimumRequestSize.3 Tk_SetMinimumRequestSize.3.* 
+    rm -f Tk_SetInternalBorder.3 Tk_SetInternalBorder.3.* 
+    rm -f Tk_SetInternalBorderEx.3 Tk_SetInternalBorderEx.3.* 
+    ln $S GeomReq.3$Z Tk_GeometryRequest.3$Z 
+    ln $S GeomReq.3$Z Tk_SetMinimumRequestSize.3$Z 
+    ln $S GeomReq.3$Z Tk_SetInternalBorder.3$Z 
+    ln $S GeomReq.3$Z Tk_SetInternalBorderEx.3$Z 
 fi
 if test -r GetAnchor.3; then
-    rm -f Tk_GetAnchorFromObj.3
-    rm -f Tk_GetAnchor.3
-    rm -f Tk_NameOfAnchor.3
-    ln GetAnchor.3 Tk_GetAnchorFromObj.3
-    ln GetAnchor.3 Tk_GetAnchor.3
-    ln GetAnchor.3 Tk_NameOfAnchor.3
+    rm -f GetAnchor.3.*
+    $ZIP GetAnchor.3
+    rm -f Tk_GetAnchorFromObj.3 Tk_GetAnchorFromObj.3.* 
+    rm -f Tk_GetAnchor.3 Tk_GetAnchor.3.* 
+    rm -f Tk_NameOfAnchor.3 Tk_NameOfAnchor.3.* 
+    ln $S GetAnchor.3$Z Tk_GetAnchorFromObj.3$Z 
+    ln $S GetAnchor.3$Z Tk_GetAnchor.3$Z 
+    ln $S GetAnchor.3$Z Tk_NameOfAnchor.3$Z 
 fi
 if test -r GetBitmap.3; then
-    rm -f Tk_AllocBitmapFromObj.3
-    rm -f Tk_GetBitmap.3
-    rm -f Tk_GetBitmapFromObj.3
-    rm -f Tk_DefineBitmap.3
-    rm -f Tk_NameOfBitmap.3
-    rm -f Tk_SizeOfBitmap.3
-    rm -f Tk_FreeBitmapFromObj.3
-    rm -f Tk_FreeBitmap.3
-    rm -f Tk_GetBitmapFromData.3
-    ln GetBitmap.3 Tk_AllocBitmapFromObj.3
-    ln GetBitmap.3 Tk_GetBitmap.3
-    ln GetBitmap.3 Tk_GetBitmapFromObj.3
-    ln GetBitmap.3 Tk_DefineBitmap.3
-    ln GetBitmap.3 Tk_NameOfBitmap.3
-    ln GetBitmap.3 Tk_SizeOfBitmap.3
-    ln GetBitmap.3 Tk_FreeBitmapFromObj.3
-    ln GetBitmap.3 Tk_FreeBitmap.3
-    ln GetBitmap.3 Tk_GetBitmapFromData.3
+    rm -f GetBitmap.3.*
+    $ZIP GetBitmap.3
+    rm -f Tk_AllocBitmapFromObj.3 Tk_AllocBitmapFromObj.3.* 
+    rm -f Tk_GetBitmap.3 Tk_GetBitmap.3.* 
+    rm -f Tk_GetBitmapFromObj.3 Tk_GetBitmapFromObj.3.* 
+    rm -f Tk_DefineBitmap.3 Tk_DefineBitmap.3.* 
+    rm -f Tk_NameOfBitmap.3 Tk_NameOfBitmap.3.* 
+    rm -f Tk_SizeOfBitmap.3 Tk_SizeOfBitmap.3.* 
+    rm -f Tk_FreeBitmapFromObj.3 Tk_FreeBitmapFromObj.3.* 
+    rm -f Tk_FreeBitmap.3 Tk_FreeBitmap.3.* 
+    rm -f Tk_GetBitmapFromData.3 Tk_GetBitmapFromData.3.* 
+    ln $S GetBitmap.3$Z Tk_AllocBitmapFromObj.3$Z 
+    ln $S GetBitmap.3$Z Tk_GetBitmap.3$Z 
+    ln $S GetBitmap.3$Z Tk_GetBitmapFromObj.3$Z 
+    ln $S GetBitmap.3$Z Tk_DefineBitmap.3$Z 
+    ln $S GetBitmap.3$Z Tk_NameOfBitmap.3$Z 
+    ln $S GetBitmap.3$Z Tk_SizeOfBitmap.3$Z 
+    ln $S GetBitmap.3$Z Tk_FreeBitmapFromObj.3$Z 
+    ln $S GetBitmap.3$Z Tk_FreeBitmap.3$Z 
+    ln $S GetBitmap.3$Z Tk_GetBitmapFromData.3$Z 
 fi
 if test -r GetCapStyl.3; then
-    rm -f Tk_GetCapStyle.3
-    rm -f Tk_NameOfCapStyle.3
-    ln GetCapStyl.3 Tk_GetCapStyle.3
-    ln GetCapStyl.3 Tk_NameOfCapStyle.3
+    rm -f GetCapStyl.3.*
+    $ZIP GetCapStyl.3
+    rm -f Tk_GetCapStyle.3 Tk_GetCapStyle.3.* 
+    rm -f Tk_NameOfCapStyle.3 Tk_NameOfCapStyle.3.* 
+    ln $S GetCapStyl.3$Z Tk_GetCapStyle.3$Z 
+    ln $S GetCapStyl.3$Z Tk_NameOfCapStyle.3$Z 
 fi
 if test -r GetClrmap.3; then
-    rm -f Tk_GetColormap.3
-    rm -f Tk_FreeColormap.3
-    ln GetClrmap.3 Tk_GetColormap.3
-    ln GetClrmap.3 Tk_FreeColormap.3
+    rm -f GetClrmap.3.*
+    $ZIP GetClrmap.3
+    rm -f Tk_GetColormap.3 Tk_GetColormap.3.* 
+    rm -f Tk_FreeColormap.3 Tk_FreeColormap.3.* 
+    ln $S GetClrmap.3$Z Tk_GetColormap.3$Z 
+    ln $S GetClrmap.3$Z Tk_FreeColormap.3$Z 
 fi
 if test -r GetColor.3; then
-    rm -f Tk_AllocColorFromObj.3
-    rm -f Tk_GetColor.3
-    rm -f Tk_GetColorFromObj.3
-    rm -f Tk_GetColorByValue.3
-    rm -f Tk_NameOfColor.3
-    rm -f Tk_FreeColorFromObj.3
-    rm -f Tk_FreeColor.3
-    ln GetColor.3 Tk_AllocColorFromObj.3
-    ln GetColor.3 Tk_GetColor.3
-    ln GetColor.3 Tk_GetColorFromObj.3
-    ln GetColor.3 Tk_GetColorByValue.3
-    ln GetColor.3 Tk_NameOfColor.3
-    ln GetColor.3 Tk_FreeColorFromObj.3
-    ln GetColor.3 Tk_FreeColor.3
+    rm -f GetColor.3.*
+    $ZIP GetColor.3
+    rm -f Tk_AllocColorFromObj.3 Tk_AllocColorFromObj.3.* 
+    rm -f Tk_GetColor.3 Tk_GetColor.3.* 
+    rm -f Tk_GetColorFromObj.3 Tk_GetColorFromObj.3.* 
+    rm -f Tk_GetColorByValue.3 Tk_GetColorByValue.3.* 
+    rm -f Tk_NameOfColor.3 Tk_NameOfColor.3.* 
+    rm -f Tk_FreeColorFromObj.3 Tk_FreeColorFromObj.3.* 
+    rm -f Tk_FreeColor.3 Tk_FreeColor.3.* 
+    ln $S GetColor.3$Z Tk_AllocColorFromObj.3$Z 
+    ln $S GetColor.3$Z Tk_GetColor.3$Z 
+    ln $S GetColor.3$Z Tk_GetColorFromObj.3$Z 
+    ln $S GetColor.3$Z Tk_GetColorByValue.3$Z 
+    ln $S GetColor.3$Z Tk_NameOfColor.3$Z 
+    ln $S GetColor.3$Z Tk_FreeColorFromObj.3$Z 
+    ln $S GetColor.3$Z Tk_FreeColor.3$Z 
 fi
 if test -r GetCursor.3; then
-    rm -f Tk_AllocCursorFromObj.3
-    rm -f Tk_GetCursor.3
-    rm -f Tk_GetCursorFromObj.3
-    rm -f Tk_GetCursorFromData.3
-    rm -f Tk_NameOfCursor.3
-    rm -f Tk_FreeCursorFromObj.3
-    rm -f Tk_FreeCursor.3
-    ln GetCursor.3 Tk_AllocCursorFromObj.3
-    ln GetCursor.3 Tk_GetCursor.3
-    ln GetCursor.3 Tk_GetCursorFromObj.3
-    ln GetCursor.3 Tk_GetCursorFromData.3
-    ln GetCursor.3 Tk_NameOfCursor.3
-    ln GetCursor.3 Tk_FreeCursorFromObj.3
-    ln GetCursor.3 Tk_FreeCursor.3
+    rm -f GetCursor.3.*
+    $ZIP GetCursor.3
+    rm -f Tk_AllocCursorFromObj.3 Tk_AllocCursorFromObj.3.* 
+    rm -f Tk_GetCursor.3 Tk_GetCursor.3.* 
+    rm -f Tk_GetCursorFromObj.3 Tk_GetCursorFromObj.3.* 
+    rm -f Tk_GetCursorFromData.3 Tk_GetCursorFromData.3.* 
+    rm -f Tk_NameOfCursor.3 Tk_NameOfCursor.3.* 
+    rm -f Tk_FreeCursorFromObj.3 Tk_FreeCursorFromObj.3.* 
+    rm -f Tk_FreeCursor.3 Tk_FreeCursor.3.* 
+    ln $S GetCursor.3$Z Tk_AllocCursorFromObj.3$Z 
+    ln $S GetCursor.3$Z Tk_GetCursor.3$Z 
+    ln $S GetCursor.3$Z Tk_GetCursorFromObj.3$Z 
+    ln $S GetCursor.3$Z Tk_GetCursorFromData.3$Z 
+    ln $S GetCursor.3$Z Tk_NameOfCursor.3$Z 
+    ln $S GetCursor.3$Z Tk_FreeCursorFromObj.3$Z 
+    ln $S GetCursor.3$Z Tk_FreeCursor.3$Z 
 fi
 if test -r GetDash.3; then
-    rm -f Tk_GetDash.3
-    ln GetDash.3 Tk_GetDash.3
+    rm -f GetDash.3.*
+    $ZIP GetDash.3
+    rm -f Tk_GetDash.3 Tk_GetDash.3.* 
+    ln $S GetDash.3$Z Tk_GetDash.3$Z 
 fi
 if test -r GetFont.3; then
-    rm -f Tk_AllocFontFromObj.3
-    rm -f Tk_GetFont.3
-    rm -f Tk_GetFontFromObj.3
-    rm -f Tk_NameOfFont.3
-    rm -f Tk_FreeFontFromObj.3
-    rm -f Tk_FreeFont.3
-    ln GetFont.3 Tk_AllocFontFromObj.3
-    ln GetFont.3 Tk_GetFont.3
-    ln GetFont.3 Tk_GetFontFromObj.3
-    ln GetFont.3 Tk_NameOfFont.3
-    ln GetFont.3 Tk_FreeFontFromObj.3
-    ln GetFont.3 Tk_FreeFont.3
+    rm -f GetFont.3.*
+    $ZIP GetFont.3
+    rm -f Tk_AllocFontFromObj.3 Tk_AllocFontFromObj.3.* 
+    rm -f Tk_GetFont.3 Tk_GetFont.3.* 
+    rm -f Tk_GetFontFromObj.3 Tk_GetFontFromObj.3.* 
+    rm -f Tk_NameOfFont.3 Tk_NameOfFont.3.* 
+    rm -f Tk_FreeFontFromObj.3 Tk_FreeFontFromObj.3.* 
+    rm -f Tk_FreeFont.3 Tk_FreeFont.3.* 
+    ln $S GetFont.3$Z Tk_AllocFontFromObj.3$Z 
+    ln $S GetFont.3$Z Tk_GetFont.3$Z 
+    ln $S GetFont.3$Z Tk_GetFontFromObj.3$Z 
+    ln $S GetFont.3$Z Tk_NameOfFont.3$Z 
+    ln $S GetFont.3$Z Tk_FreeFontFromObj.3$Z 
+    ln $S GetFont.3$Z Tk_FreeFont.3$Z 
 fi
 if test -r GetGC.3; then
-    rm -f Tk_GetGC.3
-    rm -f Tk_FreeGC.3
-    ln GetGC.3 Tk_GetGC.3
-    ln GetGC.3 Tk_FreeGC.3
+    rm -f GetGC.3.*
+    $ZIP GetGC.3
+    rm -f Tk_GetGC.3 Tk_GetGC.3.* 
+    rm -f Tk_FreeGC.3 Tk_FreeGC.3.* 
+    ln $S GetGC.3$Z Tk_GetGC.3$Z 
+    ln $S GetGC.3$Z Tk_FreeGC.3$Z 
 fi
 if test -r GetHINSTANCE.3; then
-    rm -f Tk_GetHINSTANCE.3
-    ln GetHINSTANCE.3 Tk_GetHINSTANCE.3
+    rm -f GetHINSTANCE.3.*
+    $ZIP GetHINSTANCE.3
+    rm -f Tk_GetHINSTANCE.3 Tk_GetHINSTANCE.3.* 
+    ln $S GetHINSTANCE.3$Z Tk_GetHINSTANCE.3$Z 
 fi
 if test -r GetHWND.3; then
-    rm -f Tk_GetHWND.3
-    ln GetHWND.3 Tk_GetHWND.3
+    rm -f GetHWND.3.*
+    $ZIP GetHWND.3
+    rm -f Tk_GetHWND.3 Tk_GetHWND.3.* 
+    ln $S GetHWND.3$Z Tk_GetHWND.3$Z 
 fi
 if test -r GetImage.3; then
-    rm -f Tk_GetImage.3
-    rm -f Tk_RedrawImage.3
-    rm -f Tk_SizeOfImage.3
-    rm -f Tk_FreeImage.3
-    ln GetImage.3 Tk_GetImage.3
-    ln GetImage.3 Tk_RedrawImage.3
-    ln GetImage.3 Tk_SizeOfImage.3
-    ln GetImage.3 Tk_FreeImage.3
+    rm -f GetImage.3.*
+    $ZIP GetImage.3
+    rm -f Tk_GetImage.3 Tk_GetImage.3.* 
+    rm -f Tk_RedrawImage.3 Tk_RedrawImage.3.* 
+    rm -f Tk_SizeOfImage.3 Tk_SizeOfImage.3.* 
+    rm -f Tk_FreeImage.3 Tk_FreeImage.3.* 
+    ln $S GetImage.3$Z Tk_GetImage.3$Z 
+    ln $S GetImage.3$Z Tk_RedrawImage.3$Z 
+    ln $S GetImage.3$Z Tk_SizeOfImage.3$Z 
+    ln $S GetImage.3$Z Tk_FreeImage.3$Z 
 fi
 if test -r GetJoinStl.3; then
-    rm -f Tk_GetJoinStyle.3
-    rm -f Tk_NameOfJoinStyle.3
-    ln GetJoinStl.3 Tk_GetJoinStyle.3
-    ln GetJoinStl.3 Tk_NameOfJoinStyle.3
+    rm -f GetJoinStl.3.*
+    $ZIP GetJoinStl.3
+    rm -f Tk_GetJoinStyle.3 Tk_GetJoinStyle.3.* 
+    rm -f Tk_NameOfJoinStyle.3 Tk_NameOfJoinStyle.3.* 
+    ln $S GetJoinStl.3$Z Tk_GetJoinStyle.3$Z 
+    ln $S GetJoinStl.3$Z Tk_NameOfJoinStyle.3$Z 
 fi
 if test -r GetJustify.3; then
-    rm -f Tk_GetJustifyFromObj.3
-    rm -f Tk_GetJustify.3
-    rm -f Tk_NameOfJustify.3
-    ln GetJustify.3 Tk_GetJustifyFromObj.3
-    ln GetJustify.3 Tk_GetJustify.3
-    ln GetJustify.3 Tk_NameOfJustify.3
+    rm -f GetJustify.3.*
+    $ZIP GetJustify.3
+    rm -f Tk_GetJustifyFromObj.3 Tk_GetJustifyFromObj.3.* 
+    rm -f Tk_GetJustify.3 Tk_GetJustify.3.* 
+    rm -f Tk_NameOfJustify.3 Tk_NameOfJustify.3.* 
+    ln $S GetJustify.3$Z Tk_GetJustifyFromObj.3$Z 
+    ln $S GetJustify.3$Z Tk_GetJustify.3$Z 
+    ln $S GetJustify.3$Z Tk_NameOfJustify.3$Z 
 fi
 if test -r GetOption.3; then
-    rm -f Tk_GetOption.3
-    ln GetOption.3 Tk_GetOption.3
+    rm -f GetOption.3.*
+    $ZIP GetOption.3
+    rm -f Tk_GetOption.3 Tk_GetOption.3.* 
+    ln $S GetOption.3$Z Tk_GetOption.3$Z 
 fi
 if test -r GetPixels.3; then
-    rm -f Tk_GetPixelsFromObj.3
-    rm -f Tk_GetPixels.3
-    rm -f Tk_GetMMFromObj.3
-    rm -f Tk_GetScreenMM.3
-    ln GetPixels.3 Tk_GetPixelsFromObj.3
-    ln GetPixels.3 Tk_GetPixels.3
-    ln GetPixels.3 Tk_GetMMFromObj.3
-    ln GetPixels.3 Tk_GetScreenMM.3
+    rm -f GetPixels.3.*
+    $ZIP GetPixels.3
+    rm -f Tk_GetPixelsFromObj.3 Tk_GetPixelsFromObj.3.* 
+    rm -f Tk_GetPixels.3 Tk_GetPixels.3.* 
+    rm -f Tk_GetMMFromObj.3 Tk_GetMMFromObj.3.* 
+    rm -f Tk_GetScreenMM.3 Tk_GetScreenMM.3.* 
+    ln $S GetPixels.3$Z Tk_GetPixelsFromObj.3$Z 
+    ln $S GetPixels.3$Z Tk_GetPixels.3$Z 
+    ln $S GetPixels.3$Z Tk_GetMMFromObj.3$Z 
+    ln $S GetPixels.3$Z Tk_GetScreenMM.3$Z 
 fi
 if test -r GetPixmap.3; then
-    rm -f Tk_GetPixmap.3
-    rm -f Tk_FreePixmap.3
-    ln GetPixmap.3 Tk_GetPixmap.3
-    ln GetPixmap.3 Tk_FreePixmap.3
+    rm -f GetPixmap.3.*
+    $ZIP GetPixmap.3
+    rm -f Tk_GetPixmap.3 Tk_GetPixmap.3.* 
+    rm -f Tk_FreePixmap.3 Tk_FreePixmap.3.* 
+    ln $S GetPixmap.3$Z Tk_GetPixmap.3$Z 
+    ln $S GetPixmap.3$Z Tk_FreePixmap.3$Z 
 fi
 if test -r GetRelief.3; then
-    rm -f Tk_GetReliefFromObj.3
-    rm -f Tk_GetRelief.3
-    rm -f Tk_NameOfRelief.3
-    ln GetRelief.3 Tk_GetReliefFromObj.3
-    ln GetRelief.3 Tk_GetRelief.3
-    ln GetRelief.3 Tk_NameOfRelief.3
+    rm -f GetRelief.3.*
+    $ZIP GetRelief.3
+    rm -f Tk_GetReliefFromObj.3 Tk_GetReliefFromObj.3.* 
+    rm -f Tk_GetRelief.3 Tk_GetRelief.3.* 
+    rm -f Tk_NameOfRelief.3 Tk_NameOfRelief.3.* 
+    ln $S GetRelief.3$Z Tk_GetReliefFromObj.3$Z 
+    ln $S GetRelief.3$Z Tk_GetRelief.3$Z 
+    ln $S GetRelief.3$Z Tk_NameOfRelief.3$Z 
 fi
 if test -r GetRootCrd.3; then
-    rm -f Tk_GetRootCoords.3
-    ln GetRootCrd.3 Tk_GetRootCoords.3
+    rm -f GetRootCrd.3.*
+    $ZIP GetRootCrd.3
+    rm -f Tk_GetRootCoords.3 Tk_GetRootCoords.3.* 
+    ln $S GetRootCrd.3$Z Tk_GetRootCoords.3$Z 
 fi
 if test -r GetScroll.3; then
-    rm -f Tk_GetScrollInfo.3
-    rm -f Tk_GetScrollInfoObj.3
-    ln GetScroll.3 Tk_GetScrollInfo.3
-    ln GetScroll.3 Tk_GetScrollInfoObj.3
+    rm -f GetScroll.3.*
+    $ZIP GetScroll.3
+    rm -f Tk_GetScrollInfo.3 Tk_GetScrollInfo.3.* 
+    rm -f Tk_GetScrollInfoObj.3 Tk_GetScrollInfoObj.3.* 
+    ln $S GetScroll.3$Z Tk_GetScrollInfo.3$Z 
+    ln $S GetScroll.3$Z Tk_GetScrollInfoObj.3$Z 
 fi
 if test -r GetSelect.3; then
-    rm -f Tk_GetSelection.3
-    ln GetSelect.3 Tk_GetSelection.3
+    rm -f GetSelect.3.*
+    $ZIP GetSelect.3
+    rm -f Tk_GetSelection.3 Tk_GetSelection.3.* 
+    ln $S GetSelect.3$Z Tk_GetSelection.3$Z 
 fi
 if test -r GetUid.3; then
-    rm -f Tk_GetUid.3
-    rm -f Tk_Uid.3
-    ln GetUid.3 Tk_GetUid.3
-    ln GetUid.3 Tk_Uid.3
+    rm -f GetUid.3.*
+    $ZIP GetUid.3
+    rm -f Tk_GetUid.3 Tk_GetUid.3.* 
+    rm -f Tk_Uid.3 Tk_Uid.3.* 
+    ln $S GetUid.3$Z Tk_GetUid.3$Z 
+    ln $S GetUid.3$Z Tk_Uid.3$Z 
 fi
 if test -r GetVRoot.3; then
-    rm -f Tk_GetVRootGeometry.3
-    ln GetVRoot.3 Tk_GetVRootGeometry.3
+    rm -f GetVRoot.3.*
+    $ZIP GetVRoot.3
+    rm -f Tk_GetVRootGeometry.3 Tk_GetVRootGeometry.3.* 
+    ln $S GetVRoot.3$Z Tk_GetVRootGeometry.3$Z 
 fi
 if test -r GetVisual.3; then
-    rm -f Tk_GetVisual.3
-    ln GetVisual.3 Tk_GetVisual.3
+    rm -f GetVisual.3.*
+    $ZIP GetVisual.3
+    rm -f Tk_GetVisual.3 Tk_GetVisual.3.* 
+    ln $S GetVisual.3$Z Tk_GetVisual.3$Z 
 fi
 if test -r Grab.3; then
-    rm -f Tk_Grab.3
-    rm -f Tk_Ungrab.3
-    ln Grab.3 Tk_Grab.3
-    ln Grab.3 Tk_Ungrab.3
+    rm -f Grab.3.*
+    $ZIP Grab.3
+    rm -f Tk_Grab.3 Tk_Grab.3.* 
+    rm -f Tk_Ungrab.3 Tk_Ungrab.3.* 
+    ln $S Grab.3$Z Tk_Grab.3$Z 
+    ln $S Grab.3$Z Tk_Ungrab.3$Z 
 fi
 if test -r HWNDToWindow.3; then
-    rm -f Tk_HWNDToWindow.3
-    ln HWNDToWindow.3 Tk_HWNDToWindow.3
+    rm -f HWNDToWindow.3.*
+    $ZIP HWNDToWindow.3
+    rm -f Tk_HWNDToWindow.3 Tk_HWNDToWindow.3.* 
+    ln $S HWNDToWindow.3$Z Tk_HWNDToWindow.3$Z 
 fi
 if test -r HandleEvent.3; then
-    rm -f Tk_HandleEvent.3
-    ln HandleEvent.3 Tk_HandleEvent.3
+    rm -f HandleEvent.3.*
+    $ZIP HandleEvent.3
+    rm -f Tk_HandleEvent.3 Tk_HandleEvent.3.* 
+    ln $S HandleEvent.3$Z Tk_HandleEvent.3$Z 
 fi
 if test -r IdToWindow.3; then
-    rm -f Tk_IdToWindow.3
-    ln IdToWindow.3 Tk_IdToWindow.3
+    rm -f IdToWindow.3.*
+    $ZIP IdToWindow.3
+    rm -f Tk_IdToWindow.3 Tk_IdToWindow.3.* 
+    ln $S IdToWindow.3$Z Tk_IdToWindow.3$Z 
 fi
 if test -r ImgChanged.3; then
-    rm -f Tk_ImageChanged.3
-    ln ImgChanged.3 Tk_ImageChanged.3
+    rm -f ImgChanged.3.*
+    $ZIP ImgChanged.3
+    rm -f Tk_ImageChanged.3 Tk_ImageChanged.3.* 
+    ln $S ImgChanged.3$Z Tk_ImageChanged.3$Z 
 fi
 if test -r InternAtom.3; then
-    rm -f Tk_InternAtom.3
-    rm -f Tk_GetAtomName.3
-    ln InternAtom.3 Tk_InternAtom.3
-    ln InternAtom.3 Tk_GetAtomName.3
+    rm -f InternAtom.3.*
+    $ZIP InternAtom.3
+    rm -f Tk_InternAtom.3 Tk_InternAtom.3.* 
+    rm -f Tk_GetAtomName.3 Tk_GetAtomName.3.* 
+    ln $S InternAtom.3$Z Tk_InternAtom.3$Z 
+    ln $S InternAtom.3$Z Tk_GetAtomName.3$Z 
 fi
 if test -r MainLoop.3; then
-    rm -f Tk_MainLoop.3
-    ln MainLoop.3 Tk_MainLoop.3
+    rm -f MainLoop.3.*
+    $ZIP MainLoop.3
+    rm -f Tk_MainLoop.3 Tk_MainLoop.3.* 
+    ln $S MainLoop.3$Z Tk_MainLoop.3$Z 
 fi
 if test -r MainWin.3; then
-    rm -f Tk_MainWindow.3
-    rm -f Tk_GetNumMainWindows.3
-    ln MainWin.3 Tk_MainWindow.3
-    ln MainWin.3 Tk_GetNumMainWindows.3
+    rm -f MainWin.3.*
+    $ZIP MainWin.3
+    rm -f Tk_MainWindow.3 Tk_MainWindow.3.* 
+    rm -f Tk_GetNumMainWindows.3 Tk_GetNumMainWindows.3.* 
+    ln $S MainWin.3$Z Tk_MainWindow.3$Z 
+    ln $S MainWin.3$Z Tk_GetNumMainWindows.3$Z 
 fi
 if test -r MaintGeom.3; then
-    rm -f Tk_MaintainGeometry.3
-    rm -f Tk_UnmaintainGeometry.3
-    ln MaintGeom.3 Tk_MaintainGeometry.3
-    ln MaintGeom.3 Tk_UnmaintainGeometry.3
+    rm -f MaintGeom.3.*
+    $ZIP MaintGeom.3
+    rm -f Tk_MaintainGeometry.3 Tk_MaintainGeometry.3.* 
+    rm -f Tk_UnmaintainGeometry.3 Tk_UnmaintainGeometry.3.* 
+    ln $S MaintGeom.3$Z Tk_MaintainGeometry.3$Z 
+    ln $S MaintGeom.3$Z Tk_UnmaintainGeometry.3$Z 
 fi
 if test -r ManageGeom.3; then
-    rm -f Tk_ManageGeometry.3
-    ln ManageGeom.3 Tk_ManageGeometry.3
+    rm -f ManageGeom.3.*
+    $ZIP ManageGeom.3
+    rm -f Tk_ManageGeometry.3 Tk_ManageGeometry.3.* 
+    ln $S ManageGeom.3$Z Tk_ManageGeometry.3$Z 
 fi
 if test -r MapWindow.3; then
-    rm -f Tk_MapWindow.3
-    rm -f Tk_UnmapWindow.3
-    ln MapWindow.3 Tk_MapWindow.3
-    ln MapWindow.3 Tk_UnmapWindow.3
+    rm -f MapWindow.3.*
+    $ZIP MapWindow.3
+    rm -f Tk_MapWindow.3 Tk_MapWindow.3.* 
+    rm -f Tk_UnmapWindow.3 Tk_UnmapWindow.3.* 
+    ln $S MapWindow.3$Z Tk_MapWindow.3$Z 
+    ln $S MapWindow.3$Z Tk_UnmapWindow.3$Z 
 fi
 if test -r MeasureChar.3; then
-    rm -f Tk_MeasureChars.3
-    rm -f Tk_TextWidth.3
-    rm -f Tk_DrawChars.3
-    rm -f Tk_UnderlineChars.3
-    ln MeasureChar.3 Tk_MeasureChars.3
-    ln MeasureChar.3 Tk_TextWidth.3
-    ln MeasureChar.3 Tk_DrawChars.3
-    ln MeasureChar.3 Tk_UnderlineChars.3
+    rm -f MeasureChar.3.*
+    $ZIP MeasureChar.3
+    rm -f Tk_MeasureChars.3 Tk_MeasureChars.3.* 
+    rm -f Tk_TextWidth.3 Tk_TextWidth.3.* 
+    rm -f Tk_DrawChars.3 Tk_DrawChars.3.* 
+    rm -f Tk_UnderlineChars.3 Tk_UnderlineChars.3.* 
+    ln $S MeasureChar.3$Z Tk_MeasureChars.3$Z 
+    ln $S MeasureChar.3$Z Tk_TextWidth.3$Z 
+    ln $S MeasureChar.3$Z Tk_DrawChars.3$Z 
+    ln $S MeasureChar.3$Z Tk_UnderlineChars.3$Z 
 fi
 if test -r MoveToplev.3; then
-    rm -f Tk_MoveToplevelWindow.3
-    ln MoveToplev.3 Tk_MoveToplevelWindow.3
+    rm -f MoveToplev.3.*
+    $ZIP MoveToplev.3
+    rm -f Tk_MoveToplevelWindow.3 Tk_MoveToplevelWindow.3.* 
+    ln $S MoveToplev.3$Z Tk_MoveToplevelWindow.3$Z 
 fi
 if test -r Name.3; then
-    rm -f Tk_Name.3
-    rm -f Tk_PathName.3
-    rm -f Tk_NameToWindow.3
-    ln Name.3 Tk_Name.3
-    ln Name.3 Tk_PathName.3
-    ln Name.3 Tk_NameToWindow.3
+    rm -f Name.3.*
+    $ZIP Name.3
+    rm -f Tk_Name.3 Tk_Name.3.* 
+    rm -f Tk_PathName.3 Tk_PathName.3.* 
+    rm -f Tk_NameToWindow.3 Tk_NameToWindow.3.* 
+    ln $S Name.3$Z Tk_Name.3$Z 
+    ln $S Name.3$Z Tk_PathName.3$Z 
+    ln $S Name.3$Z Tk_NameToWindow.3$Z 
 fi
 if test -r NameOfImg.3; then
-    rm -f Tk_NameOfImage.3
-    ln NameOfImg.3 Tk_NameOfImage.3
+    rm -f NameOfImg.3.*
+    $ZIP NameOfImg.3
+    rm -f Tk_NameOfImage.3 Tk_NameOfImage.3.* 
+    ln $S NameOfImg.3$Z Tk_NameOfImage.3$Z 
 fi
 if test -r OwnSelect.3; then
-    rm -f Tk_OwnSelection.3
-    ln OwnSelect.3 Tk_OwnSelection.3
+    rm -f OwnSelect.3.*
+    $ZIP OwnSelect.3
+    rm -f Tk_OwnSelection.3 Tk_OwnSelection.3.* 
+    ln $S OwnSelect.3$Z Tk_OwnSelection.3$Z 
 fi
 if test -r ParseArgv.3; then
-    rm -f Tk_ParseArgv.3
-    ln ParseArgv.3 Tk_ParseArgv.3
+    rm -f ParseArgv.3.*
+    $ZIP ParseArgv.3
+    rm -f Tk_ParseArgv.3 Tk_ParseArgv.3.* 
+    ln $S ParseArgv.3$Z Tk_ParseArgv.3$Z 
 fi
 if test -r QWinEvent.3; then
-    rm -f Tk_CollapseMotionEvents.3
-    rm -f Tk_QueueWindowEvent.3
-    ln QWinEvent.3 Tk_CollapseMotionEvents.3
-    ln QWinEvent.3 Tk_QueueWindowEvent.3
+    rm -f QWinEvent.3.*
+    $ZIP QWinEvent.3
+    rm -f Tk_CollapseMotionEvents.3 Tk_CollapseMotionEvents.3.* 
+    rm -f Tk_QueueWindowEvent.3 Tk_QueueWindowEvent.3.* 
+    ln $S QWinEvent.3$Z Tk_CollapseMotionEvents.3$Z 
+    ln $S QWinEvent.3$Z Tk_QueueWindowEvent.3$Z 
 fi
 if test -r Restack.3; then
-    rm -f Tk_RestackWindow.3
-    ln Restack.3 Tk_RestackWindow.3
+    rm -f Restack.3.*
+    $ZIP Restack.3
+    rm -f Tk_RestackWindow.3 Tk_RestackWindow.3.* 
+    ln $S Restack.3$Z Tk_RestackWindow.3$Z 
 fi
 if test -r RestrictEv.3; then
-    rm -f Tk_RestrictEvents.3
-    ln RestrictEv.3 Tk_RestrictEvents.3
+    rm -f RestrictEv.3.*
+    $ZIP RestrictEv.3
+    rm -f Tk_RestrictEvents.3 Tk_RestrictEvents.3.* 
+    ln $S RestrictEv.3$Z Tk_RestrictEvents.3$Z 
 fi
 if test -r SetAppName.3; then
-    rm -f Tk_SetAppName.3
-    ln SetAppName.3 Tk_SetAppName.3
+    rm -f SetAppName.3.*
+    $ZIP SetAppName.3
+    rm -f Tk_SetAppName.3 Tk_SetAppName.3.* 
+    ln $S SetAppName.3$Z Tk_SetAppName.3$Z 
 fi
 if test -r SetCaret.3; then
-    rm -f Tk_SetCaretPos.3
-    ln SetCaret.3 Tk_SetCaretPos.3
+    rm -f SetCaret.3.*
+    $ZIP SetCaret.3
+    rm -f Tk_SetCaretPos.3 Tk_SetCaretPos.3.* 
+    ln $S SetCaret.3$Z Tk_SetCaretPos.3$Z 
 fi
 if test -r SetClass.3; then
-    rm -f Tk_SetClass.3
-    rm -f Tk_Class.3
-    ln SetClass.3 Tk_SetClass.3
-    ln SetClass.3 Tk_Class.3
+    rm -f SetClass.3.*
+    $ZIP SetClass.3
+    rm -f Tk_SetClass.3 Tk_SetClass.3.* 
+    rm -f Tk_Class.3 Tk_Class.3.* 
+    ln $S SetClass.3$Z Tk_SetClass.3$Z 
+    ln $S SetClass.3$Z Tk_Class.3$Z 
 fi
 if test -r SetClassProcs.3; then
-    rm -f Tk_SetClassProcs.3
-    ln SetClassProcs.3 Tk_SetClassProcs.3
+    rm -f SetClassProcs.3.*
+    $ZIP SetClassProcs.3
+    rm -f Tk_SetClassProcs.3 Tk_SetClassProcs.3.* 
+    ln $S SetClassProcs.3$Z Tk_SetClassProcs.3$Z 
 fi
 if test -r SetGrid.3; then
-    rm -f Tk_SetGrid.3
-    rm -f Tk_UnsetGrid.3
-    ln SetGrid.3 Tk_SetGrid.3
-    ln SetGrid.3 Tk_UnsetGrid.3
+    rm -f SetGrid.3.*
+    $ZIP SetGrid.3
+    rm -f Tk_SetGrid.3 Tk_SetGrid.3.* 
+    rm -f Tk_UnsetGrid.3 Tk_UnsetGrid.3.* 
+    ln $S SetGrid.3$Z Tk_SetGrid.3$Z 
+    ln $S SetGrid.3$Z Tk_UnsetGrid.3$Z 
 fi
 if test -r SetOptions.3; then
-    rm -f Tk_CreateOptionTable.3
-    rm -f Tk_DeleteOptionTable.3
-    rm -f Tk_InitOptions.3
-    rm -f Tk_SetOptions.3
-    rm -f Tk_FreeSavedOptions.3
-    rm -f Tk_RestoreSavedOptions.3
-    rm -f Tk_GetOptionValue.3
-    rm -f Tk_GetOptionInfo.3
-    rm -f Tk_FreeConfigOptions.3
-    rm -f Tk_Offset.3
-    ln SetOptions.3 Tk_CreateOptionTable.3
-    ln SetOptions.3 Tk_DeleteOptionTable.3
-    ln SetOptions.3 Tk_InitOptions.3
-    ln SetOptions.3 Tk_SetOptions.3
-    ln SetOptions.3 Tk_FreeSavedOptions.3
-    ln SetOptions.3 Tk_RestoreSavedOptions.3
-    ln SetOptions.3 Tk_GetOptionValue.3
-    ln SetOptions.3 Tk_GetOptionInfo.3
-    ln SetOptions.3 Tk_FreeConfigOptions.3
-    ln SetOptions.3 Tk_Offset.3
+    rm -f SetOptions.3.*
+    $ZIP SetOptions.3
+    rm -f Tk_CreateOptionTable.3 Tk_CreateOptionTable.3.* 
+    rm -f Tk_DeleteOptionTable.3 Tk_DeleteOptionTable.3.* 
+    rm -f Tk_InitOptions.3 Tk_InitOptions.3.* 
+    rm -f Tk_SetOptions.3 Tk_SetOptions.3.* 
+    rm -f Tk_FreeSavedOptions.3 Tk_FreeSavedOptions.3.* 
+    rm -f Tk_RestoreSavedOptions.3 Tk_RestoreSavedOptions.3.* 
+    rm -f Tk_GetOptionValue.3 Tk_GetOptionValue.3.* 
+    rm -f Tk_GetOptionInfo.3 Tk_GetOptionInfo.3.* 
+    rm -f Tk_FreeConfigOptions.3 Tk_FreeConfigOptions.3.* 
+    rm -f Tk_Offset.3 Tk_Offset.3.* 
+    ln $S SetOptions.3$Z Tk_CreateOptionTable.3$Z 
+    ln $S SetOptions.3$Z Tk_DeleteOptionTable.3$Z 
+    ln $S SetOptions.3$Z Tk_InitOptions.3$Z 
+    ln $S SetOptions.3$Z Tk_SetOptions.3$Z 
+    ln $S SetOptions.3$Z Tk_FreeSavedOptions.3$Z 
+    ln $S SetOptions.3$Z Tk_RestoreSavedOptions.3$Z 
+    ln $S SetOptions.3$Z Tk_GetOptionValue.3$Z 
+    ln $S SetOptions.3$Z Tk_GetOptionInfo.3$Z 
+    ln $S SetOptions.3$Z Tk_FreeConfigOptions.3$Z 
+    ln $S SetOptions.3$Z Tk_Offset.3$Z 
 fi
 if test -r SetVisual.3; then
-    rm -f Tk_SetWindowVisual.3
-    ln SetVisual.3 Tk_SetWindowVisual.3
+    rm -f SetVisual.3.*
+    $ZIP SetVisual.3
+    rm -f Tk_SetWindowVisual.3 Tk_SetWindowVisual.3.* 
+    ln $S SetVisual.3$Z Tk_SetWindowVisual.3$Z 
 fi
 if test -r StrictMotif.3; then
-    rm -f Tk_StrictMotif.3
-    ln StrictMotif.3 Tk_StrictMotif.3
+    rm -f StrictMotif.3.*
+    $ZIP StrictMotif.3
+    rm -f Tk_StrictMotif.3 Tk_StrictMotif.3.* 
+    ln $S StrictMotif.3$Z Tk_StrictMotif.3$Z 
 fi
 if test -r TextLayout.3; then
-    rm -f Tk_ComputeTextLayout.3
-    rm -f Tk_FreeTextLayout.3
-    rm -f Tk_DrawTextLayout.3
-    rm -f Tk_UnderlineTextLayout.3
-    rm -f Tk_PointToChar.3
-    rm -f Tk_CharBbox.3
-    rm -f Tk_DistanceToTextLayout.3
-    rm -f Tk_IntersectTextLayout.3
-    rm -f Tk_TextLayoutToPostscript.3
-    ln TextLayout.3 Tk_ComputeTextLayout.3
-    ln TextLayout.3 Tk_FreeTextLayout.3
-    ln TextLayout.3 Tk_DrawTextLayout.3
-    ln TextLayout.3 Tk_UnderlineTextLayout.3
-    ln TextLayout.3 Tk_PointToChar.3
-    ln TextLayout.3 Tk_CharBbox.3
-    ln TextLayout.3 Tk_DistanceToTextLayout.3
-    ln TextLayout.3 Tk_IntersectTextLayout.3
-    ln TextLayout.3 Tk_TextLayoutToPostscript.3
+    rm -f TextLayout.3.*
+    $ZIP TextLayout.3
+    rm -f Tk_ComputeTextLayout.3 Tk_ComputeTextLayout.3.* 
+    rm -f Tk_FreeTextLayout.3 Tk_FreeTextLayout.3.* 
+    rm -f Tk_DrawTextLayout.3 Tk_DrawTextLayout.3.* 
+    rm -f Tk_UnderlineTextLayout.3 Tk_UnderlineTextLayout.3.* 
+    rm -f Tk_PointToChar.3 Tk_PointToChar.3.* 
+    rm -f Tk_CharBbox.3 Tk_CharBbox.3.* 
+    rm -f Tk_DistanceToTextLayout.3 Tk_DistanceToTextLayout.3.* 
+    rm -f Tk_IntersectTextLayout.3 Tk_IntersectTextLayout.3.* 
+    rm -f Tk_TextLayoutToPostscript.3 Tk_TextLayoutToPostscript.3.* 
+    ln $S TextLayout.3$Z Tk_ComputeTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_FreeTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_DrawTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_UnderlineTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_PointToChar.3$Z 
+    ln $S TextLayout.3$Z Tk_CharBbox.3$Z 
+    ln $S TextLayout.3$Z Tk_DistanceToTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_IntersectTextLayout.3$Z 
+    ln $S TextLayout.3$Z Tk_TextLayoutToPostscript.3$Z 
 fi
 if test -r TkInitStubs.3; then
-    rm -f Tk_InitStubs.3
-    ln TkInitStubs.3 Tk_InitStubs.3
+    rm -f TkInitStubs.3.*
+    $ZIP TkInitStubs.3
+    rm -f Tk_InitStubs.3 Tk_InitStubs.3.* 
+    ln $S TkInitStubs.3$Z Tk_InitStubs.3$Z 
 fi
 if test -r Tk_Init.3; then
-    rm -f Tk_SafeInit.3
-    ln Tk_Init.3 Tk_SafeInit.3
+    rm -f Tk_Init.3.*
+    $ZIP Tk_Init.3
+    rm -f Tk_SafeInit.3 Tk_SafeInit.3.* 
+    ln $S Tk_Init.3$Z Tk_SafeInit.3$Z 
+fi
+if test -r Tk_Main.3; then
+    rm -f Tk_Main.3.*
+    $ZIP Tk_Main.3
 fi
 if test -r WindowId.3; then
-    rm -f Tk_WindowId.3
-    rm -f Tk_Parent.3
-    rm -f Tk_Display.3
-    rm -f Tk_DisplayName.3
-    rm -f Tk_ScreenNumber.3
-    rm -f Tk_Screen.3
-    rm -f Tk_X.3
-    rm -f Tk_Y.3
-    rm -f Tk_Width.3
-    rm -f Tk_Height.3
-    rm -f Tk_Changes.3
-    rm -f Tk_Attributes.3
-    rm -f Tk_IsContainer.3
-    rm -f Tk_IsEmbedded.3
-    rm -f Tk_IsMapped.3
-    rm -f Tk_IsTopLevel.3
-    rm -f Tk_ReqWidth.3
-    rm -f Tk_ReqHeight.3
-    rm -f Tk_MinReqWidth.3
-    rm -f Tk_MinReqHeight.3
-    rm -f Tk_InternalBorderLeft.3
-    rm -f Tk_InternalBorderRight.3
-    rm -f Tk_InternalBorderTop.3
-    rm -f Tk_InternalBorderBottom.3
-    rm -f Tk_Visual.3
-    rm -f Tk_Depth.3
-    rm -f Tk_Colormap.3
-    ln WindowId.3 Tk_WindowId.3
-    ln WindowId.3 Tk_Parent.3
-    ln WindowId.3 Tk_Display.3
-    ln WindowId.3 Tk_DisplayName.3
-    ln WindowId.3 Tk_ScreenNumber.3
-    ln WindowId.3 Tk_Screen.3
-    ln WindowId.3 Tk_X.3
-    ln WindowId.3 Tk_Y.3
-    ln WindowId.3 Tk_Width.3
-    ln WindowId.3 Tk_Height.3
-    ln WindowId.3 Tk_Changes.3
-    ln WindowId.3 Tk_Attributes.3
-    ln WindowId.3 Tk_IsContainer.3
-    ln WindowId.3 Tk_IsEmbedded.3
-    ln WindowId.3 Tk_IsMapped.3
-    ln WindowId.3 Tk_IsTopLevel.3
-    ln WindowId.3 Tk_ReqWidth.3
-    ln WindowId.3 Tk_ReqHeight.3
-    ln WindowId.3 Tk_MinReqWidth.3
-    ln WindowId.3 Tk_MinReqHeight.3
-    ln WindowId.3 Tk_InternalBorderLeft.3
-    ln WindowId.3 Tk_InternalBorderRight.3
-    ln WindowId.3 Tk_InternalBorderTop.3
-    ln WindowId.3 Tk_InternalBorderBottom.3
-    ln WindowId.3 Tk_Visual.3
-    ln WindowId.3 Tk_Depth.3
-    ln WindowId.3 Tk_Colormap.3
+    rm -f WindowId.3.*
+    $ZIP WindowId.3
+    rm -f Tk_WindowId.3 Tk_WindowId.3.* 
+    rm -f Tk_Parent.3 Tk_Parent.3.* 
+    rm -f Tk_Display.3 Tk_Display.3.* 
+    rm -f Tk_DisplayName.3 Tk_DisplayName.3.* 
+    rm -f Tk_ScreenNumber.3 Tk_ScreenNumber.3.* 
+    rm -f Tk_Screen.3 Tk_Screen.3.* 
+    rm -f Tk_X.3 Tk_X.3.* 
+    rm -f Tk_Y.3 Tk_Y.3.* 
+    rm -f Tk_Width.3 Tk_Width.3.* 
+    rm -f Tk_Height.3 Tk_Height.3.* 
+    rm -f Tk_Changes.3 Tk_Changes.3.* 
+    rm -f Tk_Attributes.3 Tk_Attributes.3.* 
+    rm -f Tk_IsContainer.3 Tk_IsContainer.3.* 
+    rm -f Tk_IsEmbedded.3 Tk_IsEmbedded.3.* 
+    rm -f Tk_IsMapped.3 Tk_IsMapped.3.* 
+    rm -f Tk_IsTopLevel.3 Tk_IsTopLevel.3.* 
+    rm -f Tk_ReqWidth.3 Tk_ReqWidth.3.* 
+    rm -f Tk_ReqHeight.3 Tk_ReqHeight.3.* 
+    rm -f Tk_MinReqWidth.3 Tk_MinReqWidth.3.* 
+    rm -f Tk_MinReqHeight.3 Tk_MinReqHeight.3.* 
+    rm -f Tk_InternalBorderLeft.3 Tk_InternalBorderLeft.3.* 
+    rm -f Tk_InternalBorderRight.3 Tk_InternalBorderRight.3.* 
+    rm -f Tk_InternalBorderTop.3 Tk_InternalBorderTop.3.* 
+    rm -f Tk_InternalBorderBottom.3 Tk_InternalBorderBottom.3.* 
+    rm -f Tk_Visual.3 Tk_Visual.3.* 
+    rm -f Tk_Depth.3 Tk_Depth.3.* 
+    rm -f Tk_Colormap.3 Tk_Colormap.3.* 
+    ln $S WindowId.3$Z Tk_WindowId.3$Z 
+    ln $S WindowId.3$Z Tk_Parent.3$Z 
+    ln $S WindowId.3$Z Tk_Display.3$Z 
+    ln $S WindowId.3$Z Tk_DisplayName.3$Z 
+    ln $S WindowId.3$Z Tk_ScreenNumber.3$Z 
+    ln $S WindowId.3$Z Tk_Screen.3$Z 
+    ln $S WindowId.3$Z Tk_X.3$Z 
+    ln $S WindowId.3$Z Tk_Y.3$Z 
+    ln $S WindowId.3$Z Tk_Width.3$Z 
+    ln $S WindowId.3$Z Tk_Height.3$Z 
+    ln $S WindowId.3$Z Tk_Changes.3$Z 
+    ln $S WindowId.3$Z Tk_Attributes.3$Z 
+    ln $S WindowId.3$Z Tk_IsContainer.3$Z 
+    ln $S WindowId.3$Z Tk_IsEmbedded.3$Z 
+    ln $S WindowId.3$Z Tk_IsMapped.3$Z 
+    ln $S WindowId.3$Z Tk_IsTopLevel.3$Z 
+    ln $S WindowId.3$Z Tk_ReqWidth.3$Z 
+    ln $S WindowId.3$Z Tk_ReqHeight.3$Z 
+    ln $S WindowId.3$Z Tk_MinReqWidth.3$Z 
+    ln $S WindowId.3$Z Tk_MinReqHeight.3$Z 
+    ln $S WindowId.3$Z Tk_InternalBorderLeft.3$Z 
+    ln $S WindowId.3$Z Tk_InternalBorderRight.3$Z 
+    ln $S WindowId.3$Z Tk_InternalBorderTop.3$Z 
+    ln $S WindowId.3$Z Tk_InternalBorderBottom.3$Z 
+    ln $S WindowId.3$Z Tk_Visual.3$Z 
+    ln $S WindowId.3$Z Tk_Depth.3$Z 
+    ln $S WindowId.3$Z Tk_Colormap.3$Z 
+fi
+if test -r bell.n; then
+    rm -f bell.n.*
+    $ZIP bell.n
+fi
+if test -r bind.n; then
+    rm -f bind.n.*
+    $ZIP bind.n
+fi
+if test -r bindtags.n; then
+    rm -f bindtags.n.*
+    $ZIP bindtags.n
+fi
+if test -r bitmap.n; then
+    rm -f bitmap.n.*
+    $ZIP bitmap.n
+fi
+if test -r button.n; then
+    rm -f button.n.*
+    $ZIP button.n
+fi
+if test -r canvas.n; then
+    rm -f canvas.n.*
+    $ZIP canvas.n
+fi
+if test -r checkbutton.n; then
+    rm -f checkbutton.n.*
+    $ZIP checkbutton.n
 fi
 if test -r chooseColor.n; then
-    rm -f tk_chooseColor.n
-    ln chooseColor.n tk_chooseColor.n
+    rm -f chooseColor.n.*
+    $ZIP chooseColor.n
+    rm -f tk_chooseColor.n tk_chooseColor.n.* 
+    ln $S chooseColor.n$Z tk_chooseColor.n$Z 
 fi
 if test -r chooseDirectory.n; then
-    rm -f tk_chooseDirectory.n
-    ln chooseDirectory.n tk_chooseDirectory.n
+    rm -f chooseDirectory.n.*
+    $ZIP chooseDirectory.n
+    rm -f tk_chooseDirectory.n tk_chooseDirectory.n.* 
+    ln $S chooseDirectory.n$Z tk_chooseDirectory.n$Z 
+fi
+if test -r clipboard.n; then
+    rm -f clipboard.n.*
+    $ZIP clipboard.n
+fi
+if test -r colors.n; then
+    rm -f colors.n.*
+    $ZIP colors.n
+fi
+if test -r console.n; then
+    rm -f console.n.*
+    $ZIP console.n
+fi
+if test -r cursors.n; then
+    rm -f cursors.n.*
+    $ZIP cursors.n
+fi
+if test -r destroy.n; then
+    rm -f destroy.n.*
+    $ZIP destroy.n
 fi
 if test -r dialog.n; then
-    rm -f tk_dialog.n
-    ln dialog.n tk_dialog.n
+    rm -f dialog.n.*
+    $ZIP dialog.n
+    rm -f tk_dialog.n tk_dialog.n.* 
+    ln $S dialog.n$Z tk_dialog.n$Z 
+fi
+if test -r entry.n; then
+    rm -f entry.n.*
+    $ZIP entry.n
+fi
+if test -r event.n; then
+    rm -f event.n.*
+    $ZIP event.n
+fi
+if test -r focus.n; then
+    rm -f focus.n.*
+    $ZIP focus.n
 fi
 if test -r focusNext.n; then
-    rm -f tk_focusNext.n
-    rm -f tk_focusPrev.n
-    rm -f tk_focusFollowsMouse.n
-    ln focusNext.n tk_focusNext.n
-    ln focusNext.n tk_focusPrev.n
-    ln focusNext.n tk_focusFollowsMouse.n
+    rm -f focusNext.n.*
+    $ZIP focusNext.n
+    rm -f tk_focusNext.n tk_focusNext.n.* 
+    rm -f tk_focusPrev.n tk_focusPrev.n.* 
+    rm -f tk_focusFollowsMouse.n tk_focusFollowsMouse.n.* 
+    ln $S focusNext.n$Z tk_focusNext.n$Z 
+    ln $S focusNext.n$Z tk_focusPrev.n$Z 
+    ln $S focusNext.n$Z tk_focusFollowsMouse.n$Z 
+fi
+if test -r font.n; then
+    rm -f font.n.*
+    $ZIP font.n
+fi
+if test -r frame.n; then
+    rm -f frame.n.*
+    $ZIP frame.n
 fi
 if test -r getOpenFile.n; then
-    rm -f tk_getOpenFile.n
-    rm -f tk_getSaveFile.n
-    ln getOpenFile.n tk_getOpenFile.n
-    ln getOpenFile.n tk_getSaveFile.n
+    rm -f getOpenFile.n.*
+    $ZIP getOpenFile.n
+    rm -f tk_getOpenFile.n tk_getOpenFile.n.* 
+    rm -f tk_getSaveFile.n tk_getSaveFile.n.* 
+    ln $S getOpenFile.n$Z tk_getOpenFile.n$Z 
+    ln $S getOpenFile.n$Z tk_getSaveFile.n$Z 
+fi
+if test -r grab.n; then
+    rm -f grab.n.*
+    $ZIP grab.n
+fi
+if test -r grid.n; then
+    rm -f grid.n.*
+    $ZIP grid.n
+fi
+if test -r image.n; then
+    rm -f image.n.*
+    $ZIP image.n
+fi
+if test -r keysyms.n; then
+    rm -f keysyms.n.*
+    $ZIP keysyms.n
+fi
+if test -r label.n; then
+    rm -f label.n.*
+    $ZIP label.n
+fi
+if test -r labelframe.n; then
+    rm -f labelframe.n.*
+    $ZIP labelframe.n
+fi
+if test -r listbox.n; then
+    rm -f listbox.n.*
+    $ZIP listbox.n
+fi
+if test -r loadTk.n; then
+    rm -f loadTk.n.*
+    $ZIP loadTk.n
+fi
+if test -r lower.n; then
+    rm -f lower.n.*
+    $ZIP lower.n
 fi
 if test -r menu.n; then
-    rm -f tk_menuSetFocus.n
-    ln menu.n tk_menuSetFocus.n
+    rm -f menu.n.*
+    $ZIP menu.n
+    rm -f tk_menuSetFocus.n tk_menuSetFocus.n.* 
+    ln $S menu.n$Z tk_menuSetFocus.n$Z 
 fi
 if test -r menubar.n; then
-    rm -f tk_menuBar.n
-    rm -f tk_bindForTraversal.n
-    ln menubar.n tk_menuBar.n
-    ln menubar.n tk_bindForTraversal.n
+    rm -f menubar.n.*
+    $ZIP menubar.n
+    rm -f tk_menuBar.n tk_menuBar.n.* 
+    rm -f tk_bindForTraversal.n tk_bindForTraversal.n.* 
+    ln $S menubar.n$Z tk_menuBar.n$Z 
+    ln $S menubar.n$Z tk_bindForTraversal.n$Z 
+fi
+if test -r menubutton.n; then
+    rm -f menubutton.n.*
+    $ZIP menubutton.n
+fi
+if test -r message.n; then
+    rm -f message.n.*
+    $ZIP message.n
 fi
 if test -r messageBox.n; then
-    rm -f tk_messageBox.n
-    ln messageBox.n tk_messageBox.n
+    rm -f messageBox.n.*
+    $ZIP messageBox.n
+    rm -f tk_messageBox.n tk_messageBox.n.* 
+    ln $S messageBox.n$Z tk_messageBox.n$Z 
+fi
+if test -r option.n; then
+    rm -f option.n.*
+    $ZIP option.n
 fi
 if test -r optionMenu.n; then
-    rm -f tk_optionMenu.n
-    ln optionMenu.n tk_optionMenu.n
+    rm -f optionMenu.n.*
+    $ZIP optionMenu.n
+    rm -f tk_optionMenu.n tk_optionMenu.n.* 
+    ln $S optionMenu.n$Z tk_optionMenu.n$Z 
+fi
+if test -r options.n; then
+    rm -f options.n.*
+    $ZIP options.n
+fi
+if test -r pack-old.n; then
+    rm -f pack-old.n.*
+    $ZIP pack-old.n
+fi
+if test -r pack.n; then
+    rm -f pack.n.*
+    $ZIP pack.n
 fi
 if test -r palette.n; then
-    rm -f tk_setPalette.n
-    rm -f tk_bisque.n
-    ln palette.n tk_setPalette.n
-    ln palette.n tk_bisque.n
+    rm -f palette.n.*
+    $ZIP palette.n
+    rm -f tk_setPalette.n tk_setPalette.n.* 
+    rm -f tk_bisque.n tk_bisque.n.* 
+    ln $S palette.n$Z tk_setPalette.n$Z 
+    ln $S palette.n$Z tk_bisque.n$Z 
+fi
+if test -r panedwindow.n; then
+    rm -f panedwindow.n.*
+    $ZIP panedwindow.n
+fi
+if test -r photo.n; then
+    rm -f photo.n.*
+    $ZIP photo.n
+fi
+if test -r place.n; then
+    rm -f place.n.*
+    $ZIP place.n
 fi
 if test -r popup.n; then
-    rm -f tk_popup.n
-    ln popup.n tk_popup.n
+    rm -f popup.n.*
+    $ZIP popup.n
+    rm -f tk_popup.n tk_popup.n.* 
+    ln $S popup.n$Z tk_popup.n$Z 
+fi
+if test -r radiobutton.n; then
+    rm -f radiobutton.n.*
+    $ZIP radiobutton.n
+fi
+if test -r raise.n; then
+    rm -f raise.n.*
+    $ZIP raise.n
+fi
+if test -r scale.n; then
+    rm -f scale.n.*
+    $ZIP scale.n
+fi
+if test -r scrollbar.n; then
+    rm -f scrollbar.n.*
+    $ZIP scrollbar.n
+fi
+if test -r selection.n; then
+    rm -f selection.n.*
+    $ZIP selection.n
+fi
+if test -r send.n; then
+    rm -f send.n.*
+    $ZIP send.n
+fi
+if test -r spinbox.n; then
+    rm -f spinbox.n.*
+    $ZIP spinbox.n
 fi
 if test -r text.n; then
-    rm -f tk_textCopy.n
-    rm -f tk_textCut.n
-    rm -f tk_textPaste.n
-    ln text.n tk_textCopy.n
-    ln text.n tk_textCut.n
-    ln text.n tk_textPaste.n
+    rm -f text.n.*
+    $ZIP text.n
+    rm -f tk_textCopy.n tk_textCopy.n.* 
+    rm -f tk_textCut.n tk_textCut.n.* 
+    rm -f tk_textPaste.n tk_textPaste.n.* 
+    ln $S text.n$Z tk_textCopy.n$Z 
+    ln $S text.n$Z tk_textCut.n$Z 
+    ln $S text.n$Z tk_textPaste.n$Z 
+fi
+if test -r tk.n; then
+    rm -f tk.n.*
+    $ZIP tk.n
+fi
+if test -r tkerror.n; then
+    rm -f tkerror.n.*
+    $ZIP tkerror.n
+fi
+if test -r tkvars.n; then
+    rm -f tkvars.n.*
+    $ZIP tkvars.n
+fi
+if test -r tkwait.n; then
+    rm -f tkwait.n.*
+    $ZIP tkwait.n
+fi
+if test -r toplevel.n; then
+    rm -f toplevel.n.*
+    $ZIP toplevel.n
+fi
+if test -r winfo.n; then
+    rm -f winfo.n.*
+    $ZIP winfo.n
+fi
+if test -r wish.1; then
+    rm -f wish.1.*
+    $ZIP wish.1
+fi
+if test -r wm.n; then
+    rm -f wm.n.*
+    $ZIP wm.n
 fi
 exit 0
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a146632..5bf4753 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -505,6 +505,48 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [
 ])
 
 #--------------------------------------------------------------------
+# SC_CONFIG_MANPAGES
+#	
+#	Decide whether to use symlinks for linking the manpages and
+#	whether to compress the manpages after installation.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-man-symlinks
+#		--enable-man-compression=PROG
+#
+#	Defines the following variable:
+#
+#	MKLINKS_FLAGS -		The apropriate flags for mkLinks
+#				according to the user's selection.
+#
+#--------------------------------------------------------------------
+AC_DEFUN(SC_CONFIG_MANPAGES, [
+
+	AC_MSG_CHECKING([whether to use symlinks for manpages])
+	AC_ARG_ENABLE(man-symlinks,
+		[  --enable-man-symlinks   use symlinks for the manpages],
+		test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --symlinks",
+		enableval="no")
+	AC_MSG_RESULT([$enableval])
+
+	AC_MSG_CHECKING([compression for manpages])
+	AC_ARG_ENABLE(man-compression,
+		[  --enable-man-compression=PROG
+                          compress the manpages with PROG],
+		test "$enableval" = "yes" && echo && AC_MSG_ERROR([missing argument to --enable-man-compression])
+		test "$enableval" != "no" && MKLINKS_FLAGS="$MKLINKS_FLAGS --compress $enableval",
+		enableval="no")
+	AC_MSG_RESULT([$enableval])
+
+	AC_SUBST(MKLINKS_FLAGS)
+])
+
+#--------------------------------------------------------------------
 # SC_CONFIG_CFLAGS
 #
 #	Try to determine the proper flags to pass to the compiler