From 29df7e2de40cb46876cba7b12532ae852b8e0780 Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 00:19:58 +0200 Subject: [PATCH 1/6] Update tcl.m4 to https://core.tcl-lang.org/tclconfig/artifact/0d6cf0bab5 2018-01-11 --- m4/tcl.m4 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 93320acf8..4d576a386 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -5,6 +5,7 @@ # # Copyright (c) 1999-2000 Ajuba Solutions. # Copyright (c) 2002-2005 ActiveState Corporation. +# Copyright (c) 2012-2018 Sean Woods. # Copyright (c) 2017 - 2024 Eggheads Development Team # # Original Tcl/TEA license.terms information for this file: @@ -53,7 +54,7 @@ AC_PREREQ([2.71]) dnl TEA extensions pass us the version of TEA they think they dnl are compatible with (must be set in TEA_INIT below) -dnl TEA_VERSION="3.10" +dnl TEA_VERSION="4.0" # Possible values for key variables defined: # @@ -98,7 +99,8 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ # we reset no_tcl in case something fails here no_tcl=true AC_ARG_WITH(tcl, - AS_HELP_STRING([--with-tcl],[directory containing tcl configuration (tclConfig.sh)]), + AS_HELP_STRING([--with-tcl], + [directory containing tcl configuration (tclConfig.sh)]), with_tclconfig="${withval}") AC_MSG_CHECKING([for Tcl configuration]) AC_CACHE_VAL(ac_cv_c_tclconfig,[ @@ -183,9 +185,9 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ `ls -d /usr/pkg/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \ - `ls -d /usr/local/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \ - `ls -d /usr/local/lib/tcl/tcl[[8-9]].[[0-9]] 2>/dev/null` \ + `ls -d /usr/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \ + `ls -d /usr/local/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \ + `ls -d /usr/local/lib/tcl/tcl[[8-9]].[[0-9]] 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i; pwd)`" @@ -437,8 +439,8 @@ AC_DEFUN([TEA_LOAD_TCLCONFIG], [ CYGPATH=echo ],[ TEA_PLATFORM="windows" - AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) - ]) + AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ] + ) CC=$hold_cc AC_MSG_RESULT($TEA_PLATFORM) From cea8409244cdd9895a9c23a06650568022a80f97 Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:11:08 +0200 Subject: [PATCH 2/6] Update tcl.m4 to https://core.tcl-lang.org/tclconfig/artifact/a5d37f54db at 2018-01-12 19:31:20 on branch trunk --- m4/tcl.m4 | 108 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 22 deletions(-) diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 4d576a386..9a3afcd4b 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -5,7 +5,6 @@ # # Copyright (c) 1999-2000 Ajuba Solutions. # Copyright (c) 2002-2005 ActiveState Corporation. -# Copyright (c) 2012-2018 Sean Woods. # Copyright (c) 2017 - 2024 Eggheads Development Team # # Original Tcl/TEA license.terms information for this file: @@ -59,12 +58,8 @@ dnl TEA_VERSION="4.0" # Possible values for key variables defined: # # TEA_WINDOWINGSYSTEM - win32 aqua x11 (mirrors 'tk windowingsystem') -# PRACTCL_WINDOWINGSYSTEM - windows cocoa hitheme x11 sdl # TEA_PLATFORM - windows unix # TEA_TK_EXTENSION - True if this is a Tk extension -# TEACUP_OS - windows macosx linux generic -# TEACUP_TOOLSET - Toolset in use (gcc,mingw,msvc,llvm) -# TEACUP_PROFILE - win32 # #------------------------------------------------------------------------ @@ -227,6 +222,42 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ fi ]) +#-------------------------------------------------------------------- +# TEA_CONFIG_SYSTEM +# +# Determine what the system is (some things cannot be easily checked +# on a feature-driven basis, alas). This can usually be done via the +# "uname" command. +# +# Arguments: +# none +# +# Results: +# Defines the following var: +# +# system - System/platform/version identification code. +#-------------------------------------------------------------------- + +AC_DEFUN([TEA_CONFIG_SYSTEM], [ + AC_CACHE_CHECK([system version], tcl_cv_sys_version, [ + # TEA specific: + if test "${TEA_PLATFORM}" = "windows" ; then + tcl_cv_sys_version=windows + else + tcl_cv_sys_version=`uname -s`-`uname -r` + if test "$?" -ne 0 ; then + AC_MSG_WARN([can't find uname command]) + tcl_cv_sys_version=unknown + else + if test "`uname -s`" = "AIX" ; then + tcl_cv_sys_version=AIX-`uname -v`.`uname -r` + fi + fi + fi + ]) + system=$tcl_cv_sys_version +]) + ## ## Here ends the standard Tcl configuration bits and starts the ## TEA specific functions @@ -262,30 +293,21 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ #------------------------------------------------------------------------ AC_DEFUN([TEA_INIT], [ - # TEA extensions pass this us the version of TEA they think they - # are compatible with. - TEA_VERSION="3.10" - AC_MSG_CHECKING([for correct TEA configuration]) + TEA_VERSION="3.13" + + AC_MSG_CHECKING([TEA configuration]) if test x"${PACKAGE_NAME}" = x ; then AC_MSG_ERROR([ The PACKAGE_NAME variable must be defined by your TEA configure.ac]) fi - if test x"$1" = x ; then - AC_MSG_ERROR([ -TEA version not specified.]) - elif test "$1" != "${TEA_VERSION}" ; then - AC_MSG_RESULT([warning: requested TEA version "$1", have "${TEA_VERSION}"]) - else - AC_MSG_RESULT([ok (TEA ${TEA_VERSION})]) - fi + AC_MSG_RESULT([ok (TEA ${TEA_VERSION})]) # If the user did not set CFLAGS, set it now to keep macros - # like AC_PROG_CC and AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) from adding "-g -O2". + # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2". if test "${CFLAGS+set}" != "set" ; then CFLAGS="" fi - TEA_TK_EXTENSION=0 - AC_SUBST(TEA_TK_EXTENSION) + case "`uname -s`" in *win32*|*WIN32*|*MINGW32_*) AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) @@ -340,6 +362,9 @@ TEA version not specified.]) AC_SUBST(PKG_INCLUDES) AC_SUBST(PKG_LIBS) AC_SUBST(PKG_CFLAGS) + + # Configure the installer. + TEA_INSTALLER ]) #------------------------------------------------------------------------ @@ -358,8 +383,8 @@ TEA version not specified.]) # TCL_BIN_DIR # TCL_SRC_DIR # TCL_LIB_FILE -# TCL_ZIP_FILE -# TCL_ZIPFS_SUPPORT +# TCL_ZIP_FILE +# TCL_ZIPFS_SUPPORT #------------------------------------------------------------------------ AC_DEFUN([TEA_LOAD_TCLCONFIG], [ @@ -548,3 +573,42 @@ AC_DEFUN([TEA_TCL_LINK_LIBS], [ AC_SUBST(TCL_LIBS) AC_SUBST(MATH_LIBS) ]) + +#------------------------------------------------------------------------ +# TEA_INSTALLER -- +# +# Configure the installer. +# +# Arguments: +# none +# +# Results: +# Substitutes the following vars: +# INSTALL +# INSTALL_DATA_DIR +# INSTALL_DATA +# INSTALL_PROGRAM +# INSTALL_SCRIPT +# INSTALL_LIBRARY +#------------------------------------------------------------------------ + +AC_DEFUN([TEA_INSTALLER], [ + INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c' + INSTALL_DATA_DIR='${INSTALL} -d -m 755' + INSTALL_DATA='${INSTALL} -m 644' + INSTALL_PROGRAM='${INSTALL} -m 755' + INSTALL_SCRIPT='${INSTALL} -m 755' + + TEA_CONFIG_SYSTEM + case $system in + HP-UX-*) INSTALL_LIBRARY='${INSTALL} -m 755' ;; + *) INSTALL_LIBRARY='${INSTALL} -m 644' ;; + esac + + AC_SUBST(INSTALL) + AC_SUBST(INSTALL_DATA_DIR) + AC_SUBST(INSTALL_DATA) + AC_SUBST(INSTALL_PROGRAM) + AC_SUBST(INSTALL_SCRIPT) + AC_SUBST(INSTALL_LIBRARY) +]) From b32e79d6a3aaed16101503bec2cc86bfa122f064 Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:34:29 +0200 Subject: [PATCH 3/6] Update aclocal.m4 --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 748fb2969..0d0da9a5d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1015,7 +1015,7 @@ AC_DEFUN([EGG_TCL_TCLCONFIG], if test "x$TCLLIBFN" = x; then AC_MSG_NOTICE([Autoconfiguring Tcl with tclConfig.sh]) egg_tcl_changed="yes" - TEA_INIT("3.10") + TEA_INIT("3.13") TEA_PATH_TCLCONFIG TEA_LOAD_TCLCONFIG TEA_TCL_LINK_LIBS From b0619c35c158b2edbff2c1d55efb4573d8d2b3cc Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:42:02 +0200 Subject: [PATCH 4/6] Update tcl.m4 to https://core.tcl-lang.org/tclconfig/artifact/0201401949 at 2018-03-21 22:21:00 on branch trunk --- m4/tcl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 9a3afcd4b..1a033f64e 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -309,7 +309,7 @@ The PACKAGE_NAME variable must be defined by your TEA configure.ac]) fi case "`uname -s`" in - *win32*|*WIN32*|*MINGW32_*) + *win32*|*WIN32*|*MINGW32_*|*MINGW64_*) AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) EXEEXT=".exe" TEA_PLATFORM="windows" From 548f3fa60c3d809c2d98c29b4d079f1da38254a5 Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 02:08:09 +0200 Subject: [PATCH 5/6] Update --- m4/tcl.m4 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 1a033f64e..8c0f234dc 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -51,10 +51,6 @@ AC_PREREQ([2.71]) -dnl TEA extensions pass us the version of TEA they think they -dnl are compatible with (must be set in TEA_INIT below) -dnl TEA_VERSION="4.0" - # Possible values for key variables defined: # # TEA_WINDOWINGSYSTEM - win32 aqua x11 (mirrors 'tk windowingsystem') From ecc7b1211205f8792c8992aadcb912b5a3dcda8e Mon Sep 17 00:00:00 2001 From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> Date: Fri, 14 Jun 2024 02:18:10 +0200 Subject: [PATCH 6/6] Update - see https://core.tcl-lang.org/tclconfig/fdiff?v1=11880c7e090bcdc1&v2=6d4e26e4eb9245e9 --- m4/tcl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 8c0f234dc..a5c79b9ec 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -92,7 +92,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), - with_tclconfig="${withval}") + [with_tclconfig="${withval}"]) AC_MSG_CHECKING([for Tcl configuration]) AC_CACHE_VAL(ac_cv_c_tclconfig,[