2004-11-18 Reinhard Max <max@suse.de>

* unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of * unix/configure.in: patch #996085, that introduces * unix/Makefile.in: --enable-man-suffix. * unix/installManPage: added * unix/mkLinks: removed
author: rmax <rmax> 2004-11-18 02:08:53 (GMT)
committer: rmax <rmax> 2004-11-18 02:08:53 (GMT)
commit: 48cc85d50a977b2c192eec2f39ac45d6116aa95b (patch)
tree: e80fe6443e5872769b6751f65ce83f28b6a65ce2 /unix
parent: 82a529bee068d65da4c56c30e13a4f652f2c064b (diff)
download: tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.zip
tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.tar.gz
tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.tar.bz2
6 files changed, 348 insertions, 1450 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8b53e26..e21fdbf 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.87.2.4 2004/10/26 23:23:14 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.87.2.5 2004/11/18 02:08:59 rmax Exp $
 
 # Current Tk version;  used in various names.
 
@@ -270,9 +270,9 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
 # either.
 #----------------------------------------------------------------
 
-# Flags to be passed to mkLinks to control whether the manpages
+# Flags to be passed to installManPage to control whether the manpages
 # should be compressed and linked with softlinks
-MKLINKS_FLAGS           = @MKLINKS_FLAGS@
+MAN_FLAGS		= @MAN_FLAGS@
 
 CC			= @CC@
 
@@ -628,8 +628,8 @@ install-demos:
 	    done;
 
 install-doc:
-	@if test ! -x $(UNIX_DIR)/mkLinks; then \
-	    chmod +x $(UNIX_DIR)/mkLinks; \
+	@if test ! -x $(UNIX_DIR)/installManPage; then \
+	    chmod +x $(UNIX_DIR)/installManPage; \
 	    fi
 	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
 	    do \
@@ -640,36 +640,20 @@ install-doc:
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing top-level (.1) docs";
-	@cd $(SRC_DIR)/doc; for i in *.1; \
-	    do \
-	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-	    done;
-	@echo "Cross-linking top-level (.1) docs";
-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
-	@echo "Installing C API (.3) docs";
-	@cd $(SRC_DIR)/doc; for i in *.3; \
-	    do \
-	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
-	    done;
-	@echo "Cross-linking top-level (.3) docs";
-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
-	@echo "Installing command (.n) docs";
-	@cd $(SRC_DIR)/doc; for i in *.n; \
-	    do \
-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-	    done;
-	@echo "Cross-linking command (.n) docs";
-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
+	@echo "Installing and cross-linking top-level (.1) docs";
+	@cd $(TOP_DIR)/doc; for i in *.1; do \
+	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
+	done
+
+	@echo "Installing and cross-linking C API (.3) docs";
+	@cd $(TOP_DIR)/doc; for i in *.3; do \
+	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
+	done
+
+	@echo "Installing and cross-linking command (.n) docs";
+	@cd $(TOP_DIR)/doc; for i in *.n; do \
+	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
+	done
 
 Makefile: $(UNIX_DIR)/Makefile.in
 	$(SHELL) config.status
@@ -1056,11 +1040,6 @@ 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
@@ -1073,7 +1052,7 @@ ZIPNAME =	tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR =	$(DISTROOT)/$(DISTNAME)
 TCLDIR = 	@TCL_SRC_DIR@
 
-dist: mklinks
+dist:
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)
 	mkdir $(DISTDIR)/unix
@@ -1083,7 +1062,7 @@ dist: mklinks
 	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 $(UNIX_DIR)/mkLinks $(DISTDIR)/unix
+		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage $(DISTDIR)/unix
 	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
 	chmod +x $(DISTDIR)/unix/install-sh
 	mkdir $(DISTDIR)/bitmaps
diff --git a/unix/configure b/unix/configure
index c428bab..07addf4 100755
--- a/unix/configure
+++ b/unix/configure
@@ -19,6 +19,10 @@ ac_help="$ac_help
   --enable-man-compression=PROG
                           compress the manpages with PROG"
 ac_help="$ac_help
+  --enable-man-suffix=STRING
+                          use STRING as a suffix to manpage file names
+                          (default: tk)"
+ac_help="$ac_help
   --enable-threads        build with threads"
 ac_help="$ac_help
   --enable-shared         build and link with shared libraries [--enable-shared]"
@@ -572,7 +576,7 @@ if test "${with_tcl+set}" = set; then
 fi
 
 	echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
-echo "configure:576: checking for Tcl configuration" >&5
+echo "configure:580: 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
@@ -653,7 +657,7 @@ fi
 
 
     echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:657: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:661: 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
@@ -730,24 +734,47 @@ TK_SRC_DIR=`cd $srcdir/..; pwd`
 
 
 	echo $ac_n "checking whether to use symlinks for manpages""... $ac_c" 1>&6
-echo "configure:734: checking whether to use symlinks for manpages" >&5
+echo "configure:738: 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"
+  test "$enableval" != "no" && MAN_FLAGS="$MAN_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:746: checking compression for manpages" >&5
+	echo $ac_n "checking whether to compress the manpages""... $ac_c" 1>&6
+echo "configure:750: checking whether to compress the 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"
+  test "$enableval" = "yes" && { echo "configure: error: missing argument to --enable-man-compression" 1>&2; exit 1; }
+		test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --compress $enableval"
+else
+  enableval="no"
+fi
+
+	echo "$ac_t""$enableval" 1>&6
+	if test "$enableval" != "no"; then
+		echo $ac_n "checking for compressed file suffix""... $ac_c" 1>&6
+echo "configure:763: checking for compressed file suffix" >&5
+		touch TeST
+		$enableval TeST
+		Z=`ls TeST* | sed 's/^....//'`
+		rm -f TeST*
+		MAN_FLAGS="$MAN_FLAGS --extension $Z"
+		echo "$ac_t""$Z" 1>&6
+	fi
+
+	echo $ac_n "checking whether to add a package name suffix for the manpages""... $ac_c" 1>&6
+echo "configure:773: checking whether to add a package name suffix for the manpages" >&5
+	# Check whether --enable-man-suffix or --disable-man-suffix was given.
+if test "${enable_man_suffix+set}" = set; then
+  enableval="$enable_man_suffix"
+  test "$enableval" = "yes" && enableval="tk"
+		test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --suffix $enableval"
 else
   enableval="no"
 fi
@@ -770,7 +797,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:774: checking for $ac_word" >&5
+echo "configure:801: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -800,7 +827,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:804: checking for $ac_word" >&5
+echo "configure:831: 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
@@ -851,7 +878,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:855: checking for $ac_word" >&5
+echo "configure:882: 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
@@ -883,7 +910,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:914: 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.
@@ -894,12 +921,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 898 "configure"
+#line 925 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:930: \"$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
@@ -925,12 +952,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:929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:956: 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:934: checking whether we are using GNU C" >&5
+echo "configure:961: 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
@@ -939,7 +966,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:943: \"$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:970: \"$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
@@ -958,7 +985,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:962: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:989: 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
@@ -991,7 +1018,7 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:995: checking how to run the C preprocessor" >&5
+echo "configure:1022: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1006,13 +1033,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 1010 "configure"
+#line 1037 "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:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1023,13 +1050,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1027 "configure"
+#line 1054 "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:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1040,13 +1067,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1044 "configure"
+#line 1071 "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:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1077: \"$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
   :
@@ -1074,17 +1101,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:1078: checking for $ac_hdr" >&5
+echo "configure:1105: 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 1083 "configure"
+#line 1110 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1115: \"$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*
@@ -1119,18 +1146,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:1123: checking if the compiler understands -pipe" >&5
+echo "configure:1150: checking if the compiler understands -pipe" >&5
   OLDCC="$CC"  
   CC="$CC -pipe"
   cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1154 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1150,7 +1177,7 @@ fi
 
 
     echo $ac_n "checking for building with threads""... $ac_c" 1>&6
-echo "configure:1154: checking for building with threads" >&5
+echo "configure:1181: 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"
@@ -1186,7 +1213,7 @@ EOF
 EOF
 
 	echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:1190: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:1217: 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
@@ -1194,7 +1221,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1198 "configure"
+#line 1225 "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
@@ -1205,7 +1232,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1236: \"$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
@@ -1233,7 +1260,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:1237: checking for __pthread_mutex_init in -lpthread" >&5
+echo "configure:1264: 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
@@ -1241,7 +1268,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1245 "configure"
+#line 1272 "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
@@ -1252,7 +1279,7 @@ int main() {
 __pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1283: \"$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
@@ -1280,7 +1307,7 @@ fi
 	    THREADS_LIBS=" -lpthread"
 	else
 	    echo $ac_n "checking for pthread_mutex_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:1284: checking for pthread_mutex_init in -lpthreads" >&5
+echo "configure:1311: 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
@@ -1288,7 +1315,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1292 "configure"
+#line 1319 "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
@@ -1299,7 +1326,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1330: \"$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
@@ -1325,7 +1352,7 @@ fi
 		THREADS_LIBS=" -lpthreads"
 	    else
 		echo $ac_n "checking for pthread_mutex_init in -lc""... $ac_c" 1>&6
-echo "configure:1329: checking for pthread_mutex_init in -lc" >&5
+echo "configure:1356: 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
@@ -1333,7 +1360,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1337 "configure"
+#line 1364 "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
@@ -1344,7 +1371,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1375: \"$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
@@ -1367,7 +1394,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:1371: checking for pthread_mutex_init in -lc_r" >&5
+echo "configure:1398: 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
@@ -1375,7 +1402,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1379 "configure"
+#line 1406 "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
@@ -1386,7 +1413,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1417: \"$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
@@ -1426,12 +1453,12 @@ fi
 	for ac_func in pthread_attr_setstacksize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1430: checking for $ac_func" >&5
+echo "configure:1457: 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 1435 "configure"
+#line 1462 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1454,7 +1481,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1485: \"$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
@@ -1481,12 +1508,12 @@ done
 	for ac_func in pthread_atfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1485: checking for $ac_func" >&5
+echo "configure:1512: 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 1490 "configure"
+#line 1517 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1509,7 +1536,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1540: \"$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
@@ -1537,12 +1564,12 @@ done
 	for ac_func in readdir_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1541: checking for $ac_func" >&5
+echo "configure:1568: 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 1546 "configure"
+#line 1573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1565,7 +1592,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1596: \"$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
@@ -1605,7 +1632,7 @@ LIBS="$LIBS$THREADS_LIBS"
 
 
     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1609: checking how to build libraries" >&5
+echo "configure:1636: 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"
@@ -1638,7 +1665,7 @@ EOF
 # 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:1642: checking for $ac_word" >&5
+echo "configure:1669: 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
@@ -1670,7 +1697,7 @@ fi
     # Step 0.a: Enable 64 bit support?
 
     echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1674: checking if 64bit support is requested" >&5
+echo "configure:1701: 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"
@@ -1690,7 +1717,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:1694: checking if 64bit Sparc VIS support is requested" >&5
+echo "configure:1721: 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"
@@ -1714,7 +1741,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:1718: checking system version (for dynamic loading)" >&5
+echo "configure:1745: 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
@@ -1740,7 +1767,7 @@ echo "configure:1718: 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:1744: checking for dlopen in -ldl" >&5
+echo "configure:1771: 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
@@ -1748,7 +1775,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+#line 1779 "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
@@ -1759,7 +1786,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1790: \"$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
@@ -1807,7 +1834,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:1811: checking for $ac_word" >&5
+echo "configure:1838: 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
@@ -1948,7 +1975,7 @@ fi
 	    # known GMT value.
 
 	    echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1952: checking for gettimeofday in -lbsd" >&5
+echo "configure:1979: 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
@@ -1956,7 +1983,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1960 "configure"
+#line 1987 "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
@@ -1967,7 +1994,7 @@ int main() {
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1998: \"$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
@@ -2010,7 +2037,7 @@ EOF
 	    # is always linked to, for compatibility.
 	    #-----------------------------------------------------------
 	    echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
-echo "configure:2014: checking for inet_ntoa in -lbind" >&5
+echo "configure:2041: checking for inet_ntoa in -lbind" >&5
 ac_lib_var=`echo bind'_'inet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2018,7 +2045,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2022 "configure"
+#line 2049 "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
@@ -2029,7 +2056,7 @@ int main() {
 inet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2060: \"$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
@@ -2095,7 +2122,7 @@ EOF
 
 	    SHLIB_SUFFIX=".sl"
 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:2099: checking for shl_load in -ldld" >&5
+echo "configure:2126: 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
@@ -2103,7 +2130,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2107 "configure"
+#line 2134 "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
@@ -2114,7 +2141,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2145: \"$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
@@ -2183,7 +2210,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:2187: checking for shl_load in -ldld" >&5
+echo "configure:2214: 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
@@ -2191,7 +2218,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
+#line 2222 "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
@@ -2202,7 +2229,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2233: \"$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
@@ -2326,17 +2353,17 @@ fi
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2330: checking for dld.h" >&5
+echo "configure:2357: 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 2335 "configure"
+#line 2362 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2367: \"$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*
@@ -2374,7 +2401,7 @@ fi
 	    # is kind of overkill but it works.
 	    # Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
-	    if test x"${LIBOBJS}" != x ; then
+            if test x"${LIBOBJS}" != x ; then
 	        CFLAGS="$CFLAGS -fno-inline"
 	    fi
 
@@ -2400,17 +2427,17 @@ EOF
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2404: checking for dld.h" >&5
+echo "configure:2431: 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 2409 "configure"
+#line 2436 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2441: \"$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*
@@ -2466,17 +2493,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:2470: checking for dlfcn.h" >&5
+echo "configure:2497: 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 2475 "configure"
+#line 2502 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2507: \"$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*
@@ -2503,9 +2530,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 		echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2507: checking for ELF" >&5
+echo "configure:2534: checking for ELF" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 2509 "configure"
+#line 2536 "configure"
 #include "confdefs.h"
 
 #ifdef __ELF__
@@ -2557,9 +2584,9 @@ fi
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2561: checking for ELF" >&5
+echo "configure:2588: checking for ELF" >&5
 	    cat > conftest.$ac_ext <<EOF
-#line 2563 "configure"
+#line 2590 "configure"
 #include "confdefs.h"
 
 #ifdef __ELF__
@@ -2905,17 +2932,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:2909: checking for ld accepts -Bexport flag" >&5
+echo "configure:2936: checking for ld accepts -Bexport flag" >&5
 	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
 	    cat > conftest.$ac_ext <<EOF
-#line 2912 "configure"
+#line 2939 "configure"
 #include "confdefs.h"
 
 int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   found=yes
 else
@@ -2956,9 +2983,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:2960: checking sys/exec.h" >&5
+echo "configure:2987: checking sys/exec.h" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2962 "configure"
+#line 2989 "configure"
 #include "confdefs.h"
 #include <sys/exec.h>
 int main() {
@@ -2976,7 +3003,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:2980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -2994,9 +3021,9 @@ EOF
 
 	else
 	    echo $ac_n "checking a.out.h""... $ac_c" 1>&6
-echo "configure:2998: checking a.out.h" >&5
+echo "configure:3025: checking a.out.h" >&5
 	    cat > conftest.$ac_ext <<EOF
-#line 3000 "configure"
+#line 3027 "configure"
 #include "confdefs.h"
 #include <a.out.h>
 int main() {
@@ -3014,7 +3041,7 @@ int main() {
 	    
 ; return 0; }
 EOF
-if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -3032,9 +3059,9 @@ EOF
 
 	    else
 		echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
-echo "configure:3036: checking sys/exec_aout.h" >&5
+echo "configure:3063: checking sys/exec_aout.h" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 3038 "configure"
+#line 3065 "configure"
 #include "confdefs.h"
 #include <sys/exec_aout.h>
 int main() {
@@ -3052,7 +3079,7 @@ int main() {
 		
 ; return 0; }
 EOF
-if { (eval echo configure:3056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_ok=usable
 else
@@ -3203,7 +3230,7 @@ fi
 
 
     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:3207: checking for build with symbols" >&5
+echo "configure:3234: 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"
@@ -3264,21 +3291,21 @@ TK_DBGX=${DBGX}
 
 
     echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6
-echo "configure:3268: checking for required early compiler flags" >&5
+echo "configure:3295: 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 3275 "configure"
+#line 3302 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
 char *p = (char *)strtoll; char *q = (char *)strtoull;
 ; return 0; }
 EOF
-if { (eval echo configure:3282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__isoc99_source=no
 else
@@ -3286,7 +3313,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 3290 "configure"
+#line 3317 "configure"
 #include "confdefs.h"
 #define _ISOC99_SOURCE 1
 #include <stdlib.h>
@@ -3294,7 +3321,7 @@ int main() {
 char *p = (char *)strtoll; char *q = (char *)strtoull;
 ; return 0; }
 EOF
-if { (eval echo configure:3298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__isoc99_source=yes
 else
@@ -3320,14 +3347,14 @@ EOF
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3324 "configure"
+#line 3351 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 int main() {
 struct stat64 buf; int i = stat64("/", &buf);
 ; return 0; }
 EOF
-if { (eval echo configure:3331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__largefile64_source=no
 else
@@ -3335,7 +3362,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 3339 "configure"
+#line 3366 "configure"
 #include "confdefs.h"
 #define _LARGEFILE64_SOURCE 1
 #include <sys/stat.h>
@@ -3343,7 +3370,7 @@ int main() {
 struct stat64 buf; int i = stat64("/", &buf);
 ; return 0; }
 EOF
-if { (eval echo configure:3347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_flag__largefile64_source=yes
 else
@@ -3372,7 +3399,7 @@ EOF
 
 
     echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6
-echo "configure:3376: checking for 64-bit integer type" >&5
+echo "configure:3403: 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
@@ -3380,14 +3407,14 @@ else
 	tcl_cv_type_64bit=none
 	# See if the compiler knows natively about __int64
 	cat > conftest.$ac_ext <<EOF
-#line 3384 "configure"
+#line 3411 "configure"
 #include "confdefs.h"
 
 int main() {
 __int64 value = (__int64) 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_type_64bit=__int64
 else
@@ -3401,7 +3428,7 @@ rm -f conftest*
 	# type that is our current guess for a 64-bit type inside this check
 	# program, so it should be modified only carefully...
         cat > conftest.$ac_ext <<EOF
-#line 3405 "configure"
+#line 3432 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3410,7 +3437,7 @@ switch (0) {
         }
 ; return 0; }
 EOF
-if { (eval echo configure:3414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_type_64bit=${tcl_type_64bit}
 else
@@ -3435,13 +3462,13 @@ EOF
 
 	# Now check for auxiliary declarations
 	echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6
-echo "configure:3439: checking for struct dirent64" >&5
+echo "configure:3466: 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 3445 "configure"
+#line 3472 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/dirent.h>
@@ -3449,7 +3476,7 @@ int main() {
 struct dirent64 p;
 ; return 0; }
 EOF
-if { (eval echo configure:3453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_struct_dirent64=yes
 else
@@ -3470,13 +3497,13 @@ EOF
 	echo "$ac_t""${tcl_cv_struct_dirent64}" 1>&6
 
 	echo $ac_n "checking for struct stat64""... $ac_c" 1>&6
-echo "configure:3474: checking for struct stat64" >&5
+echo "configure:3501: 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 3480 "configure"
+#line 3507 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 int main() {
@@ -3484,7 +3511,7 @@ struct stat64 p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_struct_stat64=yes
 else
@@ -3505,13 +3532,13 @@ EOF
 	echo "$ac_t""${tcl_cv_struct_stat64}" 1>&6
 
 	echo $ac_n "checking for off64_t""... $ac_c" 1>&6
-echo "configure:3509: checking for off64_t" >&5
+echo "configure:3536: 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 3515 "configure"
+#line 3542 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -3519,7 +3546,7 @@ off64_t offset;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tcl_cv_type_off64_t=yes
 else
@@ -3566,12 +3593,12 @@ fi
 
 MATH_LIBS=""
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:3570: checking for sin" >&5
+echo "configure:3597: 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 3575 "configure"
+#line 3602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -3594,7 +3621,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3625: \"$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
@@ -3615,7 +3642,7 @@ MATH_LIBS="-lm"
 fi
 
 echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
-echo "configure:3619: checking for main in -lieee" >&5
+echo "configure:3646: 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
@@ -3623,14 +3650,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lieee  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3627 "configure"
+#line 3654 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3661: \"$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
@@ -3661,7 +3688,7 @@ fi
 libbsd=no
 if test "`uname -s`" = "AIX" ; then
     echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:3665: checking for gettimeofday in -lbsd" >&5
+echo "configure:3692: 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
@@ -3669,7 +3696,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3673 "configure"
+#line 3700 "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
@@ -3680,7 +3707,7 @@ int main() {
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3711: \"$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
@@ -3711,9 +3738,9 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
-echo "configure:3715: checking stdlib.h" >&5
+echo "configure:3742: checking stdlib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3717 "configure"
+#line 3744 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3728,7 +3755,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 3732 "configure"
+#line 3759 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3742,7 +3769,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 3746 "configure"
+#line 3773 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3774,16 +3801,16 @@ echo "$ac_t""$tk_ok" 1>&6
 #--------------------------------------------------------------------
 
 echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
-echo "configure:3778: checking fd_set and sys/select" >&5
+echo "configure:3805: checking fd_set and sys/select" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3780 "configure"
+#line 3807 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 fd_set readMask, writeMask;
 ; return 0; }
 EOF
-if { (eval echo configure:3787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tk_ok=yes
 else
@@ -3795,7 +3822,7 @@ fi
 rm -f conftest*
 if test $tk_ok = no; then
     cat > conftest.$ac_ext <<EOF
-#line 3799 "configure"
+#line 3826 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
@@ -3827,12 +3854,12 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3831: checking for ANSI C header files" >&5
+echo "configure:3858: 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 3836 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3840,7 +3867,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3871: \"$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*
@@ -3857,7 +3884,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 3861 "configure"
+#line 3888 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3875,7 +3902,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 3879 "configure"
+#line 3906 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3896,7 +3923,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3900 "configure"
+#line 3927 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3907,7 +3934,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3931,12 +3958,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3935: checking for mode_t" >&5
+echo "configure:3962: 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 3940 "configure"
+#line 3967 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3964,12 +3991,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3968: checking for pid_t" >&5
+echo "configure:3995: 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 3973 "configure"
+#line 4000 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3997,12 +4024,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4001: checking for size_t" >&5
+echo "configure:4028: 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 4006 "configure"
+#line 4033 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4030,12 +4057,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4034: checking for uid_t in sys/types.h" >&5
+echo "configure:4061: 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 4039 "configure"
+#line 4066 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4072,17 +4099,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:4076: checking for $ac_hdr" >&5
+echo "configure:4103: 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 4081 "configure"
+#line 4108 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4113: \"$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*
@@ -4109,12 +4136,12 @@ fi
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4113: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4140: 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 4118 "configure"
+#line 4145 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4123,7 +4150,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4149,16 +4176,16 @@ fi
 #-------------------------------------------
 
 echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
-echo "configure:4153: checking pw_gecos in struct pwd" >&5
+echo "configure:4180: checking pw_gecos in struct pwd" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4155 "configure"
+#line 4182 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 struct passwd pwd; pwd.pw_gecos;
 ; return 0; }
 EOF
-if { (eval echo configure:4162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   tk_ok=yes
 else
@@ -4191,7 +4218,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:4195: checking for X" >&5
+echo "configure:4222: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4253,12 +4280,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4257 "configure"
+#line 4284 "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:4262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4289: \"$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*
@@ -4327,14 +4354,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 4331 "configure"
+#line 4358 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4365: \"$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.
@@ -4424,12 +4451,12 @@ fi
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
 	    cat > conftest.$ac_ext <<EOF
-#line 4428 "configure"
+#line 4455 "configure"
 #include "confdefs.h"
 #include <X11/XIntrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4460: \"$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
   :
@@ -4449,15 +4476,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:4453: checking for X11 header files" >&5
+echo "configure:4480: checking for X11 header files" >&5
 	found_xincludes="no"
 	cat > conftest.$ac_ext <<EOF
-#line 4456 "configure"
+#line 4483 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4488: \"$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*
@@ -4493,7 +4520,7 @@ rm -f conftest*
 
     if test "$no_x" = yes; then
 	echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
-echo "configure:4497: checking for X11 libraries" >&5
+echo "configure:4524: 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
@@ -4513,7 +4540,7 @@ echo "configure:4497: 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:4517: checking for XCreateWindow in -lXwindow" >&5
+echo "configure:4544: 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
@@ -4521,7 +4548,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXwindow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4525 "configure"
+#line 4552 "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
@@ -4532,7 +4559,7 @@ int main() {
 XCreateWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4563: \"$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
@@ -4606,7 +4633,7 @@ eval "LD_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\""
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:4610: checking for main in -lXbsd" >&5
+echo "configure:4637: 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
@@ -4614,14 +4641,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4618 "configure"
+#line 4645 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4652: \"$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
@@ -4644,12 +4671,12 @@ fi
 
 tk_checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4648: checking for connect" >&5
+echo "configure:4675: 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 4653 "configure"
+#line 4680 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4672,7 +4699,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4703: \"$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
@@ -4694,7 +4721,7 @@ fi
 
 if test "$tk_checkSocket" = 1; then
     echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:4698: checking for main in -lsocket" >&5
+echo "configure:4725: 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
@@ -4702,14 +4729,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4706 "configure"
+#line 4733 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4740: \"$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
@@ -4735,12 +4762,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:4739: checking for accept" >&5
+echo "configure:4766: 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 4744 "configure"
+#line 4771 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -4763,7 +4790,7 @@ accept();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4794: \"$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
@@ -4785,12 +4812,12 @@ fi
 
 fi
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4789: checking for gethostbyname" >&5
+echo "configure:4816: 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 4794 "configure"
+#line 4821 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4813,7 +4840,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4844: \"$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
@@ -4831,7 +4858,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:4835: checking for main in -lnsl" >&5
+echo "configure:4862: 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
@@ -4839,14 +4866,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4843 "configure"
+#line 4870 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4877: \"$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
@@ -4882,13 +4909,13 @@ fi
 
 if test -d /usr/include/mit ; then
     echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
-echo "configure:4886: checking MIT X libraries" >&5
+echo "configure:4913: 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 4892 "configure"
+#line 4919 "configure"
 #include "confdefs.h"
 
 	#include <X11/Xlib.h>
@@ -4899,7 +4926,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 	echo "$ac_t""yes" 1>&6
@@ -4923,14 +4950,14 @@ fi
 #--------------------------------------------------------------------
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:4927: checking whether char is unsigned" >&5
+echo "configure:4954: 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 4934 "configure"
+#line 4961 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -4952,7 +4979,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 4956 "configure"
+#line 4983 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -4962,7 +4989,7 @@ main() {
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:4966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4993: \"$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
@@ -4995,12 +5022,12 @@ fi
 
 
     echo $ac_n "checking for strtod""... $ac_c" 1>&6
-echo "configure:4999: checking for strtod" >&5
+echo "configure:5026: 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 5004 "configure"
+#line 5031 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strtod(); below.  */
@@ -5023,7 +5050,7 @@ strtod();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5054: \"$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
@@ -5045,7 +5072,7 @@ fi
 
     if test "$tcl_strtod" = 1; then
 	echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
-echo "configure:5049: checking for Solaris2.4/Tru64 strtod bugs" >&5
+echo "configure:5076: checking for Solaris2.4/Tru64 strtod bugs" >&5
 	if eval "test \"`echo '$''{'tcl_cv_strtod_buggy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5054,7 +5081,7 @@ else
   tcl_cv_strtod_buggy=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 5085 "configure"
 #include "confdefs.h"
 
 		extern double strtod();
@@ -5077,7 +5104,7 @@ else
 		    exit(0);
 		}
 EOF
-if { (eval echo configure:5081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   tcl_cv_strtod_buggy=1
 else
@@ -5361,7 +5388,7 @@ s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
 s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g
 s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g
 s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g
-s%@MKLINKS_FLAGS@%$MKLINKS_FLAGS%g
+s%@MAN_FLAGS@%$MAN_FLAGS%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@TCL_THREADS@%$TCL_THREADS%g
diff --git a/unix/configure.in b/unix/configure.in
index 860b1fa..2ef6518 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.83.2.11 2004/10/28 16:49:45 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.83.2.12 2004/11/18 02:09:00 rmax Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.13)
@@ -47,7 +47,7 @@ TK_SRC_DIR=`cd $srcdir/..; pwd`
 #------------------------------------------------------------------------
 # Compress and/or soft link the manpages?
 #------------------------------------------------------------------------
-SC_CONFIG_MANPAGES
+SC_CONFIG_MANPAGES([tk])
 
 #------------------------------------------------------------------------
 # Standard compiler checks
diff --git a/unix/installManPage b/unix/installManPage
new file mode 100755
index 0000000..16cf005
--- /dev/null
+++ b/unix/installManPage
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+ZIP=:
+while true; do
+    case $1 in
+        -s | --symlinks  )      S="-s ";;
+        -z | --compress  )    ZIP=$2;  shift ;;
+	-e | --extension )      Z=$2;  shift ;;
+	-s | --suffix    ) SUFFIX=$2;  shift ;;
+	*)  break ;;
+    esac
+    shift
+done
+if test "$#" != 2; then
+    echo "Usage: installManPages <options> file dir"
+    exit 1
+fi
+
+MANPAGE=$1
+DIR=$2
+test -z "$S" && S="$DIR/"
+
+# Backslashes are trippled in the sed script, because it is in backticks
+# which don't pass backslashes literally.
+NAMES=`sed -n '
+    /^\\.SH NAME/{    # Look for a line, that starts with .SH NAME
+	s/^.*$//      # Delete the content of this line from the buffer
+	n             # Read next line
+	s/,\|\\\ //g  # Remove all commas
+	s/ \\\-.*//   # Delete from \- to the end of line
+	p             # print the result
+	q
+    }' $MANPAGE`
+
+SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'`
+SRCDIR=`dirname $MANPAGE`
+FIRST=""
+for f in $NAMES; do
+    f=$f.$SECTION$SUFFIX
+    if test -z "$FIRST" ; then
+	FIRST=$f
+	rm -f $DIR/$FIRST $DIR/$FIRST.*
+	sed -e "/man\.macros/r $SRCDIR/man.macros" -e "/man\.macros/d" \
+	    $MANPAGE > $DIR/$FIRST
+	chmod 444 $DIR/$FIRST
+	$ZIP $DIR/$FIRST
+    else
+	rm -f $DIR/$f $DIR/$f.*
+	ln $S$FIRST$Z $DIR/$f$Z
+    fi
+done
diff --git a/unix/mkLinks b/unix/mkLinks
deleted file mode 100644
index 2caca62..0000000
--- a/unix/mkLinks
+++ /dev/null
@@ -1,1183 +0,0 @@
-#!/bin/sh
-# This script is invoked when installing manual entries.  It generates
-# additional links to manual entries, corresponding to the procedure
-# and command names described by the manual entry.  For example, the
-# Tcl manual entry Hash.3 describes procedures Tcl_InitHashTable,
-# Tcl_CreateHashEntry, and many more.  This script will make hard
-# links so that Tcl_InitHashTable.3, Tcl_CreateHashEntry.3, and so
-# on all refer to Hash.3 in the installed directory.
-#
-# Because of the length of command and procedure names, this mechanism
-# only works on machines that support file names longer than 14 characters.
-# This script checks to see if long file names are supported, and it
-# doesn't make any links if they are not.
-#
-# 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 <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*`
-echo foo > xyzzyTestingaverylongfilename.foo
-y=`echo xyzzyTestingav*`
-rm xyzzyTe*
-if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
-    exit
-fi
-if test "$y" != "xyzzyTestingaverylongfilename.foo"; then
-    CASEINSENSITIVEFS=1
-fi
-
-if test -r 3DBorder.3; then
-    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 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 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 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 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 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 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 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 ConfigWidg.3.*
-    $ZIP ConfigWidg.3
-    rm -f Tk_ConfigureWidget.3 Tk_ConfigureWidget.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_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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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.* 
-    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 
-fi
-if test -r GetCapStyl.3; then
-    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 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 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 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 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 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 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 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 GetHWND.3.*
-    $ZIP GetHWND.3
-    rm -f Tk_GetHWND.3 Tk_GetHWND.3.* 
-    rm -f Tk_AttachHWND.3 Tk_AttachHWND.3.* 
-    ln $S GetHWND.3$Z Tk_GetHWND.3$Z 
-    ln $S GetHWND.3$Z Tk_AttachHWND.3$Z 
-fi
-if test -r GetImage.3; then
-    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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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_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 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 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 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 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 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 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 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 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 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 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 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 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 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 8b125b0..a1bdc5b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -601,8 +601,12 @@ 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.
+#	Decide whether to use symlinks for linking the manpages,
+#	whether to compress the manpages after installation, and
+#	whether to add a package name suffix to the installed
+#	manpages to avoidfile name clashes.
+#	If compression is enabled also find out what file name suffix
+#	the given compression program is using.
 #
 # Arguments:
 #	none
@@ -612,11 +616,12 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [
 #	Adds the following arguments to configure:
 #		--enable-man-symlinks
 #		--enable-man-compression=PROG
+#		--enable-man-suffix[=STRING]
 #
 #	Defines the following variable:
 #
-#	MKLINKS_FLAGS -		The apropriate flags for mkLinks
-#				according to the user's selection.
+#	MAN_FLAGS -	The apropriate flags for installManPage
+#			according to the user's selection.
 #
 #--------------------------------------------------------------------
 AC_DEFUN(SC_CONFIG_MANPAGES, [
@@ -624,20 +629,39 @@ 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",
+		test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks",
 		enableval="no")
 	AC_MSG_RESULT([$enableval])
 
-	AC_MSG_CHECKING([compression for manpages])
+	AC_MSG_CHECKING([whether to compress the 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",
+		test "$enableval" = "yes" && AC_MSG_ERROR([missing argument to --enable-man-compression])
+		test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --compress $enableval",
+		enableval="no")
+	AC_MSG_RESULT([$enableval])
+	if test "$enableval" != "no"; then
+		AC_MSG_CHECKING([for compressed file suffix])
+		touch TeST
+		$enableval TeST
+		Z=`ls TeST* | sed 's/^....//'`
+		rm -f TeST*
+		MAN_FLAGS="$MAN_FLAGS --extension $Z"
+		AC_MSG_RESULT([$Z])
+	fi
+
+	AC_MSG_CHECKING([whether to add a package name suffix for the manpages])
+	AC_ARG_ENABLE(man-suffix,
+		[  --enable-man-suffix=STRING
+                          use STRING as a suffix to manpage file names
+                          (default: $1)],
+		test "$enableval" = "yes" && enableval="$1"
+		test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --suffix $enableval",
 		enableval="no")
 	AC_MSG_RESULT([$enableval])
 
-	AC_SUBST(MKLINKS_FLAGS)
+	AC_SUBST(MAN_FLAGS)
 ])
 
 #--------------------------------------------------------------------
author	rmax <rmax>	2004-11-18 02:08:53 (GMT)
committer	rmax <rmax>	2004-11-18 02:08:53 (GMT)
commit	48cc85d50a977b2c192eec2f39ac45d6116aa95b (patch)
tree	e80fe6443e5872769b6751f65ce83f28b6a65ce2 /unix
parent	82a529bee068d65da4c56c30e13a4f652f2c064b (diff)
download	tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.zip tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.tar.gz tk-48cc85d50a977b2c192eec2f39ac45d6116aa95b.tar.bz2