From 3222ec5fef0b234e4baed26750d7fc8a418266e7 Mon Sep 17 00:00:00 2001
From: marino <marino>
Date: Mon, 3 Sep 2012 11:13:29 +0000
Subject: x11/tk-Tix: Add DragonFly support (and fix FreeBSD)

DragonFly wasn't represented in the configure script.
FreeBSD wasn't defining library name correctly.
---
 x11/tk-Tix/distinfo         |   6 +-
 x11/tk-Tix/patches/patch-aa |  21 +-
 x11/tk-Tix/patches/patch-ac | 510 +++++++++++++++++++++++---------------------
 3 files changed, 287 insertions(+), 250 deletions(-)

diff --git a/x11/tk-Tix/distinfo b/x11/tk-Tix/distinfo
index be59e9ad635..cb5b23c7203 100644
--- a/x11/tk-Tix/distinfo
+++ b/x11/tk-Tix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2012/08/28 11:46:32 he Exp $
+$NetBSD: distinfo,v 1.7 2012/09/03 11:13:29 marino Exp $
 
 SHA1 (Tix8.4.3-src.tar.gz) = 285d2f19f907ebad002ee0266f56be620d44f174
 RMD160 (Tix8.4.3-src.tar.gz) = 99249c4d7a19fcb8c27f11ab1b3ef6102911409d
 Size (Tix8.4.3-src.tar.gz) = 1831503 bytes
-SHA1 (patch-aa) = 0890127972a52d5928dd907cbda683e017d7b002
-SHA1 (patch-ac) = 7d600ae1e49bc8e4ae0a6bab9bd4327edbf4c040
+SHA1 (patch-aa) = e644a415e2b090f964d63a5c4b7a31b4f728c8d0
+SHA1 (patch-ac) = 975a5580145548130fa90b070407f25b3b1e046c
 SHA1 (patch-ad) = 9da45fba9abf8c2030dee1f8692aab3b26ce54b8
 SHA1 (patch-ae) = fb92066c335536ff7acdfc2e9836c7cad9f6cd7b
diff --git a/x11/tk-Tix/patches/patch-aa b/x11/tk-Tix/patches/patch-aa
index d28a91345b8..06c9f96105d 100644
--- a/x11/tk-Tix/patches/patch-aa
+++ b/x11/tk-Tix/patches/patch-aa
@@ -1,10 +1,29 @@
-$NetBSD: patch-aa,v 1.4 2012/08/28 11:46:33 he Exp $
+$NetBSD: patch-aa,v 1.5 2012/09/03 11:13:29 marino Exp $
 
 IF AC_PATH_X fails, also look for /usr/X11R7.
 Additionally, also specify run-path to the X libraries.
+Add DragonFly support.
 
 --- tclconfig/tcl.m4.orig	2007-02-21 22:09:05.000000000 +0000
 +++ tclconfig/tcl.m4
+@@ -1592,7 +1592,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="ld -Bshareable -x"
+@@ -1610,7 +1610,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    	LDFLAGS="$LDFLAGS -pthread"
+ 	    fi
+ 	    case $system in
+-	    FreeBSD-3.*)
++	    *)
+ 	    	# FreeBSD-3 doesn't handle version numbers with dots.
+ 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
 @@ -2313,7 +2313,7 @@ AC_DEFUN([TEA_PATH_UNIX_X], [
  	found_xincludes="no"
  	AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
diff --git a/x11/tk-Tix/patches/patch-ac b/x11/tk-Tix/patches/patch-ac
index 0d7b5bdc607..320228238e5 100644
--- a/x11/tk-Tix/patches/patch-ac
+++ b/x11/tk-Tix/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.3 2012/08/28 11:46:33 he Exp $
+$NetBSD: patch-ac,v 1.4 2012/09/03 11:13:29 marino Exp $
 
 Regenerated version after touching tclconfig/tcl.m4.
 
---- configure.orig	2012-08-22 09:27:02.000000000 +0200
-+++ configure	2012-08-22 09:27:08.000000000 +0200
+--- configure.orig	2008-02-28 04:35:01.000000000 +0000
++++ configure
 @@ -1,81 +1,423 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -468,7 +468,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -83,146 +425,107 @@
+@@ -83,146 +425,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -688,7 +688,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,38 +534,25 @@
+@@ -231,38 +534,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -732,7 +732,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  # Identity of this package.
  PACKAGE_NAME='Tix'
-@@ -270,50 +560,209 @@
+@@ -270,50 +560,209 @@ PACKAGE_TARNAME='tix'
  PACKAGE_VERSION='8.4.3'
  PACKAGE_STRING='Tix 8.4.3'
  PACKAGE_BUGREPORT=''
@@ -956,7 +956,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -336,34 +785,49 @@
+@@ -336,34 +785,49 @@ x_libraries=NONE
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -1013,7 +1013,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -385,33 +849,59 @@
+@@ -385,33 +849,59 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -1091,7 +1091,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -438,6 +928,12 @@
+@@ -438,6 +928,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -1104,7 +1104,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -462,13 +958,16 @@
+@@ -462,13 +958,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -1125,7 +1125,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -533,6 +1032,16 @@
+@@ -533,6 +1032,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -1142,7 +1142,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -583,26 +1092,36 @@
+@@ -583,26 +1092,36 @@ do
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -1194,7 +1194,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
    --x)
      # Obsolete; use --with-x.
-@@ -622,27 +1141,26 @@
+@@ -622,27 +1141,26 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -1232,7 +1232,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      ;;
  
    esac
-@@ -650,31 +1168,36 @@
+@@ -650,31 +1168,36 @@ done
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1287,7 +1287,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -688,8 +1211,8 @@
+@@ -688,8 +1211,8 @@ target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
@@ -1298,7 +1298,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
    fi
-@@ -701,74 +1224,72 @@
+@@ -701,74 +1224,72 @@ test -n "$host_alias" && ac_tool_prefix=
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -1430,7 +1430,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  #
  # Report the --help message.
-@@ -791,20 +1312,17 @@
+@@ -791,20 +1312,17 @@ Configuration:
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
    -V, --version           display version information and exit
@@ -1454,7 +1454,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -814,18 +1332,25 @@
+@@ -814,18 +1332,25 @@ for instance \`--prefix=\$HOME'.
  For better control, use the options below.
  
  Fine tuning of the installation directories:
@@ -1492,7 +1492,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  _ACEOF
  
    cat <<\_ACEOF
-@@ -843,6 +1368,7 @@
+@@ -843,6 +1368,7 @@ if test -n "$ac_init_help"; then
    cat <<\_ACEOF
  
  Optional Features:
@@ -1500,7 +1500,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-threads        build with threads
-@@ -868,164 +1394,487 @@
+@@ -868,164 +1394,487 @@ Some influential environment variables:
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -2106,7 +2106,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  ## ----------- ##
-@@ -1043,7 +1892,6 @@
+@@ -1043,7 +1892,6 @@ _ACEOF
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -2114,7 +2114,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1054,13 +1902,13 @@
+@@ -1054,13 +1902,13 @@ do
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -2132,7 +2132,7 @@ Regenerated version after touching tclconfig/tcl.m4.
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1076,104 +1924,115 @@
+@@ -1076,104 +1924,115 @@ do
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -2296,7 +2296,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  # Predefined preprocessor variables.
  
-@@ -1181,112 +2040,137 @@
+@@ -1181,112 +2040,137 @@ cat >>confdefs.h <<_ACEOF
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
@@ -2483,7 +2483,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -1296,31 +2180,6 @@
+@@ -1296,31 +2180,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -2515,7 +2515,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  #--------------------------------------------------------------------
  # Call TEA_INIT as the first TEA_ macro to set up initial vars.
  # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
-@@ -1332,36 +2191,30 @@
+@@ -1332,36 +2191,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
      # are compatible with.
      TEA_VERSION="3.6"
  
@@ -2566,7 +2566,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$CYGPATH"; then
    ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test.
-@@ -1371,27 +2224,29 @@
+@@ -1371,27 +2224,29 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2604,7 +2604,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    EXEEXT=".exe"
  	    TEA_PLATFORM="windows"
  	    ;;
-@@ -1431,29 +2286,33 @@
+@@ -1431,29 +2286,33 @@ fi
  
  
  ac_aux_dir=
@@ -2649,7 +2649,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  #--------------------------------------------------------------------
-@@ -1472,15 +2331,15 @@
+@@ -1472,15 +2331,15 @@ ac_configure="$SHELL $ac_aux_dir/configu
  	# we reset no_tcl in case something fails here
  	no_tcl=true
  
@@ -2674,7 +2674,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
  
  
-@@ -1489,17 +2348,15 @@
+@@ -1489,17 +2348,15 @@ else
  		case ${with_tclconfig} in
  		    */tclConfig.sh )
  			if test -f ${with_tclconfig}; then
@@ -2695,7 +2695,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  	    fi
  
-@@ -1587,28 +2444,28 @@
+@@ -1587,28 +2444,28 @@ fi
  
  	if test x"${ac_cv_c_tclconfig}" = x ; then
  	    TCL_BIN_DIR="# no Tcl configs found"
@@ -2734,7 +2734,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      fi
  
      # eval is required to do the TCL_DBGX substitution
-@@ -1688,15 +2545,15 @@
+@@ -1688,15 +2545,15 @@ echo "${ECHO_T}could not find ${TCL_BIN_
  	# we reset no_tk in case something fails here
  	no_tk=true
  
@@ -2759,7 +2759,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
  
  
-@@ -1705,17 +2562,15 @@
+@@ -1705,17 +2562,15 @@ else
  		case ${with_tkconfig} in
  		    */tkConfig.sh )
  			if test -f ${with_tkconfig}; then
@@ -2780,7 +2780,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  	    fi
  
-@@ -1803,28 +2658,28 @@
+@@ -1803,28 +2658,28 @@ fi
  
  	if test x"${ac_cv_c_tkconfig}" = x ; then
  	    TK_BIN_DIR="# no Tk configs found"
@@ -2819,7 +2819,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      fi
  
      # eval is required to do the TK_DBGX substitution
-@@ -1875,9 +2730,7 @@
+@@ -1875,9 +2730,7 @@ echo "${ECHO_T}could not find ${TK_BIN_D
  	case ${TK_DEFS} in
  	    *MAC_OSX_TK*)
  
@@ -2830,7 +2830,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  		TEA_WINDOWINGSYSTEM="aqua"
  		;;
-@@ -1914,24 +2767,24 @@
+@@ -1914,24 +2767,24 @@ _ACEOF
      if test "${prefix}" = "NONE"; then
  	prefix_default=yes
  	if test x"${TCL_PREFIX}" != x; then
@@ -2863,7 +2863,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    exec_prefix=$prefix
  	fi
      fi
-@@ -1944,6 +2797,99 @@
+@@ -1944,6 +2797,99 @@ echo "$as_me: --exec-prefix defaulting t
  # the basic setup necessary to compile executables.
  #-----------------------------------------------------------------------
  
@@ -2963,7 +2963,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      # Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE)
      # in this macro, they need to go into TEA_SETUP_COMPILER instead.
-@@ -1962,10 +2908,10 @@
+@@ -1962,10 +2908,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2978,7 +2978,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1975,35 +2921,37 @@
+@@ -1975,35 +2921,37 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3028,7 +3028,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2013,39 +2961,50 @@
+@@ -2013,39 +2961,50 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3094,7 +3094,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2055,77 +3014,37 @@
+@@ -2055,77 +3014,37 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3186,7 +3186,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2136,18 +3055,19 @@
+@@ -2136,18 +3055,19 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3210,7 +3210,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2165,24 +3085,25 @@
+@@ -2165,24 +3085,25 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -3245,7 +3245,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2192,39 +3113,41 @@
+@@ -2192,39 +3113,41 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3300,7 +3300,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2234,66 +3157,78 @@
+@@ -2234,66 +3157,78 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3415,7 +3415,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -2305,112 +3240,108 @@
+@@ -2305,112 +3240,108 @@ main ()
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -3605,7 +3605,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -2418,38 +3349,90 @@
+@@ -2418,38 +3349,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -3717,7 +3717,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -2461,45 +3444,46 @@
+@@ -2461,45 +3444,46 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -3789,7 +3789,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -2513,55 +3497,34 @@
+@@ -2513,55 +3497,34 @@ main ()
    return 0;
  }
  _ACEOF
@@ -3864,7 +3864,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -2572,39 +3535,49 @@
+@@ -2572,39 +3535,49 @@ main ()
    return 0;
  }
  _ACEOF
@@ -3942,7 +3942,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2620,18 +3593,14 @@
+@@ -2620,18 +3593,14 @@ else
      CFLAGS=
    fi
  fi
@@ -3967,7 +3967,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -2659,12 +3628,17 @@
+@@ -2659,12 +3628,17 @@ static char *f (char * (*g) (char **, in
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -3987,7 +3987,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2679,205 +3653,37 @@
+@@ -2679,205 +3653,37 @@ return f (e, argv, 0) != argv[0]  ||  f
    return 0;
  }
  _ACEOF
@@ -4212,7 +4212,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2889,15 +3695,15 @@
+@@ -2889,15 +3695,15 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4232,7 +4232,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2911,11 +3717,7 @@
+@@ -2911,11 +3717,7 @@ do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -4245,7 +4245,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -2924,78 +3726,34 @@
+@@ -2924,78 +3726,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -4333,7 +4333,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    break
  fi
  
-@@ -3007,8 +3765,8 @@
+@@ -3007,8 +3765,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -4344,7 +4344,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3018,11 +3776,7 @@
+@@ -3018,11 +3776,7 @@ do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -4357,7 +4357,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3031,85 +3785,40 @@
+@@ -3031,85 +3785,40 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -4457,7 +4457,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  fi
  
  ac_ext=c
-@@ -3119,116 +3828,40 @@
+@@ -3119,116 +3828,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -4594,7 +4594,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -3240,10 +3873,10 @@
+@@ -3240,10 +3873,10 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4609,7 +4609,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -3253,35 +3886,37 @@
+@@ -3253,35 +3886,37 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4659,7 +4659,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -3291,28 +3926,38 @@
+@@ -3291,28 +3926,38 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4708,7 +4708,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3327,31 +3972,142 @@
+@@ -3327,31 +3972,142 @@ fi
  
  
  
@@ -4870,7 +4870,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -3366,51 +4122,23 @@
+@@ -3366,51 +4122,23 @@ main ()
    return 0;
  }
  _ACEOF
@@ -4928,7 +4928,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    ac_cv_header_stdc=no
  fi
-@@ -3420,18 +4148,14 @@
+@@ -3420,18 +4148,14 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4950,7 +4950,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    ac_cv_header_stdc=no
  fi
-@@ -3441,16 +4165,13 @@
+@@ -3441,16 +4165,13 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4970,7 +4970,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3470,109 +4191,39 @@
+@@ -3470,109 +4191,39 @@ main ()
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -5097,7 +5097,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  _ACEOF
  
  fi
-@@ -3590,18 +4241,14 @@
+@@ -3590,18 +4241,14 @@ done
      #------------------------------------------------------------------------
  
      if test -z "$no_pipe" -a -n "$GCC"; then
@@ -5121,7 +5121,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -3612,40 +4259,16 @@
+@@ -3612,40 +4259,16 @@ main ()
    return 0;
  }
  _ACEOF
@@ -5167,7 +5167,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	if test $tcl_cv_cc_pipe = yes; then
  	    CFLAGS="$CFLAGS -pipe"
  	fi
-@@ -3655,235 +4278,229 @@
+@@ -3655,235 +4278,229 @@ echo "${ECHO_T}$tcl_cv_cc_pipe" >&6
      # Common compiler flag setup
      #--------------------------------------------------------------------
  
@@ -5571,7 +5571,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      if test "${TEA_PLATFORM}" = "unix" ; then
  
-@@ -3894,161 +4511,44 @@
+@@ -3894,161 +4511,44 @@ esac
      # right (and it must appear before "-lm").
      #--------------------------------------------------------------------
  
@@ -5755,7 +5755,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    MATH_LIBS="-lieee $MATH_LIBS"
  fi
  
-@@ -4058,211 +4558,45 @@
+@@ -4058,211 +4558,45 @@ fi
      # needs net/errno.h to define the socket-related error codes.
      #--------------------------------------------------------------------
  
@@ -5983,7 +5983,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  fi
  
-@@ -4287,261 +4621,55 @@
+@@ -4287,261 +4621,55 @@ fi
      #--------------------------------------------------------------------
  
      tcl_checkBoth=0
@@ -6265,7 +6265,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    LIBS="$LIBS -lsocket"
  else
    tcl_checkBoth=1
-@@ -4553,265 +4681,59 @@
+@@ -4553,265 +4681,59 @@ fi
      if test "$tcl_checkBoth" = 1; then
  	tk_oldLibs=$LIBS
  	LIBS="$LIBS -lsocket -lnsl"
@@ -6565,7 +6565,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
      # Don't perform the eval of the libraries here because DL_LIBS
-@@ -4822,17 +4744,13 @@
+@@ -4822,17 +4744,13 @@ fi
  
  
  
@@ -6588,7 +6588,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -4862,835 +4780,107 @@
+@@ -4862,835 +4780,107 @@ closedir(d);
    return 0;
  }
  _ACEOF
@@ -6695,9 +6695,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
-+    ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-+if test "x$ac_cv_header_errno_h" = xyes; then :
- 
+-
 -# Is the header present?
 -echo "$as_me:$LINENO: checking errno.h presence" >&5
 -echo $ECHO_N "checking errno.h presence... $ECHO_C" >&6
@@ -6728,10 +6726,10 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -if test -z "$ac_cpp_err"; then
 -  ac_header_preproc=yes
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  ac_header_preproc=no
 -fi
 -rm -f conftest.err conftest.$ac_ext
@@ -6779,22 +6777,21 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5
 -echo "${ECHO_T}$ac_cv_header_errno_h" >&6
-+$as_echo "#define NO_ERRNO_H 1" >>confdefs.h
- 
- fi
+-
+-fi
 -if test $ac_cv_header_errno_h = yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define NO_ERRNO_H 1
 -_ACEOF
 -
 -fi
++    ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
++if test "x$ac_cv_header_errno_h" = xyes; then :
  
-+    ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-+if test "x$ac_cv_header_float_h" = xyes; then :
- 
+-
 -    if test "${ac_cv_header_float_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for float.h" >&5
 -echo $ECHO_N "checking for float.h... $ECHO_C" >&6
@@ -6803,7 +6800,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5
 -echo "${ECHO_T}$ac_cv_header_float_h" >&6
- else
+-else
 -  # Is the header compilable?
 -echo "$as_me:$LINENO: checking float.h usability" >&5
 -echo $ECHO_N "checking float.h usability... $ECHO_C" >&6
@@ -6842,14 +6839,13 @@ Regenerated version after touching tclconfig/tcl.m4.
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -ac_header_compiler=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
-+$as_echo "#define NO_FLOAT_H 1" >>confdefs.h
- 
+-
 -# Is the header present?
 -echo "$as_me:$LINENO: checking float.h presence" >&5
 -echo $ECHO_N "checking float.h presence... $ECHO_C" >&6
@@ -6877,19 +6873,19 @@ Regenerated version after touching tclconfig/tcl.m4.
 -  fi
 -else
 -  ac_cpp_err=yes
- fi
+-fi
 -if test -z "$ac_cpp_err"; then
 -  ac_header_preproc=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  ac_header_preproc=no
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -6931,22 +6927,19 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5
 -echo "${ECHO_T}$ac_cv_header_float_h" >&6
-+    ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default"
-+if test "x$ac_cv_header_values_h" = xyes; then :
- 
+-
 -fi
 -if test $ac_cv_header_float_h = yes; then
 -  :
- else
- 
+-else
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define NO_FLOAT_H 1
 -_ACEOF
-+$as_echo "#define NO_VALUES_H 1" >>confdefs.h
- 
- fi
- 
- 
+-
+-fi
+-
+-
 -    if test "${ac_cv_header_values_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for values.h" >&5
 -echo $ECHO_N "checking for values.h... $ECHO_C" >&6
@@ -6955,7 +6948,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_values_h" >&5
 -echo "${ECHO_T}$ac_cv_header_values_h" >&6
--else
+ else
 -  # Is the header compilable?
 -echo "$as_me:$LINENO: checking values.h usability" >&5
 -echo $ECHO_N "checking values.h usability... $ECHO_C" >&6
@@ -6994,15 +6987,13 @@ Regenerated version after touching tclconfig/tcl.m4.
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-+if test "x$ac_cv_header_limits_h" = xyes; then :
  
 -ac_header_compiler=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
-+$as_echo "#define HAVE_LIMITS_H 1" >>confdefs.h
++$as_echo "#define NO_ERRNO_H 1" >>confdefs.h
  
 -# Is the header present?
 -echo "$as_me:$LINENO: checking values.h presence" >&5
@@ -7031,19 +7022,19 @@ Regenerated version after touching tclconfig/tcl.m4.
 -  fi
 -else
 -  ac_cpp_err=yes
--fi
+ fi
 -if test -z "$ac_cpp_err"; then
 -  ac_header_preproc=yes
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
--
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -7085,26 +7076,28 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_values_h" >&5
 -echo "${ECHO_T}$ac_cv_header_values_h" >&6
--
++    ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
++if test "x$ac_cv_header_float_h" = xyes; then :
+ 
 -fi
 -if test $ac_cv_header_values_h = yes; then
 -  :
--else
--
+ else
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define NO_VALUES_H 1
 -_ACEOF
--
--fi
++$as_echo "#define NO_FLOAT_H 1" >>confdefs.h
+ 
+ fi
  
-+$as_echo "#define NO_LIMITS_H 1" >>confdefs.h
  
 -    if test "${ac_cv_header_limits_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for limits.h" >&5
 -echo $ECHO_N "checking for limits.h... $ECHO_C" >&6
 -if test "${ac_cv_header_limits_h+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5
 -echo "${ECHO_T}$ac_cv_header_limits_h" >&6
 -else
@@ -7146,13 +7139,15 @@ Regenerated version after touching tclconfig/tcl.m4.
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++    ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default"
++if test "x$ac_cv_header_values_h" = xyes; then :
  
 -ac_header_compiler=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
- 
+-
 -# Is the header present?
 -echo "$as_me:$LINENO: checking limits.h presence" >&5
 -echo $ECHO_N "checking limits.h presence... $ECHO_C" >&6
@@ -7178,7 +7173,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -  else
 -    ac_cpp_err=
 -  fi
--else
+ else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
@@ -7186,13 +7181,14 @@ Regenerated version after touching tclconfig/tcl.m4.
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
--
++$as_echo "#define NO_VALUES_H 1" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -7231,7 +7227,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_cv_header_limits_h=$ac_header_preproc
--fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5
 -echo "${ECHO_T}$ac_cv_header_limits_h" >&6
 -
@@ -7243,14 +7239,17 @@ Regenerated version after touching tclconfig/tcl.m4.
 -_ACEOF
 -
 -else
--
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define NO_LIMITS_H 1
 -_ACEOF
--
+ 
 -fi
--
--
++    ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
++if test "x$ac_cv_header_limits_h" = xyes; then :
+ 
++$as_echo "#define HAVE_LIMITS_H 1" >>confdefs.h
+ 
 -    if test "${ac_cv_header_stdlib_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for stdlib.h" >&5
 -echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
@@ -7295,7 +7294,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_header_compiler=yes
--else
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -7304,7 +7303,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
--
+ 
 -# Is the header present?
 -echo "$as_me:$LINENO: checking stdlib.h presence" >&5
 -echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6
@@ -7338,13 +7337,14 @@ Regenerated version after touching tclconfig/tcl.m4.
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define NO_LIMITS_H 1" >>confdefs.h
+ 
 -  ac_header_preproc=no
--fi
+ fi
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
--
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -7386,7 +7386,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
 -echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
--
+ 
 -fi
 -if test $ac_cv_header_stdlib_h = yes; then
 +    ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -7455,14 +7455,15 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    tcl_ok=0
  fi
-@@ -5698,184 +4888,38 @@
+@@ -5698,184 +4888,38 @@ rm -f conftest*
  
      if test $tcl_ok = 0; then
  
 -cat >>confdefs.h <<\_ACEOF
 -#define NO_STDLIB_H 1
 -_ACEOF
--
++$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
+ 
 -    fi
 -    if test "${ac_cv_header_string_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for string.h" >&5
@@ -7599,8 +7600,7 @@ Regenerated version after touching tclconfig/tcl.m4.
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5
 -echo "${ECHO_T}$ac_cv_header_string_h" >&6
-+$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
- 
+-
 -fi
 -if test $ac_cv_header_string_h = yes; then
 +    fi
@@ -7650,7 +7650,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    tcl_ok=0
  fi
-@@ -5887,454 +4931,38 @@
+@@ -5887,454 +4931,38 @@ rm -f conftest*
  
      if test $tcl_ok = 0; then
  
@@ -8117,7 +8117,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  _ACEOF
  
  fi
-@@ -6376,9 +5004,7 @@
+@@ -6376,9 +5004,7 @@ done
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8128,7 +8128,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -6412,9 +5038,7 @@
+@@ -6412,9 +5038,7 @@ echo "$as_me: error: could not find sour
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8139,7 +8139,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -6447,9 +5071,7 @@
+@@ -6447,9 +5071,7 @@ echo "$as_me: error: could not find sour
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8150,7 +8150,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -6484,9 +5106,7 @@
+@@ -6484,9 +5106,7 @@ echo "$as_me: error: could not find sour
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8161,7 +8161,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -6519,9 +5139,7 @@
+@@ -6519,9 +5139,7 @@ echo "$as_me: error: could not find sour
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8172,7 +8172,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -6545,9 +5163,7 @@
+@@ -6545,9 +5163,7 @@ echo "$as_me: error: could not find sour
      for i in $vars; do
  	# check for existence, be strict because it is installed
  	if test ! -f "${srcdir}/$i" ; then
@@ -8183,7 +8183,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
  	PKG_HEADERS="$PKG_HEADERS $i"
      done
-@@ -6571,9 +5187,7 @@
+@@ -6571,9 +5187,7 @@ echo "$as_me: error: could not find head
  	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  	    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  	    ; then
@@ -8194,7 +8194,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
  	PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i"
  	# this assumes it is in a VPATH dir
-@@ -6594,9 +5208,7 @@
+@@ -6594,9 +5208,7 @@ echo "$as_me: error: could not find stub
      for i in $vars; do
  	# check for existence, be strict because it is installed
  	if test ! -f "${srcdir}/$i" ; then
@@ -8205,7 +8205,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
  	PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i"
      done
-@@ -6614,8 +5226,8 @@
+@@ -6614,8 +5226,8 @@ echo "$as_me: error: could not find tcl
  
  # needed for tclPort.h and such ... can be corrected
  
@@ -8216,7 +8216,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
      TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
-@@ -6646,9 +5258,7 @@
+@@ -6646,9 +5258,7 @@ echo $ECHO_N "checking for Tcl private i
  	esac
      else
  	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
@@ -8227,7 +8227,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
  
-@@ -6662,12 +5272,12 @@
+@@ -6662,12 +5272,12 @@ echo "$as_me: error: Cannot find private
  
  
  
@@ -8244,7 +8244,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}`
      TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\"
-@@ -6701,9 +5311,7 @@
+@@ -6701,9 +5311,7 @@ echo $ECHO_N "checking for Tk private in
  	esac
      else
  	if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
@@ -8255,7 +8255,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
  
-@@ -6715,8 +5323,8 @@
+@@ -6715,8 +5323,8 @@ echo "$as_me: error: Cannot find private
  
  
  
@@ -8266,7 +8266,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  #--------------------------------------------------------------------
-@@ -6726,44 +5334,47 @@
+@@ -6726,44 +5334,47 @@ echo "${ECHO_T}Using srcdir found in tkC
  
      if test "${TEA_WINDOWINGSYSTEM}" = "x11" ; then
  
@@ -8337,7 +8337,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -6771,37 +5382,41 @@
+@@ -6771,37 +5382,41 @@ _ACEOF
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -8382,7 +8382,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /usr/local/include/X11R6
  /usr/local/include/X11R5
  /usr/local/include/X11R4
-@@ -6821,48 +5436,24 @@
+@@ -6821,48 +5436,24 @@ ac_x_header_dirs='
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -8437,7 +8437,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
-@@ -6870,133 +5461,85 @@
+@@ -6870,133 +5461,85 @@ if test "$ac_x_libraries" = no; then
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
@@ -8606,7 +8606,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	else
  	    if test ! -r $x_includes/X11/Intrinsic.h; then
  		not_really_there="yes"
-@@ -7004,49 +5547,25 @@
+@@ -7004,49 +5547,25 @@ rm -f conftest.err conftest.$ac_ext
  	fi
      fi
      if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
@@ -8664,7 +8664,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		    XINCLUDES=" -I$i"
  		    found_xincludes="yes"
  		    break
-@@ -7060,19 +5579,19 @@
+@@ -7060,19 +5579,19 @@ echo "${ECHO_T}$i" >&6
  	fi
      fi
      if test found_xincludes = "no"; then
@@ -8691,7 +8691,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		XLIBSW="-L$i -lX11"
  		x_libraries="$i"
  		break
-@@ -7082,82 +5601,54 @@
+@@ -7082,82 +5601,54 @@ echo "${ECHO_T}$i" >&6
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -8793,7 +8793,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	XLIBSW=-lX11
      fi
      if test x"${XLIBSW}" != x ; then
-@@ -7212,9 +5703,7 @@
+@@ -7212,9 +5703,7 @@ _ACEOF
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8804,7 +8804,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -7255,9 +5744,7 @@
+@@ -7255,9 +5744,7 @@ else
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8815,7 +8815,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -7289,9 +5776,7 @@
+@@ -7289,9 +5776,7 @@ echo "$as_me: error: could not find sour
  		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
  		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
  		    ; then
@@ -8826,7 +8826,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  		PKG_SOURCES="$PKG_SOURCES $i"
  		# this assumes it is in a VPATH dir
-@@ -7334,13 +5819,13 @@
+@@ -7334,13 +5819,13 @@ fi
  #--------------------------------------------------------------------
  
  
@@ -8845,7 +8845,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      if test "${enable_threads+set}" = set; then
  	enableval="$enable_threads"
-@@ -7358,92 +5843,56 @@
+@@ -7358,92 +5843,56 @@ fi;
  	    # USE_THREAD_ALLOC tells us to try the special thread-based
  	    # allocator that significantly reduces lock contention
  
@@ -8958,7 +8958,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -7455,71 +5904,43 @@
+@@ -7455,71 +5904,43 @@ fi
  		# defined.  We could alternatively do an AC_TRY_COMPILE with
  		# pthread.h, but that will work with libpthread really doesn't
  		# exist, like AIX 4.2.  [Bug: 4359]
@@ -9046,7 +9046,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -7531,71 +5952,43 @@
+@@ -7531,71 +5952,43 @@ fi
  		# The space is needed
  		THREADS_LIBS=" -lpthread"
  	    else
@@ -9134,7 +9134,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -7605,142 +5998,86 @@
+@@ -7605,142 +5998,86 @@ fi
  		    # The space is needed
  		    THREADS_LIBS=" -lpthreads"
  		else
@@ -9309,7 +9309,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -7751,8 +6088,8 @@
+@@ -7751,8 +6088,8 @@ fi
  			    THREADS_LIBS=" -pthread"
  			else
  			    TCL_THREADS=0
@@ -9320,7 +9320,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  			fi
  		    fi
  		fi
-@@ -7762,40 +6099,38 @@
+@@ -7762,40 +6099,38 @@ echo "$as_me: WARNING: Do not know how t
  	TCL_THREADS=0
      fi
      # Do checking message here to not mess up interleaved configure output
@@ -9372,7 +9372,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      --enable-threads requested, but building against a Tcl that is NOT
      thread-enabled.  This is an OK configuration that will also run in
      a thread-enabled core." >&2;}
-@@ -7811,15 +6146,15 @@
+@@ -7811,15 +6146,15 @@ echo "$as_me: WARNING:
  #--------------------------------------------------------------------
  
  
@@ -9395,7 +9395,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      if test "${enable_shared+set}" = set; then
  	enableval="$enable_shared"
-@@ -7829,17 +6164,15 @@
+@@ -7829,17 +6164,15 @@ fi;
      fi
  
      if test "$tcl_ok" = "yes" ; then
@@ -9418,7 +9418,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      fi
  
-@@ -7856,31 +6189,31 @@
+@@ -7856,31 +6189,31 @@ _ACEOF
  
      # Step 0.a: Enable 64 bit support?
  
@@ -9468,7 +9468,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
      if test "$do64bitVIS" = "yes"; then
  	# Force 64bit on with VIS
-@@ -7890,27 +6223,27 @@
+@@ -7890,27 +6223,27 @@ echo "${ECHO_T}$do64bitVIS" >&6
      # Step 0.c: Cross-compiling options for Windows/CE builds?
  
      if test "${TEA_PLATFORM}" = "windows" ; then
@@ -9509,7 +9509,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
  
  	if test "${TEA_PLATFORM}" = "windows" ; then
-@@ -7920,8 +6253,8 @@
+@@ -7920,8 +6253,8 @@ else
  	else
  	    tcl_cv_sys_version=`uname -s`-`uname -r`
  	    if test "$?" -ne 0 ; then
@@ -9520,7 +9520,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		tcl_cv_sys_version=unknown
  	    else
  		# Special check for weird MP-RAS system (uname returns weird
-@@ -7937,79 +6270,51 @@
+@@ -7937,79 +6270,51 @@ echo "$as_me: WARNING: can't find uname
  	fi
  
  fi
@@ -9618,7 +9618,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    have_dl=yes
  else
    have_dl=no
-@@ -8048,10 +6353,10 @@
+@@ -8048,10 +6353,10 @@ fi
      TCL_EXP_FILE=""
      # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -9633,7 +9633,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8061,26 +6366,28 @@
+@@ -8061,26 +6366,28 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9670,7 +9670,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      STLIB_LD='${AR} cr'
      LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
      case $system in
-@@ -8108,28 +6415,24 @@
+@@ -8108,28 +6415,24 @@ fi
  			;;
  		esac
  		if test ! -d "${PATH64}" ; then
@@ -9707,7 +9707,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  
      # First, look for one uninstalled.
-@@ -8139,15 +6442,15 @@
+@@ -8139,15 +6442,15 @@ echo "$as_me: error: Windows/CE and GCC
  	# we reset no_celib in case something fails here
  	no_celib=true
  
@@ -9732,7 +9732,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  else
  
  	    # First check to see if --with-celibconfig was specified.
-@@ -8155,9 +6458,7 @@
+@@ -8155,9 +6458,7 @@ else
  		if test -d "${with_celibconfig}/inc" ; then
  		    ac_cv_c_celibconfig=`(cd ${with_celibconfig}; pwd)`
  		else
@@ -9743,7 +9743,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  	    fi
  
-@@ -8183,15 +6484,13 @@
+@@ -8183,15 +6484,13 @@ echo "$as_me: error: ${with_celibconfig}
  fi
  
  	if test x"${ac_cv_c_celibconfig}" = x ; then
@@ -9762,7 +9762,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
  
-@@ -8233,9 +6532,7 @@
+@@ -8233,9 +6532,7 @@ echo "${ECHO_T}found $CELIB_DIR" >&6
  		SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
  		if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}" \
  		    -o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
@@ -9773,7 +9773,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		    doWince="no"
  		else
  		    # We could PATH_NOSPACE these, but that's not important,
-@@ -8372,8 +6669,8 @@
+@@ -8372,8 +6669,8 @@ _ACEOF
  			CC=${CC}_r
  			;;
  		esac
@@ -9784,7 +9784,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    fi
  	    LIBS="$LIBS -lc"
  	    SHLIB_CFLAGS=""
-@@ -8386,8 +6683,8 @@
+@@ -8386,8 +6683,8 @@ echo "${ECHO_T}Using $CC for compiling w
  	    # Check to enable 64-bit flags for compiler/linker on AIX 4+
  	    if test "$do64bit" = "yes" -a "`uname -v`" -gt "3" ; then
  		if test "$GCC" = "yes" ; then
@@ -9795,7 +9795,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		else
  		    do64bit_ok=yes
  		    CFLAGS="$CFLAGS -q64"
-@@ -8425,12 +6722,10 @@
+@@ -8425,12 +6722,10 @@ echo "$as_me: WARNING: 64bit mode not su
  
  	    # AIX v<=4.1 has some different flags than 4.2+
  	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
@@ -9811,7 +9811,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  esac
  
  		DL_LIBS="-lld"
-@@ -8448,71 +6743,43 @@
+@@ -8448,71 +6743,43 @@ esac
  	    # deduce the timezone by comparing the localtime result on a
  	    # known GMT value.
  
@@ -9899,7 +9899,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    libbsd=yes
  else
    libbsd=no
-@@ -8521,9 +6788,7 @@
+@@ -8521,9 +6788,7 @@ fi
  	    if test $libbsd = yes; then
  	    	MATH_LIBS="$MATH_LIBS -lbsd"
  
@@ -9910,7 +9910,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  	    fi
  	    ;;
-@@ -8540,71 +6805,43 @@
+@@ -8540,71 +6805,43 @@ _ACEOF
  	    # -lsocket, even if the network functions are in -lnet which
  	    # is always linked to, for compatibility.
  	    #-----------------------------------------------------------
@@ -9998,7 +9998,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    LIBS="$LIBS -lbind -lsocket"
  fi
  
-@@ -8643,9 +6880,7 @@
+@@ -8643,9 +6880,7 @@ fi
  	HP-UX-*.11.*)
  	    # Use updated header definitions where possible
  
@@ -10009,7 +10009,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  	    # Needed by Tcl, but not most extensions
  	    #AC_DEFINE(_XOPEN_SOURCE, 1, [Do we want to use the XOPEN network library?])
-@@ -8656,71 +6891,43 @@
+@@ -8656,71 +6891,43 @@ _ACEOF
  	    else
  		SHLIB_SUFFIX=".sl"
  	    fi
@@ -10097,7 +10097,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -8760,8 +6967,8 @@
+@@ -8760,8 +6967,8 @@ fi
  			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  			    ;;
  			*)
@@ -10108,7 +10108,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  			    ;;
  		    esac
  		else
-@@ -8773,71 +6980,43 @@
+@@ -8773,71 +6980,43 @@ echo "$as_me: WARNING: 64bit mode not su
  	    ;;
  	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
  	    SHLIB_SUFFIX=".sl"
@@ -10196,7 +10196,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_ok=yes
  else
    tcl_ok=no
-@@ -8904,8 +7083,8 @@
+@@ -8904,8 +7083,8 @@ fi
  
  	    if test "$do64bit" = "yes" ; then
  	        if test "$GCC" = "yes" ; then
@@ -10207,7 +10207,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	        else
  	            do64bit_ok=yes
  	            SHLIB_LD="ld -64 -shared -rdata_shared"
-@@ -8936,19 +7115,15 @@
+@@ -8936,19 +7115,15 @@ echo "$as_me: WARNING: 64bit mode not su
  		CFLAGS="$CFLAGS -mieee"
  	    fi
  	    if test $do64bit = yes; then
@@ -10232,7 +10232,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -8959,41 +7134,17 @@
+@@ -8959,41 +7134,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -10280,7 +10280,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		if test $tcl_cv_cc_m64 = yes; then
  		    CFLAGS="$CFLAGS -m64"
  		    do64bit_ok=yes
-@@ -9070,17 +7221,13 @@
+@@ -9070,17 +7221,13 @@ echo "${ECHO_T}$tcl_cv_cc_m64" >&6
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -10303,7 +10303,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  #ifdef __ELF__
-@@ -9089,7 +7236,7 @@
+@@ -9089,7 +7236,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -10312,7 +10312,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_cv_ld_elf=yes
  else
    tcl_cv_ld_elf=no
-@@ -9097,8 +7244,8 @@
+@@ -9097,8 +7244,8 @@ fi
  rm -f conftest*
  
  fi
@@ -10323,7 +10323,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    if test $tcl_cv_ld_elf = yes; then
  		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
  	    else
-@@ -9126,17 +7273,13 @@
+@@ -9126,17 +7273,13 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
@@ -10346,7 +10346,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  #ifdef __ELF__
-@@ -9145,7 +7288,7 @@
+@@ -9145,7 +7288,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -10355,7 +10355,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    tcl_cv_ld_elf=yes
  else
    tcl_cv_ld_elf=no
-@@ -9153,8 +7296,8 @@
+@@ -9153,8 +7296,8 @@ fi
  rm -f conftest*
  
  fi
@@ -10366,7 +10366,25 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    if test $tcl_cv_ld_elf = yes; then
  		LDFLAGS=-Wl,-export-dynamic
  	    else
-@@ -9206,19 +7349,15 @@
+@@ -9165,7 +7308,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="ld -Bshareable -x"
+@@ -9183,7 +7326,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
+ 	    	LDFLAGS="$LDFLAGS -pthread"
+ 	    fi
+ 	    case $system in
+-	    FreeBSD-3.*)
++	    *)
+ 	    	# FreeBSD-3 doesn't handle version numbers with dots.
+ 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+@@ -9206,19 +7349,15 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
  	    if test $do64bit = yes; then
  		case `arch` in
  		    ppc)
@@ -10391,7 +10409,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -9229,59 +7368,31 @@
+@@ -9229,59 +7368,31 @@ main ()
    return 0;
  }
  _ACEOF
@@ -10462,7 +10480,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -9292,48 +7403,24 @@
+@@ -9292,48 +7403,24 @@ main ()
    return 0;
  }
  _ACEOF
@@ -10519,7 +10537,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		esac
  	    else
  		# Check for combined 32-bit and 64-bit fat build
-@@ -9343,19 +7430,15 @@
+@@ -9343,19 +7430,15 @@ echo "$as_me: WARNING: Don't know how en
  	    fi
  	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS here:
  	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
@@ -10544,7 +10562,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -9366,41 +7449,17 @@
+@@ -9366,41 +7449,17 @@ int i;
    return 0;
  }
  _ACEOF
@@ -10592,7 +10610,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    if test $tcl_cv_ld_single_module = yes; then
  		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
  	    fi
-@@ -9413,19 +7472,15 @@
+@@ -9413,19 +7472,15 @@ echo "${ECHO_T}$tcl_cv_ld_single_module"
  		"`echo "${CFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \
  		LDFLAGS="$LDFLAGS -prebind"
  	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
@@ -10617,7 +10635,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -9436,41 +7491,17 @@
+@@ -9436,41 +7491,17 @@ int i;
    return 0;
  }
  _ACEOF
@@ -10665,7 +10683,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    if test $tcl_cv_ld_search_paths_first = yes; then
  		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
  	    fi
-@@ -9497,9 +7528,7 @@
+@@ -9497,9 +7528,7 @@ echo "${ECHO_T}$tcl_cv_ld_search_paths_f
  	OS/390-*)
  	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
  
@@ -10676,7 +10694,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  	    ;;
  	OSF1-1.0|OSF1-1.1|OSF1-1.2)
-@@ -9630,14 +7659,10 @@
+@@ -9630,14 +7659,10 @@ _ACEOF
  	    # won't define thread-safe library routines.
  
  
@@ -10693,7 +10711,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  	    SHLIB_CFLAGS="-KPIC"
-@@ -9664,14 +7689,10 @@
+@@ -9664,14 +7689,10 @@ _ACEOF
  	    # won't define thread-safe library routines.
  
  
@@ -10710,7 +10728,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  	    SHLIB_CFLAGS="-KPIC"
-@@ -9682,8 +7703,8 @@
+@@ -9682,8 +7703,8 @@ _ACEOF
  		if test "$arch" = "sparcv9 sparc" ; then
  			if test "$GCC" = "yes" ; then
  			    if test "`gcc -dumpversion | awk -F. '{print $1}'`" -lt "3" ; then
@@ -10721,7 +10739,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  			    else
  				do64bit_ok=yes
  				CFLAGS="$CFLAGS -m64 -mcpu=v9"
-@@ -9704,16 +7725,16 @@
+@@ -9704,16 +7725,16 @@ echo "$as_me: WARNING: 64bit mode not su
  			fi
  		elif test "$arch" = "amd64 i386" ; then
  		    if test "$GCC" = "yes" ; then
@@ -10742,7 +10760,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  		fi
  	    fi
  
-@@ -9754,19 +7775,15 @@
+@@ -9754,19 +7775,15 @@ echo "$as_me: WARNING: 64bit mode not su
  	    DL_LIBS="-ldl"
  	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
  	    # that don't grok the -Bexport option.  Test that it does.
@@ -10767,7 +10785,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -9777,41 +7794,17 @@
+@@ -9777,41 +7794,17 @@ int i;
    return 0;
  }
  _ACEOF
@@ -10815,7 +10833,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	    if test $tcl_cv_ld_Bexport = yes; then
  		LDFLAGS="$LDFLAGS -Wl,-Bexport"
  	    fi
-@@ -9821,21 +7814,21 @@
+@@ -9821,21 +7814,21 @@ echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6
      esac
  
      if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then
@@ -10844,7 +10862,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      if test "$tcl_ok" = "no"; then
  	DL_OBJS=""
      fi
-@@ -9909,18 +7902,14 @@
+@@ -9909,18 +7902,14 @@ fi;
      # These must be called after we do the basic CFLAGS checks and
      # verify any possible 64-bit or similar switches are necessary
  
@@ -10868,7 +10886,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <stdlib.h>
  int
-@@ -9931,38 +7920,10 @@
+@@ -9931,38 +7920,10 @@ char *p = (char *)strtoll; char *q = (ch
    return 0;
  }
  _ACEOF
@@ -10909,7 +10927,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #define _ISOC99_SOURCE 1
  #include <stdlib.h>
-@@ -9974,58 +7935,28 @@
+@@ -9974,58 +7935,28 @@ char *p = (char *)strtoll; char *q = (ch
    return 0;
  }
  _ACEOF
@@ -10976,7 +10994,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/stat.h>
  int
-@@ -10036,38 +7967,10 @@
+@@ -10036,38 +7967,10 @@ struct stat64 buf; int i = stat64("/", &
    return 0;
  }
  _ACEOF
@@ -11017,7 +11035,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #define _LARGEFILE64_SOURCE 1
  #include <sys/stat.h>
-@@ -10079,58 +7982,28 @@
+@@ -10079,58 +7982,28 @@ struct stat64 buf; int i = stat64("/", &
    return 0;
  }
  _ACEOF
@@ -11084,7 +11102,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/stat.h>
  int
-@@ -10141,38 +8014,10 @@
+@@ -10141,38 +8014,10 @@ char *p = (char *)open64;
    return 0;
  }
  _ACEOF
@@ -11125,7 +11143,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE64 1
  #include <sys/stat.h>
-@@ -10184,71 +8029,41 @@
+@@ -10184,71 +8029,41 @@ char *p = (char *)open64;
    return 0;
  }
  _ACEOF
@@ -11211,7 +11229,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -10259,44 +8074,16 @@
+@@ -10259,44 +8074,16 @@ __int64 value = (__int64) 0;
    return 0;
  }
  _ACEOF
@@ -11260,7 +11278,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  
  int
-@@ -10309,72 +8096,41 @@
+@@ -10309,72 +8096,41 @@ switch (0) {
    return 0;
  }
  _ACEOF
@@ -11347,7 +11365,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/dirent.h>
-@@ -10386,58 +8142,28 @@
+@@ -10386,58 +8142,28 @@ struct dirent64 p;
    return 0;
  }
  _ACEOF
@@ -11417,7 +11435,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/stat.h>
  int
-@@ -10449,161 +8175,40 @@
+@@ -10449,161 +8175,40 @@ struct stat64 p;
    return 0;
  }
  _ACEOF
@@ -11596,7 +11614,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  /* end confdefs.h.  */
  #include <sys/types.h>
  int
-@@ -10615,51 +8220,25 @@
+@@ -10615,51 +8220,25 @@ off64_t offset;
    return 0;
  }
  _ACEOF
@@ -11656,7 +11674,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
  
-@@ -10672,27 +8251,27 @@
+@@ -10672,27 +8251,27 @@ echo "${ECHO_T}no" >&6
  
  
  
@@ -11695,7 +11713,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
      if test "${TEA_PLATFORM}" != "windows" ; then
-@@ -10705,19 +8284,17 @@
+@@ -10705,19 +8284,17 @@ echo "${ECHO_T}yes (standard debugging)"
  
      if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
  
@@ -11720,7 +11738,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  	fi
      fi
  
-@@ -10729,13 +8306,9 @@
+@@ -10729,13 +8306,9 @@ echo "${ECHO_T}enabled $tcl_ok debugging
  # link against the non-stubbed Tcl library.
  #--------------------------------------------------------------------
  
@@ -11736,7 +11754,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  #--------------------------------------------------------------------
-@@ -10826,8 +8399,8 @@
+@@ -10826,8 +8399,8 @@ _ACEOF
  #--------------------------------------------------------------------
  
  
@@ -11747,7 +11765,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      if test -f "${TCL_BIN_DIR}/Makefile" ; then
          # tclConfig.sh is in Tcl build directory
          if test "${TEA_PLATFORM}" = "windows"; then
-@@ -10853,13 +8426,13 @@
+@@ -10853,13 +8426,13 @@ echo $ECHO_N "checking for tclsh... $ECH
          done
          TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
      fi
@@ -11765,7 +11783,7 @@ Regenerated version after touching tclconfig/tcl.m4.
      if test -f "${TK_BIN_DIR}/Makefile" ; then
          # tkConfig.sh is in Tk build directory
          if test "${TEA_PLATFORM}" = "windows"; then
-@@ -10885,8 +8458,8 @@
+@@ -10885,8 +8458,8 @@ echo $ECHO_N "checking for wish... $ECHO
          done
          WISH_PROG="${REAL_TK_BIN_DIR}/${WISH_PROG}"
      fi
@@ -11776,7 +11794,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  
  
-@@ -10894,7 +8467,8 @@
+@@ -10894,7 +8467,8 @@ echo "${ECHO_T}${WISH_PROG}" >&6
  # Finally, substitute all of the various values into the Makefile.
  #--------------------------------------------------------------------
  
@@ -11786,7 +11804,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -10913,39 +8487,70 @@
+@@ -10913,39 +8487,70 @@ _ACEOF
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -11876,7 +11894,7 @@ Regenerated version after touching tclconfig/tcl.m4.
    fi
  fi
  rm -f confcache
-@@ -10954,77 +8559,72 @@
+@@ -10954,77 +8559,72 @@ test "x$prefix" = xNONE && prefix=$ac_de
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -11995,7 +12013,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -11034,81 +8634,253 @@
+@@ -11034,81 +8634,253 @@ cat >$CONFIG_STATUS <<_ACEOF
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -12293,7 +12311,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -11116,148 +8888,123 @@
+@@ -11116,148 +8888,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -12543,7 +12561,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -11266,31 +9013,20 @@
+@@ -11266,31 +9013,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -12585,7 +12603,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -11298,125 +9034,117 @@
+@@ -11298,125 +9034,117 @@ generated by GNU Autoconf 2.59.  Invocat
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -12771,7 +12789,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
    esac
    shift
-@@ -11430,30 +9158,44 @@
+@@ -11430,30 +9158,44 @@ if $ac_cs_silent; then
  fi
  
  _ACEOF
@@ -12828,7 +12846,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -11463,414 +9205,419 @@
+@@ -11463,414 +9205,419 @@ if $ac_need_defaults; then
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -13609,7 +13627,7 @@ Regenerated version after touching tclconfig/tcl.m4.
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -11890,6 +9637,10 @@
+@@ -11890,6 +9637,10 @@ if test "$no_create" != yes; then
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
-- 
cgit v1.2.3