blob: a1c2c1493cd911cdf770b701c2262afc8da4fee3 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- configure.orig 2004-03-11 11:26:55 UTC
+++ configure
@@ -1208,8 +1208,8 @@
echo "checking Tcl/Tk installation" 1>&6
echo "configure:1211: checking Tcl/Tk installation" >&5
-legal_tk_versions="8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
-legal_tcl_versions="8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
+legal_tk_versions="8.6 8.5 8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
+legal_tcl_versions="8.6 8.5 8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
#### Find tclsh
# Check whether --with-tclsh or --without-tclsh was given.
@@ -1331,6 +1331,8 @@
#### Load the Tcl/Tk configuration files
. $tclconfig/tclConfig.sh
. $tkconfig/tkConfig.sh
+TCL_LIB_FILE=`eval "echo ${TCL_LIB_FILE}"`
+TK_LIB_FILE=`eval "echo ${TK_LIB_FILE}"`
if test -z "$TCL_EXEC_PREFIX"; then TCL_EXEC_PREFIX="$TCL_PREFIX"; fi
if test -z "$TK_EXEC_PREFIX"; then TK_EXEC_PREFIX="$TK_PREFIX"; fi
@@ -1521,8 +1523,7 @@
good_tk_version
#endif
EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "good_tk_version" >/dev/null 2>&1; then
+if true; then
rm -rf conftest*
is_good_tk_version=yes
else
|
