Ticket #23752: tcl85.diff

unix/configure.in

@@ -9 +9 @@
 
 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 +71 @@
 
 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
+#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 +82 @@
 #       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 +122 @@
 
     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
+#    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 +259 @@
 #       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>