Import Tk 8.6.10
This commit is contained in:
24
win/configure
vendored
24
win/configure
vendored
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
|
||||
TK_VERSION=8.6
|
||||
TK_MAJOR_VERSION=8
|
||||
TK_MINOR_VERSION=6
|
||||
TK_PATCH_LEVEL=".9"
|
||||
TK_PATCH_LEVEL=".10"
|
||||
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@@ -3001,24 +3001,26 @@ fi
|
||||
|
||||
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
|
||||
set x ${MAKE-make}
|
||||
ac_make=`echo "" | sed 'y,:./+-,___p_,'`
|
||||
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.make <<\_ACEOF
|
||||
SHELL = /bin/sh
|
||||
all:
|
||||
@echo 'ac_maketemp="$(MAKE)"'
|
||||
@echo '@@@%%%=$(MAKE)=@@@%%%'
|
||||
_ACEOF
|
||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||
eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
|
||||
if test -n "$ac_maketemp"; then
|
||||
eval ac_cv_prog_make_${ac_make}_set=yes
|
||||
else
|
||||
eval ac_cv_prog_make_${ac_make}_set=no
|
||||
fi
|
||||
# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
|
||||
case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
||||
*@@@%%%=?*=@@@%%%*)
|
||||
eval ac_cv_prog_make_${ac_make}_set=yes;;
|
||||
*)
|
||||
eval ac_cv_prog_make_${ac_make}_set=no;;
|
||||
esac
|
||||
rm -f conftest.make
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
|
||||
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
SET_MAKE=
|
||||
|
||||
Reference in New Issue
Block a user