GraphicsMagick: TclMagick: Update tcl.m4 to TEA_VERSION 3.10 and...
GraphicsMagick Commits <[email protected]> Sun, 01 Sep 2024 12:22:16 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.18181.1725211821.7812.graphicsmagick-commit@lists.sourceforge.net> |
changeset 5cccc2a60230 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5cccc2a60230 summary: TclMagick: Update tcl.m4 to TEA_VERSION 3.10 and regen Autotools files diffstat: ChangeLog | 9 + TclMagick/AUTHORS | 2 +- TclMagick/INSTALL | 31 +- TclMagick/Makefile.in | 30 +- TclMagick/README | 4 +- TclMagick/aclocal.m4 | 70 +- TclMagick/configure | 10523 ++++++++++++++++-------------- TclMagick/generic/Makefile.in | 29 +- TclMagick/generic/pkgIndex.tcl | 1 - TclMagick/unix/config/compile | 2 +- TclMagick/unix/config/config.guess | 1262 +- TclMagick/unix/config/config.sub | 99 +- TclMagick/unix/config/depcomp | 2 +- TclMagick/unix/config/ltmain.sh | 879 +- TclMagick/unix/config/missing | 2 +- TclMagick/unix/m4/libtool.m4 | 227 +- TclMagick/unix/m4/ltoptions.m4 | 4 +- TclMagick/unix/m4/ltsugar.m4 | 2 +- TclMagick/unix/m4/ltversion.m4 | 13 +- TclMagick/unix/m4/lt~obsolete.m4 | 4 +- TclMagick/unix/m4/tcl.m4 | 1523 +-- VisualMagick/installer/inc/version.isx | 4 +- magick/version.h | 4 +- www/ChangeLog.html | 9 + 24 files changed, 7618 insertions(+), 7117 deletions(-) diffs (truncated from 24554 to 500 lines): diff -r 6ea715b043c1 -r 5cccc2a60230 ChangeLog --- a/ChangeLog Tue Aug 27 08:04:07 2024 -0500 +++ b/ChangeLog Sun Sep 01 12:17:54 2024 -0500 @@ -1,3 +1,12 @@ +2024-09-01 Bob Friesenhahn <[email protected]> + + * TclMagick/unix/m4/tcl.m4: Update tcl.m4 to TEA_VERSION 3.10. + + * TclMagick/generic/pkgIndex.tcl: Remove generated file. + + * TclMagick/generic: Regenerate Autotool's generated files with + autoconf 2.71 and automake 1.16.5. + 2024-08-27 Bob Friesenhahn <[email protected]> * www/index.rst, www/Changes.rst: 1.3.45 is released in 2024. diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/AUTHORS --- a/TclMagick/AUTHORS Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/AUTHORS Sun Sep 01 12:17:54 2024 -0500 @@ -1,2 +1,2 @@ Rolf Schroedter -David N. Welton \ No newline at end of file +David N. Welton diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/INSTALL --- a/TclMagick/INSTALL Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/INSTALL Sun Sep 01 12:17:54 2024 -0500 @@ -1,5 +1,5 @@ - TclMagick - ========= + TclMagick + ========= TclMagick install instructions. @@ -12,16 +12,14 @@ 0) If there is no configure script (you are fetching from CVS, for instance), try running the genconf.sh script. It runs aclocal, - autoconf, and automake --add-missing, in that order. Be sure to - use recent versions of the autotools (1.8 works for me, 1.4 - doesn't). + autoconf, and automake --add-missing, in that order. 1) Run the ./configure script. The following arguments are recommended: ./configure \ - --with-tcl=/usr/lib/tcl8.4/ \ - --with-tk=/usr/lib/tk8.4/ \ + --with-tcl=/usr/lib/tcl8.6/ \ + --with-tk=/usr/lib/tk8.6/ \ --with-magick=/usr/local/bin/GraphicsMagickWand-config \ Others that might very well be helpful are --enable-shared. @@ -61,25 +59,24 @@ * Compile TclMagick using MS Visual C++ 6.0 - Open the VC++ workspace in the TclMagick\win directory - Change the include path and library path to your IM/GM directory: - Project settings - All configurations - C/C++ - preprocessor - Project settings - All configurations - Linker - input + Project settings - All configurations - C/C++ - preprocessor + Project settings - All configurations - Linker - input - Compile the project, the compiled DLL's are in - Debug\TclMagick.dll - Release\TclMagick.dll - + Debug\TclMagick.dll + Release\TclMagick.dll + * Run the test-suite - Change to the TclMagick\tests directory - By default the debug version is used: Debug\TclMagick.dll - Run the three test-*.tcl scripts Resulting images are written to the TclMagick\tmp directory -* Use TclMagick +* Use TclMagick As a library package: - - Copy the pkgIndex.tcl and TclMagick.dll files to your Tcl-library + - Copy the pkgIndex.tcl and TclMagick.dll files to your Tcl-library - Load the library with - package require TclMagick + package require TclMagick By directly loadind the DLL: - Copy the TclMagick.dll to your desired destination - Load the library with - load TclMagick.dll - + load TclMagick.dll diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/Makefile.in --- a/TclMagick/Makefile.in Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/Makefile.in Sun Sep 01 12:17:54 2024 -0500 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -156,9 +156,6 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/unix/config/compile \ @@ -225,7 +222,6 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CELIB_DIR = @CELIB_DIR@ CFLAGS = @CFLAGS@ CFLAGS_DEBUG = @CFLAGS_DEBUG@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ @@ -233,6 +229,8 @@ CLEANFILES = @CLEANFILES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH = @CYGPATH@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -244,8 +242,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GM_CPPFLAGS = @GM_CPPFLAGS@ GM_LDFLAGS = @GM_LDFLAGS@ GM_LIBS = @GM_LIBS@ @@ -259,6 +259,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ LD_LIBRARY_PATH_VAR = @LD_LIBRARY_PATH_VAR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -274,7 +276,6 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ MANIFEST_TOOL = @MANIFEST_TOOL@ -MATH_LIBS = @MATH_LIBS@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -295,19 +296,12 @@ PKG_INCLUDES = @PKG_INCLUDES@ PKG_LIBS = @PKG_LIBS@ PKG_LIB_FILE = @PKG_LIB_FILE@ +PKG_LIB_FILE8 = @PKG_LIB_FILE8@ +PKG_LIB_FILE9 = @PKG_LIB_FILE9@ PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ PKG_TCL_SOURCES = @PKG_TCL_SOURCES@ -PRACTCL_CFLAGS = @PRACTCL_CFLAGS@ -PRACTCL_NAME_LIBRARY = @PRACTCL_NAME_LIBRARY@ -PRACTCL_SHARED_LIB = @PRACTCL_SHARED_LIB@ -PRACTCL_STATIC_LIB = @PRACTCL_STATIC_LIB@ -PRACTCL_STUB_LIB = @PRACTCL_STUB_LIB@ -PRACTCL_TOOLSET = @PRACTCL_TOOLSET@ -PRACTCL_VC_MANIFEST_EMBED_DLL = @PRACTCL_VC_MANIFEST_EMBED_DLL@ -PRACTCL_VC_MANIFEST_EMBED_EXE = @PRACTCL_VC_MANIFEST_EMBED_EXE@ -PRACTCL_WINDOWINGSYSTEM = @PRACTCL_WINDOWINGSYSTEM@ RANLIB = @RANLIB@ RANLIB_STUB = @RANLIB_STUB@ RC = @RC@ @@ -318,7 +312,6 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -SHLIB_SUFFIX = @SHLIB_SUFFIX@ STLIB_LD = @STLIB_LD@ STRIP = @STRIP@ STUBS_BUILD = @STUBS_BUILD@ @@ -340,7 +333,6 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ TCL_THREADS = @TCL_THREADS@ TCL_VERSION = @TCL_VERSION@ -TEA_TK_EXTENSION = @TEA_TK_EXTENSION@ TK_BIN_DIR = @TK_BIN_DIR@ TK_INCLUDES = @TK_INCLUDES@ TK_LIBS = @TK_LIBS@ @@ -401,6 +393,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -566,7 +559,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/README --- a/TclMagick/README Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/README Sun Sep 01 12:17:54 2024 -0500 @@ -1,5 +1,5 @@ - TclMagick - ========= + TclMagick + ========= A Tcl binding for the ImageMagick image manipulation library. diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/aclocal.m4 --- a/TclMagick/aclocal.m4 Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/aclocal.m4 Sun Sep 01 12:17:54 2024 -0500 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.3 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.3], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.3])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -400,7 +400,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -428,6 +428,10 @@ # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -464,7 +468,7 @@ [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -516,6 +520,20 @@ [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -597,7 +615,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -618,7 +636,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -640,7 +658,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -675,7 +693,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -718,7 +736,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -752,7 +770,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -781,7 +799,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +846,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -847,7 +865,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -928,7 +946,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -988,7 +1006,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1034,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1035,7 +1053,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -r 6ea715b043c1 -r 5cccc2a60230 TclMagick/configure --- a/TclMagick/configure Tue Aug 27 08:04:07 2024 -0500 +++ b/TclMagick/configure Sun Sep 01 12:17:54 2024 -0500 @@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TclMagick 0.46. +# Generated by GNU Autoconf 2.71 for TclMagick 0.46. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature.