Update patch with diffs for a regenerated "configure". This restores the

Solaris fixes which got lost in the recent update.

2 files changed, 843 insertions, 72 deletions

diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index a89ef26653e..11d5a4cc37a 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2001/12/23 17:11:30 bjoern Exp $
+$NetBSD: distinfo,v 1.9 2002/01/05 23:47:19 tron Exp $
 
 SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
 Size (tk8.3.4.tar.gz) = 2589635 bytes
 SHA1 (patch-aa) = 49fe346ebad9b4ded0f0c64727cea3cf22655678
-SHA1 (patch-ab) = 0cc0a977f7f3cc468e17bdc35893514667f529b5
+SHA1 (patch-ab) = d0fafeaa5a63eb4a21589394cd223cbcedf40e4e
 SHA1 (patch-ac) = 172762efa65eb05345d70cf38893bc96b56a2481
 SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 2eac789ccaa..fec3458429e 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,774 @@
-$NetBSD: patch-ab,v 1.9 2001/12/23 17:11:30 bjoern Exp $
+$NetBSD: patch-ab,v 1.10 2002/01/05 23:47:19 tron Exp $
 
 --- configure.orig	Sat Oct 20 02:24:40 2001
-+++ configure
-@@ -3916,6 +3916,10 @@
++++ configure	Sun Jan  6 00:38:35 2002
+@@ -1746,6 +1746,7 @@
+ 
+     do64bit_ok=no
+     fullSrcDir=`cd $srcdir; pwd`
++    RPATH_FLAG=""
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+@@ -1765,7 +1766,7 @@
+     # 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:1769: checking for $ac_word" >&5
++echo "configure:1770: 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
+@@ -1870,7 +1871,7 @@
+ 	    # known GMT value.
+ 
+ 	    echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
+-echo "configure:1874: checking for gettimeofday in -lbsd" >&5
++echo "configure:1875: 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
+@@ -1878,7 +1879,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1882 "configure"
++#line 1883 "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
+@@ -1889,7 +1890,7 @@
+ gettimeofday()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1894: \"$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
+@@ -1951,7 +1952,7 @@
+ 	HP-UX-*.11.*)
+ 	    SHLIB_SUFFIX=".sl"
+ 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:1955: checking for shl_load in -ldld" >&5
++echo "configure:1956: 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
+@@ -1959,7 +1960,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1963 "configure"
++#line 1964 "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
+@@ -1970,7 +1971,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1975: \"$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
+@@ -2013,7 +2014,7 @@
+ 	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:2017: checking for shl_load in -ldld" >&5
++echo "configure:2018: 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
+@@ -2021,7 +2022,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2025 "configure"
++#line 2026 "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
+@@ -2032,7 +2033,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2037: \"$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
+@@ -2139,17 +2140,17 @@
+ 	    else
+ 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:2143: checking for dld.h" >&5
++echo "configure:2144: 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 2148 "configure"
++#line 2149 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2154: \"$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*
+@@ -2206,17 +2207,17 @@
+ 	    else
+ 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:2210: checking for dld.h" >&5
++echo "configure:2211: 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 2215 "configure"
++#line 2216 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2221: \"$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*
+@@ -2271,17 +2272,17 @@
+ 	    # 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:2275: checking for dlfcn.h" >&5
++echo "configure:2276: 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 2280 "configure"
++#line 2281 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2286: \"$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*
+@@ -2300,7 +2301,6 @@
+   
+ 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
+ 		SHLIB_CFLAGS="-fPIC"
+-		SHLIB_LD="ld -Bshareable -x"
+ 		SHLIB_LD_LIBS=""
+ 		SHLIB_SUFFIX=".so"
+ 		DL_OBJS="tclLoadDl.o"
+@@ -2321,13 +2321,23 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   rm -rf conftest*
+-  echo "$ac_t""yes" 1>&6
++  
++		    echo "$ac_t""yes" 1>&6
++		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
++		    RPATH_FLAG='-Wl,-R'
++		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++		
+ else
+   rm -rf conftest*
+-  echo "$ac_t""no" 1>&6
++  
++		    echo "$ac_t""no" 1>&6
++		    SHLIB_LD="ld -Bshareable -x"
++		    RPATH_FLAG='-R'
++		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ 		
++		
+ fi
+ rm -f conftest*
+ 
+@@ -2539,6 +2549,9 @@
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS=""
+ 	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	SunOS-5*)
+ 
+@@ -2586,6 +2599,9 @@
+ 	    else
+ 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+ 	    fi
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	ULTRIX-4.*)
+ 	    SHLIB_CFLAGS="-G 0"
+@@ -2611,10 +2627,10 @@
+ 	    # 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:2615: checking for ld accepts -Bexport flag" >&5
++echo "configure:2631: checking for ld accepts -Bexport flag" >&5
+ 	    LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 2618 "configure"
++#line 2634 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2621,7 +2637,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   found=yes
+ else
+@@ -2667,9 +2683,9 @@
+ 
+     if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
+ 	echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
+-echo "configure:2671: checking sys/exec.h" >&5
++echo "configure:2687: checking sys/exec.h" >&5
+ 	cat > conftest.$ac_ext <<EOF
+-#line 2673 "configure"
++#line 2689 "configure"
+ #include "confdefs.h"
+ #include <sys/exec.h>
+ int main() {
+@@ -2687,7 +2703,7 @@
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2705,9 +2721,9 @@
+ 
+ 	else
+ 	    echo $ac_n "checking a.out.h""... $ac_c" 1>&6
+-echo "configure:2709: checking a.out.h" >&5
++echo "configure:2725: checking a.out.h" >&5
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 2711 "configure"
++#line 2727 "configure"
+ #include "confdefs.h"
+ #include <a.out.h>
+ int main() {
+@@ -2725,7 +2741,7 @@
+ 	    
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2743,9 +2759,9 @@
+ 
+ 	    else
+ 		echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
+-echo "configure:2747: checking sys/exec_aout.h" >&5
++echo "configure:2763: checking sys/exec_aout.h" >&5
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2749 "configure"
++#line 2765 "configure"
+ #include "confdefs.h"
+ #include <sys/exec_aout.h>
+ int main() {
+@@ -2763,7 +2779,7 @@
+ 		
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tcl_ok=usable
+ else
+@@ -2860,7 +2876,7 @@
+ 
+ 
+     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
+-echo "configure:2864: checking for build with symbols" >&5
++echo "configure:2880: 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"
+@@ -2904,12 +2920,12 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for sin""... $ac_c" 1>&6
+-echo "configure:2908: checking for sin" >&5
++echo "configure:2924: 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 2913 "configure"
++#line 2929 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char sin(); below.  */
+@@ -2932,7 +2948,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2952: \"$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
+@@ -2953,7 +2969,7 @@
+ fi
+ 
+ echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:2957: checking for main in -lieee" >&5
++echo "configure:2973: 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
+@@ -2961,7 +2977,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2965 "configure"
++#line 2981 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2968,7 +2984,7 @@
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2988: \"$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
+@@ -2999,7 +3015,7 @@
+ libbsd=no
+ if test "`uname -s`" = "AIX" ; then
+     echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
+-echo "configure:3003: checking for gettimeofday in -lbsd" >&5
++echo "configure:3019: 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
+@@ -3007,7 +3023,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3011 "configure"
++#line 3027 "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
+@@ -3018,7 +3034,7 @@
+ gettimeofday()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3038: \"$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
+@@ -3049,9 +3065,9 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
+-echo "configure:3053: checking stdlib.h" >&5
++echo "configure:3069: checking stdlib.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3055 "configure"
++#line 3071 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3066,7 +3082,7 @@
+ rm -f conftest*
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3070 "configure"
++#line 3086 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3080,7 +3096,7 @@
+ rm -f conftest*
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3084 "configure"
++#line 3100 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3112,9 +3128,9 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
+-echo "configure:3116: checking fd_set and sys/select" >&5
++echo "configure:3132: checking fd_set and sys/select" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3118 "configure"
++#line 3134 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+@@ -3121,7 +3137,7 @@
+ fd_set readMask, writeMask;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tk_ok=yes
+ else
+@@ -3133,7 +3149,7 @@
+ rm -f conftest*
+ if test $tk_ok = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 3137 "configure"
++#line 3153 "configure"
+ #include "confdefs.h"
+ #include <sys/select.h>
+ EOF
+@@ -3165,12 +3181,12 @@
+ #--------------------------------------------------------------------
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3169: checking for ANSI C header files" >&5
++echo "configure:3185: 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 3174 "configure"
++#line 3190 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3178,7 +3194,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3198: \"$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*
+@@ -3195,7 +3211,7 @@
+ 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 3199 "configure"
++#line 3215 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -3213,7 +3229,7 @@
+ 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 3217 "configure"
++#line 3233 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3234,7 +3250,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3238 "configure"
++#line 3254 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3245,7 +3261,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3269,12 +3285,12 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:3273: checking for mode_t" >&5
++echo "configure:3289: 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 3278 "configure"
++#line 3294 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3302,12 +3318,12 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:3306: checking for pid_t" >&5
++echo "configure:3322: 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 3311 "configure"
++#line 3327 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3335,12 +3351,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3339: checking for size_t" >&5
++echo "configure:3355: 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 3344 "configure"
++#line 3360 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3368,12 +3384,12 @@
+ fi
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:3372: checking for uid_t in sys/types.h" >&5
++echo "configure:3388: 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 3377 "configure"
++#line 3393 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -3410,17 +3426,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3414: checking for $ac_hdr" >&5
++echo "configure:3430: 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 3419 "configure"
++#line 3435 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3440: \"$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*
+@@ -3447,12 +3463,12 @@
+ done
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:3451: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:3467: 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 3456 "configure"
++#line 3472 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -3461,7 +3477,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -3487,9 +3503,9 @@
+ #-------------------------------------------
+ 
+ echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
+-echo "configure:3491: checking pw_gecos in struct pwd" >&5
++echo "configure:3507: checking pw_gecos in struct pwd" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3493 "configure"
++#line 3509 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ int main() {
+@@ -3496,7 +3512,7 @@
+ struct passwd pwd; pwd.pw_gecos;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   tk_ok=yes
+ else
+@@ -3529,7 +3545,7 @@
+ # 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:3533: checking for X" >&5
++echo "configure:3549: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -3591,12 +3607,12 @@
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 3595 "configure"
++#line 3611 "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:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3616: \"$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*
+@@ -3665,7 +3681,7 @@
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3669 "configure"
++#line 3685 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3672,7 +3688,7 @@
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3692: \"$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.
+@@ -3762,12 +3778,12 @@
+     if test "$no_x" = ""; then
+ 	if test "$x_includes" = ""; then
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 3766 "configure"
++#line 3782 "configure"
+ #include "confdefs.h"
+ #include <X11/XIntrinsic.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3787: \"$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
+   :
+@@ -3787,15 +3803,15 @@
+     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:3791: checking for X11 header files" >&5
++echo "configure:3807: checking for X11 header files" >&5
+ 	XINCLUDES="# no special path needed"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 3794 "configure"
++#line 3810 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3815: \"$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
+   :
+@@ -3831,13 +3847,17 @@
+ 
+     if test "$no_x" = yes; then
+ 	echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
+-echo "configure:3835: checking for X11 libraries" >&5
++echo "configure:3851: 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
+ 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
+ 		echo "$ac_t""$i" 1>&6
+-		XLIBSW="-L$i -lX11"
++		if test "${RPATH_FLAG}" != ""; then
++		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
++		else
++		    XLIBSW="-L$i -lX11"
++		fi
+ 		x_libraries="$i"
+ 		break
+ 	    fi
+@@ -3846,12 +3866,16 @@
+ 	if test "$x_libraries" = ""; then
+ 	    XLIBSW=-lX11
+ 	else
+-	    XLIBSW="-L$x_libraries -lX11"
++	    if test "${RPATH_FLAG}" != ""; then
++		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
++	    else
++		XLIBSW="-L$x_libraries -lX11"
++	    fi
+ 	fi
+     fi
+     if test "$XLIBSW" = nope ; then
+ 	echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6
+-echo "configure:3855: checking for XCreateWindow in -lXwindow" >&5
++echo "configure:3879: 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
+@@ -3859,7 +3883,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXwindow  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3863 "configure"
++#line 3887 "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
+@@ -3870,7 +3894,7 @@
+ XCreateWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3898: \"$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
+@@ -3916,6 +3940,10 @@
  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,333 +779,338 @@ $NetBSD: patch-ab,v 1.9 2001/12/23 17:11:30 bjoern Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -3955,7 +3959,7 @@
+@@ -3955,7 +3983,7 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
 -echo "configure:3959: checking for main in -lXbsd" >&5
-+echo "configure:3963: checking for main in -lXbsd" >&5
++echo "configure:3987: 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
-@@ -3963,14 +3967,14 @@
+@@ -3963,7 +3991,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 3967 "configure"
-+#line 3971 "configure"
++#line 3995 "configure"
  #include "confdefs.h"
  
  int main() {
+@@ -3970,7 +3998,7 @@
  main()
  ; return 0; }
  EOF
 -if { (eval echo configure:3974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4002: \"$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
-@@ -3993,12 +3997,12 @@
+@@ -3993,12 +4021,12 @@
  
  tk_checkBoth=0
  echo $ac_n "checking for connect""... $ac_c" 1>&6
 -echo "configure:3997: checking for connect" >&5
-+echo "configure:4001: checking for connect" >&5
++echo "configure:4025: 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 4002 "configure"
-+#line 4006 "configure"
++#line 4030 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
-@@ -4021,7 +4025,7 @@
+@@ -4021,7 +4049,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4053: \"$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
-@@ -4043,7 +4047,7 @@
+@@ -4043,7 +4071,7 @@
  
  if test "$tk_checkSocket" = 1; then
      echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
 -echo "configure:4047: checking for main in -lsocket" >&5
-+echo "configure:4051: checking for main in -lsocket" >&5
++echo "configure:4075: 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
-@@ -4051,14 +4055,14 @@
+@@ -4051,7 +4079,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4055 "configure"
-+#line 4059 "configure"
++#line 4083 "configure"
  #include "confdefs.h"
  
  int main() {
+@@ -4058,7 +4086,7 @@
  main()
  ; return 0; }
  EOF
 -if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4090: \"$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
-@@ -4084,12 +4088,12 @@
+@@ -4084,12 +4112,12 @@
      tk_oldLibs=$LIBS
      LIBS="$LIBS -lsocket -lnsl"
      echo $ac_n "checking for accept""... $ac_c" 1>&6
 -echo "configure:4088: checking for accept" >&5
-+echo "configure:4092: checking for accept" >&5
++echo "configure:4116: 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 4093 "configure"
-+#line 4097 "configure"
++#line 4121 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
-@@ -4112,7 +4116,7 @@
+@@ -4112,7 +4140,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4144: \"$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
-@@ -4134,12 +4138,12 @@
+@@ -4134,12 +4162,12 @@
  
  fi
  echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
 -echo "configure:4138: checking for gethostbyname" >&5
-+echo "configure:4142: checking for gethostbyname" >&5
++echo "configure:4166: 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 4143 "configure"
-+#line 4147 "configure"
++#line 4171 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
-@@ -4162,7 +4166,7 @@
+@@ -4162,7 +4190,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4194: \"$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
-@@ -4180,7 +4184,7 @@
+@@ -4180,7 +4208,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
 -echo "configure:4184: checking for main in -lnsl" >&5
-+echo "configure:4188: checking for main in -lnsl" >&5
++echo "configure:4212: 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
-@@ -4188,14 +4192,14 @@
+@@ -4188,7 +4216,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4192 "configure"
-+#line 4196 "configure"
++#line 4220 "configure"
  #include "confdefs.h"
  
  int main() {
+@@ -4195,7 +4223,7 @@
  main()
  ; return 0; }
  EOF
 -if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4227: \"$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
-@@ -4235,13 +4239,13 @@
+@@ -4235,13 +4263,13 @@
  
  if test -d /usr/include/mit ; then
      echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
 -echo "configure:4239: checking MIT X libraries" >&5
-+echo "configure:4243: checking MIT X libraries" >&5
++echo "configure:4267: 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 4245 "configure"
-+#line 4249 "configure"
++#line 4273 "configure"
  #include "confdefs.h"
  
  	#include <X11/Xlib.h>
-@@ -4252,7 +4256,7 @@
+@@ -4252,7 +4280,7 @@
      
  ; return 0; }
  EOF
 -if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
  	echo "$ac_t""yes" 1>&6
-@@ -4279,12 +4283,12 @@
+@@ -4279,12 +4307,12 @@
  
  MATH_LIBS=""
  echo $ac_n "checking for sin""... $ac_c" 1>&6
 -echo "configure:4283: checking for sin" >&5
-+echo "configure:4287: checking for sin" >&5
++echo "configure:4311: 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 4288 "configure"
-+#line 4292 "configure"
++#line 4316 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char sin(); below.  */
-@@ -4307,7 +4311,7 @@
+@@ -4307,7 +4335,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4339: \"$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
-@@ -4328,7 +4332,7 @@
+@@ -4328,7 +4356,7 @@
  fi
  
  echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
 -echo "configure:4332: checking for main in -lieee" >&5
-+echo "configure:4336: checking for main in -lieee" >&5
++echo "configure:4360: 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
-@@ -4336,14 +4340,14 @@
+@@ -4336,7 +4364,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lieee  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4340 "configure"
-+#line 4344 "configure"
++#line 4368 "configure"
  #include "confdefs.h"
  
  int main() {
+@@ -4343,7 +4371,7 @@
  main()
  ; return 0; }
  EOF
 -if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4375: \"$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
-@@ -4370,14 +4374,14 @@
+@@ -4370,7 +4398,7 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
 -echo "configure:4374: checking whether char is unsigned" >&5
-+echo "configure:4378: checking whether char is unsigned" >&5
++echo "configure:4402: 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
+@@ -4377,7 +4405,7 @@
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
  cat > conftest.$ac_ext <<EOF
 -#line 4381 "configure"
-+#line 4385 "configure"
++#line 4409 "configure"
  #include "confdefs.h"
  #ifdef __CHAR_UNSIGNED__
    yes
-@@ -4399,7 +4403,7 @@
+@@ -4399,7 +4427,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 4403 "configure"
-+#line 4407 "configure"
++#line 4431 "configure"
  #include "confdefs.h"
  /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
  #if !defined(__STDC__) || __STDC__ != 1
-@@ -4409,7 +4413,7 @@
+@@ -4409,7 +4437,7 @@
    volatile char c = 255; exit(c < 0);
  }
  EOF
 -if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4441: \"$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
-@@ -4442,12 +4446,12 @@
+@@ -4442,12 +4470,12 @@
  
  
      echo $ac_n "checking for strtod""... $ac_c" 1>&6
 -echo "configure:4446: checking for strtod" >&5
-+echo "configure:4450: checking for strtod" >&5
++echo "configure:4474: 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 4451 "configure"
-+#line 4455 "configure"
++#line 4479 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtod(); below.  */
-@@ -4470,7 +4474,7 @@
+@@ -4470,7 +4498,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4502: \"$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
-@@ -4492,12 +4496,12 @@
+@@ -4492,12 +4520,12 @@
  
      if test "$tcl_strtod" = 1; then
  	echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
 -echo "configure:4496: checking for Solaris2.4/Tru64 strtod bugs" >&5
-+echo "configure:4500: checking for Solaris2.4/Tru64 strtod bugs" >&5
++echo "configure:4524: checking for Solaris2.4/Tru64 strtod bugs" >&5
  	if test "$cross_compiling" = yes; then
    tcl_ok=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 4501 "configure"
-+#line 4505 "configure"
++#line 4529 "configure"
  #include "confdefs.h"
  
  	    extern double strtod();
-@@ -4517,7 +4521,7 @@
+@@ -4517,7 +4545,7 @@
  		exit(0);
  	    }
  EOF
 -if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    tcl_ok=1
  else
-@@ -4549,7 +4553,7 @@
+@@ -4549,7 +4577,7 @@
  
  
      echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
 -echo "configure:4553: checking how to build libraries" >&5
-+echo "configure:4557: checking how to build libraries" >&5
++echo "configure:4581: 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"
-@@ -4588,7 +4592,7 @@
+@@ -4588,7 +4616,7 @@
  if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
 -    MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
-+    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0"
++    MAKE_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0"
      RANLIB=":"
  
  #    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -4611,11 +4615,17 @@
+@@ -4611,11 +4639,17 @@
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"