forked from Lainports/opnsense-ports
32 lines
1.1 KiB
Text
32 lines
1.1 KiB
Text
--- configure.orig 1999-08-06 23:07:54 UTC
|
|
+++ configure
|
|
@@ -1204,8 +1204,8 @@ fi
|
|
|
|
echo "checking Tcl/Tk installation" 1>&6
|
|
echo "configure:1207: checking Tcl/Tk installation" >&5
|
|
-legal_tk_versions="8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
|
|
-legal_tcl_versions="8.0 7.9 7.8 7.7 7.6 7.5"
|
|
+legal_tk_versions="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.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.
|
|
@@ -1327,6 +1327,8 @@ echo "$ac_t""$tkconfig/tkConfig.sh" 1>&6
|
|
#### 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
|
|
@@ -1517,8 +1519,7 @@ cat > conftest.$ac_ext <<EOF
|
|
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
|