From fcfecf0c0d902bcabce45b30db42a5d387ae774a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 9 Sep 2019 08:41:14 +0000
Subject: 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.

---
 win/Makefile.in | 6 +++---
 win/configure   | 2 +-
 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
-- 
cgit v0.12


From 7f3d79834326c84f710028a5d603ee1a9896d8c7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 9 Sep 2019 09:00:44 +0000
Subject: Move &crosstest up in .travis.yml

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1b8bd0..2a04faf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -154,7 +154,11 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads"
-      script: *crosstest
+      script: &crosstest
+        - make all tcltest
+        # Include a high visibility marker that tests are skipped outright
+        - >
+          echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
     - name: "Linux-cross-Windows/GCC/Static/no test"
       os: linux
       dist: xenial
@@ -191,11 +195,7 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=i686-w64-mingw32 --enable-threads"
-      script: &crosstest
-        - make all tcltest
-        # Include a high visibility marker that tests are skipped outright
-        - >
-          echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
+      script: *crosstest
     - name: "Linux-cross-Windows-32/GCC/Static/no test"
       os: linux
       dist: xenial
-- 
cgit v0.12