Changes 8.4.14:

  * Tk_PhotoPutBlock performance restored (JPEG image loading).
  * [namespace inscope] change reverted; harmed Itcl.
  * Made [expr {srand(.)}] accept wide integer argument.
  * Made [lappend $invalidList] raise an error.
  * Improved [text] delete performance.
  * Support for the WM_UNICHAR window message on Windows
  * Stopped excess variable writes by [scale].
  * Tcl_Main no longer blocks main loop start for one interactive command.
  * [console] made thread safe.
  * Thread-enabled configuration uses MT-safe system calls.
  * Many Aqua/Tk bug fixes and improvements, see changes file.
  * Made unthreaded notifier naked-fork-safe on Darwin.
  * Support for weak linking on Mac OS X.
  * msgcat support for CFLocale on Darwin (msgcat 1.3.4)
  * Fixed crashes due to alignment issues in encoding translation routines.
  * Fixed crash with [listbox -listvariable] on namespace variable.
  * Fixed crash when Tcl_DeleteTrace changes proc on the active stack.
  * Fixed crash when normalizing filesystem pathnames.
  * Fixed crash due to invalid font name from XServer.
  * Several 64-bit bugs fixed and platform support enhanced.

7 files changed, 57 insertions, 56 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index d70dee857e7..52ddb1acfc2 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/27 08:18:09 adam Exp $
+# $NetBSD: Makefile,v 1.57 2006/11/02 17:42:03 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
@@ -37,12 +37,13 @@ SUBST_FILES.tk-config=	unix/tkConfig.sh
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 
+INSTALLATION_DIRS+=	${PREFIX}/include/tk
+INSTALLATION_DIRS+=	${PREFIX}/include/tk/generic
+INSTALLATION_DIRS+=	${PREFIX}/include/tk/unix
+
 post-install:
-	${RM} -f ${PREFIX}/bin/wish
-	${LN} -s wish8.4 ${PREFIX}/bin/wish
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
+	rm -f ${PREFIX}/bin/wish
+	ln -s wish8.4 ${PREFIX}/bin/wish
 	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${PREFIX}/include/tk/generic
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index bd5f7aa6613..3c711ed1065 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.4 2006/04/27 08:18:09 adam Exp $
+# $NetBSD: Makefile.version,v 1.5 2006/11/02 17:42:03 adam Exp $
 
-TK_VERSION=	8.4.13
+TK_VERSION=	8.4.14
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index b0cf69347c4..c718ce07d7f 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2006/04/27 08:18:09 adam Exp $
+$NetBSD: distinfo,v 1.29 2006/11/02 17:42:03 adam Exp $
 
-SHA1 (tk8.4.13-src.tar.gz) = 64d8b3e9e4a9d6408892cb5cb287b5502e56e381
-RMD160 (tk8.4.13-src.tar.gz) = a64f3672dd64024df8eb4fc8d54de23a4a764199
-Size (tk8.4.13-src.tar.gz) = 3253070 bytes
-SHA1 (patch-aa) = cdb66101f4b87cb2c967f2777f8e7af9c82079cd
-SHA1 (patch-ab) = 161b15fc8743ca638befe0854b5866e0b4e3dfd0
-SHA1 (patch-ac) = 5a51c371dc819908eb20dae9ececd2bee3ed52ec
-SHA1 (patch-ad) = 811bd167aed3bab7e97aa2efcf7e3f24483230a0
+SHA1 (tk8.4.14-src.tar.gz) = d3a8d1240fe37408a3d39613cb1d845764b7a5b1
+RMD160 (tk8.4.14-src.tar.gz) = 055ea75b91fe0e33ac9d96bd3b9099622008820e
+Size (tk8.4.14-src.tar.gz) = 3268223 bytes
+SHA1 (patch-aa) = 8425d47efc6feab4a19a79b7d857b9da8042aedf
+SHA1 (patch-ab) = 034f05b45dd9ec824c59fbd9182c8a0476d52523
+SHA1 (patch-ac) = 814e990db42a3a4b8dfb86c91d7c00e970372e48
+SHA1 (patch-ad) = a5881628ec98095e5d95429a6de324a681a14535
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index b8592a654f2..36f927a8a87 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
+$NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $
 
---- unix/Makefile.in.orig	2005-12-06 03:42:37.000000000 +0100
+--- unix/Makefile.in.orig	2006-10-19 19:27:34.000000000 +0200
 +++ unix/Makefile.in
-@@ -93,7 +93,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
+@@ -94,7 +94,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
-@@ -209,8 +209,8 @@ TCL_EXE			= @TCLSH_PROG@
+@@ -210,8 +210,8 @@ TCL_EXE			= @TCLSH_PROG@
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY   = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -233,6 +233,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+@@ -234,6 +234,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
  #TK_STUB_LIB_FLAG	= -ltkstub
  
  TK_LIB_FILE		= @TK_LIB_FILE@
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  #TK_LIB_FILE		= libtk.a
  
  # Generic lib name used in rules that apply to tcl and tk
-@@ -262,7 +263,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+@@ -263,7 +264,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
  # these definitions by hand.
  
  STLIB_LD		= @STLIB_LD@
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
  
-@@ -309,7 +310,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
+@@ -310,7 +311,8 @@ XLIB_DIR		= $(TOP_DIR)/xlib
  # should be compressed and linked with softlinks
  MAN_FLAGS               = @MAN_FLAGS@
  
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -480,7 +482,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+@@ -481,7 +483,7 @@ DEMOPROGS = browse hello ixset rmt rolod
  
  all: binaries libraries doc
  
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  
  libraries:
  
-@@ -492,7 +494,7 @@ doc: $(TOP_DIR)/doc/man.macros
+@@ -493,7 +495,7 @@ doc: $(TOP_DIR)/doc/man.macros
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tk.
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  	rm -f $@
  	@MAKE_LIB@
  
-@@ -521,8 +523,8 @@ tkLibObjs:
+@@ -522,8 +524,8 @@ tkLibObjs:
  objs: ${OBJS}
  
  
@@ -78,7 +78,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
  
  # Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -535,7 +537,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -536,7 +538,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
  	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
  
  tktest-real:
@@ -87,7 +87,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
  
  # FIXME: This xttest rule seems to be broken in a number of ways.
-@@ -543,7 +545,7 @@ tktest-real:
+@@ -544,7 +546,7 @@ tktest-real:
  # lib location logic from tktest, and it is not clear where this
  # test.o object file comes from.
  xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.17 2006/01/16 14:48:34 adam Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
-@@ -613,7 +615,7 @@ install-strip:
+@@ -614,7 +616,7 @@ install-strip:
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index dfa1fa8f654..de6c22a7c9e 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
+$NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
 
---- unix/configure.orig	2006-04-19 14:29:37.000000000 +0200
+--- unix/configure.orig	2006-10-19 19:27:34.000000000 +0200
 +++ unix/configure
-@@ -2054,12 +2054,13 @@ fi
+@@ -2055,12 +2055,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2746,7 +2747,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2747,7 +2748,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  		SHLIB_LD_LIBS='${LIBS}'
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2781,6 +2781,9 @@ rm -f conftest*
+@@ -2782,6 +2782,9 @@ rm -f conftest*
  fi
  
  echo "$ac_t""$tcl_cv_ld_elf" 1>&6
@@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -2878,12 +2881,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
+@@ -2879,12 +2882,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
  	    LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3837,7 +3841,7 @@ fi
+@@ -3635,7 +3639,7 @@ fi
  		    ;;
  		IRIX*)
  		    ;;
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  		    ;;
  		Darwin-*)
  		    ;;
-@@ -3855,16 +3859,16 @@ fi
+@@ -3653,16 +3657,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -5405,7 +5409,11 @@ echo "configure:5403: checking for X11 l
+@@ -5213,7 +5217,11 @@ echo "configure:5211: checking for X11 l
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		echo "$ac_t""$i" 1>&6
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -5414,7 +5422,11 @@ echo "configure:5403: checking for X11 l
+@@ -5222,7 +5230,11 @@ echo "configure:5211: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -106,7 +106,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -5486,6 +5498,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5294,6 +5306,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -6019,11 +6035,18 @@ else
+@@ -5827,11 +5843,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index e92b1d6a00f..a2cf63a30be 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
+$NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
 
---- unix/tcl.m4.orig	2006-04-19 14:29:38.000000000 +0200
+--- unix/tcl.m4.orig	2006-10-19 19:27:34.000000000 +0200
 +++ unix/tcl.m4
-@@ -1032,6 +1032,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1279,6 +1280,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1280,6 +1281,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1304,6 +1308,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1305,6 +1309,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1327,6 +1334,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1328,6 +1335,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1372,6 +1382,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1373,6 +1383,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1431,23 +1444,27 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1432,23 +1445,27 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -1867,6 +1884,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1881,6 +1898,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -2045,8 +2065,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -2059,8 +2079,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -2076,10 +2096,10 @@ dnl        esac
+@@ -2090,10 +2110,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index b56ac2b5b64..67bd8d6a3b2 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2006/04/27 08:18:09 adam Exp $
+$NetBSD: patch-ad,v 1.10 2006/11/02 17:42:03 adam Exp $
 
---- unix/configure.in.orig	2006-04-19 14:29:37.000000000 +0200
+--- unix/configure.in.orig	2006-10-19 19:27:34.000000000 +0200
 +++ unix/configure.in
-@@ -296,6 +296,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -302,6 +302,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.9 2006/04/27 08:18:09 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -470,11 +474,18 @@ else
+@@ -476,11 +480,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"