summaryrefslogtreecommitdiffstats
path: root/win/configure
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-10 09:16:31 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-10 09:16:31 (GMT)
commit890431889c8a0fc2b23697b1d25bbc467935a8bd (patch)
treea98e838bac6d13e5380de1ea310bb53fc6a1e2da /win/configure
parent39521a21f6d5517fb075b9e9a468cf4f8e723c99 (diff)
parentea4e2c54322fdec470e442447b66d815635851da (diff)
downloadtcl-890431889c8a0fc2b23697b1d25bbc467935a8bd.zip
tcl-890431889c8a0fc2b23697b1d25bbc467935a8bd.tar.gz
tcl-890431889c8a0fc2b23697b1d25bbc467935a8bd.tar.bz2
Merge 8.7
Diffstat (limited to 'win/configure')
-rwxr-xr-xwin/configure10
1 files changed, 3 insertions, 7 deletions
diff --git a/win/configure b/win/configure
index 9c9a8e7..e3f299f 100755
--- a/win/configure
+++ b/win/configure
@@ -5113,7 +5113,7 @@ printf "%s\n" "No zip found on PATH building minizip" >&6; }
ZIPFS_BUILD=1
- TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
+ TCL_ZIP_FILE=libtcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
else
ZIPFS_BUILD=0
TCL_ZIP_FILE=
@@ -5127,17 +5127,13 @@ if test "${ZIPFS_BUILD}" = 1; then
printf "%s\n" "#define ZIPFS_BUILD 2" >>confdefs.h
- INSTALL_LIBRARIES=install-libraries-zipfs-static
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
else
printf "%s\n" "#define ZIPFS_BUILD 1" >>confdefs.h
\
- INSTALL_LIBRARIES=install-libraries-zipfs-shared
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }