Merge 8.7

2 files changed, 21 insertions, 16 deletions

diff --git a/win/configure b/win/configure
index 94d7085..e647140 100755
--- a/win/configure
+++ b/win/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.70.
+# Generated by GNU Autoconf 2.70 for tcl 8.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc.
@@ -605,10 +605,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=''
-PACKAGE_TARNAME=''
-PACKAGE_VERSION=''
-PACKAGE_STRING=''
+PACKAGE_NAME='tcl'
+PACKAGE_TARNAME='tcl'
+PACKAGE_VERSION='8.7'
+PACKAGE_STRING='tcl 8.7'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -862,7 +862,7 @@ localstatedir='${prefix}/var'
 runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1369,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures tcl 8.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1418,7 +1418,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/tcl]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1430,7 +1430,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of tcl 8.7:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1526,7 +1528,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+tcl configure 8.7
 generated by GNU Autoconf 2.70
 
 Copyright (C) 2020 Free Software Foundation, Inc.
@@ -1730,7 +1732,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by tcl $as_me 8.7, which was
 generated by GNU Autoconf 2.70.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2389,6 +2391,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # The following define is needed when building with Cygwin since newer
 # versions of autoconf incorrectly set SHELL to /bin/bash instead of
 # /bin/sh. The bash shell seems to suffer from some strange failures.
@@ -6364,7 +6367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by tcl $as_me 8.7, which was
 generated by GNU Autoconf 2.70.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6419,7 +6422,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-config.status
+tcl config.status 8.7
 configured by $0, generated by GNU Autoconf 2.70,
   with options \\"\$ac_cs_config\\"
 
diff --git a/win/configure.ac b/win/configure.ac
index 9fba6b3..840d576 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -3,7 +3,8 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 
-AC_INIT(../generic/tcl.h)
+AC_INIT([tcl],[9.0])
+AC_CONFIG_SRCDIR([../generic/tcl.h])
 AC_PREREQ([2.69])
 
 # The following define is needed when building with Cygwin since newer
@@ -466,8 +467,9 @@ AC_SUBST(RC_DEFINE)
 AC_SUBST(RC_DEFINES)
 AC_SUBST(RES)
 
-AC_OUTPUT(Makefile tclConfig.sh tclsh.exe.manifest)
+AC_CONFIG_FILES(Makefile tclConfig.sh tclsh.exe.manifest)
+AC_OUTPUT
 
 dnl Local Variables:
-dnl mode: autoconf;
+dnl mode: autoconf
 dnl End: