Final touch to make everything work for 8.5:

- Don't use AS_ECHO macro, because autoconf-2.59 doesn't have it.
- -D_BUILD_tcl  should be -DBUILD_tcl
- Missing back-slashes at the end of the line.

2 files changed, 4 insertions, 4 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 49ee104..8561bc2 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -498,15 +498,15 @@ tclWinInit.${OBJEXT}: tclWinInit.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinPipe.${OBJEXT}: tclWinPipe.c
-	$(CC) -c $(CC_SWITCHES) -D_BUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \
+	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \
 	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinReg.${OBJEXT}: tclWinReg.c
-	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE
+	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE \
 	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinDde.${OBJEXT}: tclWinDde.c
-	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE
+	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE \
 	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 testMain.${OBJEXT}: tclAppInit.c
diff --git a/win/configure b/win/configure
index d3708d8..7da12da 100755
--- a/win/configure
+++ b/win/configure
@@ -3012,7 +3012,7 @@ 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 x ${MAKE-make}
-ac_make=`AS_ECHO("$[2]") | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+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