[prev in list] [next in list] [prev in thread] [next in thread]
List: graphicsmagick-commit
Subject: [GM-commit] GraphicsMagick: Update TclMagick tcl.m4 to TEA 3.10
From: GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date: 2017-01-22 22:56:23
Message-ID: hg.4530a7b82177.1485125783.2950750188400161634 () src ! simplesystems ! org
[Download RAW message or body]
changeset 4530a7b82177 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=4530a7b82177
summary: Update TclMagick tcl.m4 to TEA 3.10
diffstat:
ChangeLog | 5 +
TclMagick/ChangeLog | 5 +
TclMagick/Makefile.in | 15 +
TclMagick/configure | 1241 +++++++++++++++++++++++++------
TclMagick/configure.ac | 2 +-
TclMagick/generic/Makefile.in | 19 +-
TclMagick/unix/m4/tcl.m4 | 950 +++++++++++++++++------
VisualMagick/installer/inc/version.isx | 4 +-
magick/version.h | 4 +-
www/Changelog.html | 31 +
10 files changed, 1767 insertions(+), 509 deletions(-)
diffs (truncated from 3567 to 500 lines):
diff -r 24d537fe44c2 -r 4530a7b82177 ChangeLog
--- a/ChangeLog Sun Jan 22 11:13:25 2017 -0500
+++ b/ChangeLog Sun Jan 22 16:56:21 2017 -0600
@@ -1,3 +1,8 @@
+2017-01-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * TclMagick/unix/m4/tcl.m4: Update tcl.m4 to TEA 3.10. File
+ supplied by Massimo Manghi.
+
2017-01-21 Glenn Randers-Pehrson <glennrp@simple.dallas.tx.us>
* coders/png.c: Added support for a proposed new PNG
diff -r 24d537fe44c2 -r 4530a7b82177 TclMagick/ChangeLog
--- a/TclMagick/ChangeLog Sun Jan 22 11:13:25 2017 -0500
+++ b/TclMagick/ChangeLog Sun Jan 22 16:56:21 2017 -0600
@@ -1,3 +1,8 @@
+2017-01-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * unix/m4/tcl.m4: Update tcl.m4 to TEA 3.10. File supplied by
+ Massimo Manghi.
+
2017-01-07 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Applied patch by
diff -r 24d537fe44c2 -r 4530a7b82177 TclMagick/Makefile.in
--- a/TclMagick/Makefile.in Sun Jan 22 11:13:25 2017 -0500
+++ b/TclMagick/Makefile.in Sun Jan 22 16:56:21 2017 -0600
@@ -152,6 +152,8 @@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
+INSTALL_LIBRARY = @INSTALL_LIBRARY@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -196,8 +198,18 @@
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@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHARED_BUILD = @SHARED_BUILD@
@@ -205,8 +217,10 @@
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@
TCLSH_PROG = @TCLSH_PROG@
TCL_BIN_DIR = @TCL_BIN_DIR@
TCL_DEFS = @TCL_DEFS@
@@ -225,6 +239,7 @@
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@
diff -r 24d537fe44c2 -r 4530a7b82177 TclMagick/configure
--- a/TclMagick/configure Sun Jan 22 11:13:25 2017 -0500
+++ b/TclMagick/configure Sun Jan 22 16:56:21 2017 -0600
@@ -634,6 +634,14 @@
LIBOBJS
WISH_PROG
TCLSH_PROG
+PRACTCL_NAME_LIBRARY
+PRACTCL_VC_MANIFEST_EMBED_EXE
+PRACTCL_VC_MANIFEST_EMBED_DLL
+PRACTCL_STUB_LIB
+PRACTCL_STATIC_LIB
+PRACTCL_SHARED_LIB
+PRACTCL_TOOLSET
+PRACTCL_CFLAGS
VC_MANIFEST_EMBED_EXE
VC_MANIFEST_EMBED_DLL
RANLIB_STUB
@@ -644,17 +652,24 @@
LD_LIBRARY_PATH_VAR
SHLIB_CFLAGS
SHLIB_LD_LIBS
+SHLIB_SUFFIX
SHLIB_LD
STLIB_LD
CFLAGS_WARNING
CFLAGS_OPTIMIZE
CFLAGS_DEBUG
+RC
CELIB_DIR
+STUBS_BUILD
SHARED_BUILD
TCL_THREADS
TK_INCLUDES
TCL_INCLUDES
MATH_LIBS
+INSTALL_LIBRARY
+INSTALL_DATA_DIR
+INSTALL
+PRACTCL_WINDOWINGSYSTEM
TK_XINCLUDES
TK_LIBS
TK_STUB_LIB_SPEC
@@ -692,6 +707,7 @@
PKG_STUB_LIB_FILE
PKG_LIB_FILE
CYGPATH
+TEA_TK_EXTENSION
GM_LIBS
GM_LDFLAGS
GM_CPPFLAGS
@@ -828,11 +844,13 @@
with_tclinclude
with_tkinclude
enable_threads
+enable_stubs
enable_64bit
enable_64bit_vis
enable_rpath
enable_wince
with_celib
+with_tclsh
'
ac_precious_vars='build_alias
host_alias
@@ -1474,6 +1492,8 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-threads build with threads
--enable-shared build and link with shared libraries (default: on)
+ --enable-stubs build and link with stub libraries. Always true for
+ shared builds (default: on)
--enable-64bit enable 64bit support (default: off)
--enable-64bit-vis enable 64bit Sparc VIS support (default: off)
--disable-rpath disable rpath support (default: on)
@@ -1494,6 +1514,7 @@
--with-tclinclude directory containing the public Tcl header files
--with-tkinclude directory containing the public Tk header files
--with-celib=DIR use Windows/CE support library from DIR
+ --with-tclsh Specify a local tcl shell to use for dynamic code
Some influential environment variables:
CC C compiler command
@@ -11681,24 +11702,31 @@
# TEA extensions pass this us the version of TEA they think they
# are compatible with.
- TEA_VERSION="3.9"
-
+ TEA_VERSION="3.10"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" \
>&5 $as_echo_n "checking for correct TEA configuration... " >&6; }
if test x"${PACKAGE_NAME}" = x ; then
as_fn_error $? "
-The PACKAGE_NAME variable must be defined by your TEA configure.in" "$LINENO" 5
- fi
- if test x"3.9" = x ; then
+The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
+ fi
+ if test x"3.10" = x ; then
as_fn_error $? "
TEA version not specified." "$LINENO" 5
- elif test "3.9" != "${TEA_VERSION}" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \
\"3.9\", have \"${TEA_VERSION}\"" >&5
-$as_echo "warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&6; }
+ elif test "3.10" != "${TEA_VERSION}" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \
\"3.10\", have \"${TEA_VERSION}\"" >&5 +$as_echo "warning: requested TEA version \
\"3.10\", have \"${TEA_VERSION}\"" >&6; } else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
$as_echo "ok (TEA ${TEA_VERSION})" >&6; }
fi
+
+ # If the user did not set CFLAGS, set it now to keep macros
+ # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
+ if test "${CFLAGS+set}" != "set" ; then
+ CFLAGS=""
+ fi
+ TEA_TK_EXTENSION=0
+
case "`uname -s`" in
*win32*|*WIN32*|*MINGW32_*)
# Extract the first word of "cygpath", so it can be a program name with args.
@@ -11718,7 +11746,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CYGPATH="cygpath -w"
+ ac_cv_prog_CYGPATH="cygpath -m"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -11743,14 +11771,22 @@
TEA_PLATFORM="windows"
;;
*CYGWIN_*)
- CYGPATH=echo
EXEEXT=".exe"
- # TEA_PLATFORM is determined later in LOAD_TCLCONFIG
+ # CYGPATH and TEA_PLATFORM are determined later in LOAD_TCLCONFIG
;;
*)
CYGPATH=echo
- EXEEXT=""
- TEA_PLATFORM="unix"
+ # Maybe we are cross-compiling....
+ case ${host_alias} in
+ *mingw32*)
+ EXEEXT=".exe"
+ TEA_PLATFORM="windows"
+ ;;
+ *)
+ EXEEXT=""
+ TEA_PLATFORM="unix"
+ ;;
+ esac
;;
esac
@@ -11763,6 +11799,9 @@
exec_prefix=$prefix
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} \
${PACKAGE_VERSION}" >&5 +$as_echo "$as_me: configuring ${PACKAGE_NAME} \
${PACKAGE_VERSION}" >&6;} +
@@ -11882,10 +11921,13 @@
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
- `ls -d /usr/contrib/lib 2>/dev/null` \
+ `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/tcl8.6 2>/dev/null` \
+ `ls -d /usr/lib/tcl8.5 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i; pwd)`"
@@ -11918,7 +11960,7 @@
if test x"${ac_cv_c_tclconfig}" = x ; then
TCL_BIN_DIR="# no Tcl configs found"
- as_fn_error $? "Can't find Tcl configuration definitions" "$LINENO" 5
+ as_fn_error $? "Can't find Tcl configuration definitions. Use --with-tcl to \
specify a directory containing tclConfig.sh" "$LINENO" 5 else
no_tcl=
TCL_BIN_DIR="${ac_cv_c_tclconfig}"
@@ -11996,37 +12038,87 @@
- case "`uname -s`" in
- *CYGWIN_*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin variant" >&5
-$as_echo_n "checking for cygwin variant... " >&6; }
- case ${TCL_EXTRA_CFLAGS} in
- *-mwin32*|*-mno-cygwin*)
- TEA_PLATFORM="windows"
- CFLAGS="$CFLAGS -mwin32"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: win32" >&5
-$as_echo "win32" >&6; }
- ;;
- *)
- TEA_PLATFORM="unix"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unix" >&5
-$as_echo "unix" >&6; }
- ;;
- esac
- EXEEXT=".exe"
- ;;
- *)
- ;;
- esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking platform" >&5
+$as_echo_n "checking platform... " >&6; }
+ hold_cc=$CC; CC="$TCL_CC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ #ifdef _WIN32
+ #error win32
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ TEA_PLATFORM="unix"
+ CYGPATH=echo
+
+else
+
+ TEA_PLATFORM="windows"
+ # Extract the first word of "cygpath", so it can be a program name with args.
+set dummy cygpath; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CYGPATH+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CYGPATH"; then
+ ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CYGPATH="cygpath -m"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
+fi
+fi
+CYGPATH=$ac_cv_prog_CYGPATH
+if test -n "$CYGPATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
+$as_echo "$CYGPATH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CC=$hold_cc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEA_PLATFORM" >&5
+$as_echo "$TEA_PLATFORM" >&6; }
+
+ # The BUILD_$pkg is to define the correct extern storage class
+ # handling when making this package
+
+cat >>confdefs.h <<_ACEOF
+#define BUILD_${PACKAGE_NAME} /**/
+_ACEOF
# Do this here as we have fully defined TEA_PLATFORM now
if test "${TEA_PLATFORM}" = "windows" ; then
- # The BUILD_$pkg is to define the correct extern storage class
- # handling when making this package
- cat >>confdefs.h <<_ACEOF
-#define BUILD_${PACKAGE_NAME} 1
-_ACEOF
-
+ EXEEXT=".exe"
CLEANFILES="$CLEANFILES *.lib *.dll *.pdb *.exp"
fi
@@ -12049,6 +12141,7 @@
if test x"${no_tk}" = x ; then
# we reset no_tk in case something fails here
no_tk=true
+ TEA_TK_EXTENSION=0
# Check whether --with-tk was given.
if test "${with_tk+set}" = set; then :
@@ -12174,9 +12267,10 @@
if test x"${ac_cv_c_tkconfig}" = x ; then
TK_BIN_DIR="# no Tk configs found"
- as_fn_error $? "Can't find Tk configuration definitions" "$LINENO" 5
+ as_fn_error $? "Can't find Tk configuration definitions. Use --with-tk to \
specify a directory containing tkConfig.sh" "$LINENO" 5 else
no_tk=
+ TEA_TK_EXTENSION=1
TK_BIN_DIR="${ac_cv_c_tkconfig}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found \
${TK_BIN_DIR}/tkConfig.sh" >&5 $as_echo "found ${TK_BIN_DIR}/tkConfig.sh" >&6; }
@@ -12240,20 +12334,44 @@
eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
# TEA specific: Ensure windowingsystem is defined
- if test "${TEA_PLATFORM}" = "unix" ; then
+ case ${TK_DEFS} in
+ *PLATFORM_SDL*)
+ TEA_WINDOWINGSYSTEM="x11"
+ PRACTCL_WINDOWINGSYSTEM="sdl"
+ TEA_USE_SDL=yes
+ ;;
+ esac
+ if test "${TEA_USE_SDL}" = "yes" ; then
+ true
+ elif test "${TEA_PLATFORM}" = "unix" ; then
case ${TK_DEFS} in
*MAC_OSX_TK*)
$as_echo "#define MAC_OSX_TK 1" >>confdefs.h
TEA_WINDOWINGSYSTEM="aqua"
+ PRACTCL_WINDOWINGSYSTEM="cocoa"
+ TEA_USE_HITHEME=no;
+ if test "${TK_VERSION}" = "8.5" ; then
+ if test "${TK_PATCH_LEVEL}" > ".17" ; then
+ TEA_USE_HITHEME=yes;
+ fi
+ elif test "${TK_VERSION}" = "8.6" ; then
+ if test "${TK_PATCH_LEVEL}" > ".3" ; then
+ TEA_USE_HITHEME=yes;
+ fi
+ elif test "${TK_VERSION}" > "8.6" ; then
+ TEA_USE_HITHEME=yes;
+ fi
;;
*)
TEA_WINDOWINGSYSTEM="x11"
+ PRACTCL_WINDOWINGSYSTEM="x11"
;;
esac
elif test "${TEA_PLATFORM}" = "windows" ; then
TEA_WINDOWINGSYSTEM="win32"
+ PRACTCL_WINDOWINGSYSTEM="windows"
fi
@@ -12271,6 +12389,8 @@
# TEA specific:
+ # Practcl
+
@@ -12304,12 +12424,6 @@
# Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE)
# in this macro, they need to go into TEA_SETUP_COMPILER instead.
- # If the user did not set CFLAGS, set it now to keep
- # the AC_PROG_CC macro from adding "-g -O2".
- if test "${CFLAGS+set}" != "set" ; then
- CFLAGS=""
- fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13115,6 +13229,18 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
+ INSTALL_DATA_DIR='${INSTALL} -d -m 755'
+ INSTALL_DATA='${INSTALL} -m 644'
+ INSTALL_PROGRAM='${INSTALL}'
+ INSTALL_SCRIPT='${INSTALL}'
+ INSTALL_LIBRARY='${INSTALL_DATA}'
+
+
+
+
+
+
#--------------------------------------------------------------------
@@ -13235,7 +13361,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
+ RANLIB=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14026,8 +14152,12 @@
vars=""
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic