--- unix/configure.in.orig 2003-06-03 14:44:59.000000000 -0500
+++ unix/configure.in 2012-11-05 10:09:17.000000000 -0600
@@ -9,14 +9,14 @@
TNM_VERSION=3.0.0
TKI_VERSION=1.5.0
-TCL_VERSION=8.4
-TK_VERSION=8.4
+TCL_VERSION=8.5
+TK_VERSION=8.5
#----------------------------------------------------------------------------
# Load the tcl configuration file.
#----------------------------------------------------------------------------
-AC_PATH_PROG(tclsh,tclsh8.4)
+AC_PATH_PROG(tclsh,tclsh)
if test -n "$tclsh" ; then
tclsh_prefix=`dirname $tclsh`
tclsh_prefix=`dirname $tclsh_prefix`
@@ -71,9 +71,6 @@
AC_MSG_CHECKING(for tcl version)
AC_MSG_RESULT("$TCL_VERSION")
-if test "$TCL_VERSION" != "8.4" ; then
- AC_MSG_ERROR("Tcl version 8.4 needed")
-fi
BUILD_TARGETS="$BUILD_TARGETS scotty"
INSTALL_TARGETS="$INSTALL_TARGETS tnm-install"
@@ -82,7 +79,7 @@
# Load the tk configuration file.
#----------------------------------------------------------------------------
-AC_PATH_PROG(wish,wish8.4)
+AC_PATH_PROG(wish,wish)
if test -n "$wish" ; then
wish_prefix=`dirname $wish`
wish_prefix=`dirname $wish_prefix`
@@ -122,9 +119,6 @@
AC_MSG_CHECKING(for tk version)
AC_MSG_RESULT("$TK_VERSION")
- if test "$TK_VERSION" != "8.4" ; then
- AC_MSG_ERROR("Tk version 8.4 needed")
- fi
BUILD_TARGETS="$BUILD_TARGETS tkined"
INSTALL_TARGETS="$INSTALL_TARGETS tki-install"
@@ -259,7 +253,7 @@
# Check for sin_len field in struct sockaddr (BSD-ish).
#----------------------------------------------------------------------------
-AC_CHECK_TYPE(socklen_t,AC_DEFINE(HAVE_SOCKLEN_T))
+AC_CHECK_TYPE(socklen_t,AC_DEFINE(HAVE_SOCKLEN_T),,[#include <sys/socket.h>])
AC_CACHE_CHECK([for 'sa_len' in 'struct sockaddr'], ac_cv_struct_sa_len,
[AC_TRY_COMPILE([#include <sys/types.h>