Commit 4f491a96 authored by Ole Streicher's avatar Ole Streicher

New upstream version 3.2.4

parent 514d5664
......@@ -60,7 +60,7 @@ PKG_HEADERS = @PKG_HEADERS@
PKG_LIB_FILE = @PKG_LIB_FILE@
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
BINARIES = $(lib_BINARIES)
SHELL = @SHELL@
......@@ -86,12 +86,12 @@ pkgincludedir = $(includedir)/$(PKG_DIR)
top_builddir = .
INSTALL_OPTIONS =
INSTALL = $(SHELL) $(srcdir)/tclconfig/install-sh -c ${INSTALL_OPTIONS}
INSTALL_DATA_DIR = ${INSTALL} -d -m 755
INSTALL_PROGRAM = ${INSTALL} -m 555
INSTALL_DATA = ${INSTALL} -m 444
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
INSTALL_LIBRARY = ${INSTALL} -m 644
INSTALL = @INSTALL@ ${INSTALL_OPTIONS}
INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_LIBRARY = @INSTALL_LIBRARY@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
......@@ -111,14 +111,14 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
STLIB_LD = @STLIB_LD@
TCL_DEFS = @TCL_DEFS@
#TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
TCL_SRC_DIR = @TCL_SRC_DIR@
#TK_BIN_DIR = @TK_BIN_DIR@
#TK_SRC_DIR = @TK_SRC_DIR@
# Not used, but retained for reference of what libs Tcl required
TCL_LIBS = @TCL_LIBS@
#TCL_LIBS = @TCL_LIBS@
#========================================================================
# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
......@@ -150,7 +150,7 @@ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
PKG_CFLAGS = @PKG_CFLAGS@
# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
# must make sure that configure.ac checks for the necessary components
# that your library may use. TCL_DEFS can actually be a problem if
# you do not compile with a similar machine setup as the Tcl core was
# compiled with.
......@@ -158,7 +158,7 @@ PKG_CFLAGS = @PKG_CFLAGS@
DEFS = @DEFS@ $(PKG_CFLAGS)
# Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl tkbltConfig.sh
CLEANFILES = @CLEANFILES@
CPPFLAGS = @CPPFLAGS@
......@@ -323,9 +323,9 @@ dist: dist-clean
$(INSTALL_DATA_DIR) $(DIST_DIR)
cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
$(DIST_DIR)/
$(srcdir)/configure.ac $(DIST_DIR)/
chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in
chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
for i in $(srcdir)/*.[ch]; do \
if [ -f $$i ]; then \
......@@ -355,7 +355,7 @@ dist: dist-clean
#========================================================================
# Don't modify the file to clean here. Instead, set the "CLEANFILES"
# variable in configure.in
# variable in configure.ac
#========================================================================
clean:
......@@ -367,6 +367,7 @@ distclean: clean
-rm -f *.tab.c
-rm -f $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log config.status
-rm -rf autom4te.cache
#========================================================================
# Install binary object libraries. On Windows this includes both .dll and
......@@ -414,6 +415,7 @@ install-lib-binaries: binaries
echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
fi
$(INSTALL_DATA) tkbltConfig.sh $(DESTDIR)$(libdir)
#========================================================================
# Install binary executables (e.g. .exe files and dependent .dll files)
......@@ -425,7 +427,7 @@ install-lib-binaries: binaries
#========================================================================
install-bin-binaries: binaries
@$(INSTALL_DATA_DIR)
@$(INSTALL_DATA_DIR) $(DESTDIR)$(bindir)
@list='$(bin_BINARIES)'; for p in $$list; do \
if test -f $$p; then \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
......
This diff is collapsed.
......@@ -7,4 +7,3 @@ builtin(include,tclconfig/tcl.m4)
#
# Add here whatever m4 macros you want to define for your package
#
This diff is collapsed.
#!/bin/bash -norc
dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tcl installation
dnl to configure the system for the local environment.
#-----------------------------------------------------------------------
# Sample configure.ac for Tcl Extensions. The only places you should
# need to modify this file are marked by the string __CHANGE__
#-----------------------------------------------------------------------
#-----------------------------------------------------------------------
# __CHANGE__
# Set your package name and version numbers here.
#
# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION
# set as provided. These will also be added as -D defs in your Makefile
# so you can encode the package version directly into the source files.
# This will also define a special symbol for Windows (BUILD_<PACKAGE_NAME>
# so that we create the export library with the dll.
#-----------------------------------------------------------------------
AC_INIT([tkblt], [3.2])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------
TEA_INIT([3.10])
AC_CONFIG_AUX_DIR(tclconfig)
#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------
TEA_PATH_TCLCONFIG
TEA_LOAD_TCLCONFIG
#--------------------------------------------------------------------
# Load the tkConfig.sh file if necessary (Tk extension)
#--------------------------------------------------------------------
TEA_PATH_TKCONFIG
TEA_LOAD_TKCONFIG
#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
#-----------------------------------------------------------------------
TEA_PREFIX
#-----------------------------------------------------------------------
# Standard compiler checks.
# This sets up CC by using the CC env var, or looks for gcc otherwise.
# This also calls AC_PROG_CC and a few others to create the basic setup
# necessary to compile executables.
#-----------------------------------------------------------------------
TEA_SETUP_COMPILER
#-----------------------------------------------------------------------
# __CHANGE__
# Specify the C source files to compile in TEA_ADD_SOURCES,
# public headers that need to be installed in TEA_ADD_HEADERS,
# stub library C source files to compile in TEA_ADD_STUB_SOURCES,
# and runtime Tcl library files in TEA_ADD_TCL_SOURCES.
# This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS
# and PKG_TCL_SOURCES.
#-----------------------------------------------------------------------
TEA_ADD_SOURCES([
src/tkbltChain.C
src/tkbltConfig.C
src/tkbltGrAxis.C
src/tkbltGrAxisOp.C
src/tkbltGrAxisOption.C
src/tkbltGrBind.C
src/tkbltGrElemOp.C
src/tkbltGrElemOption.C
src/tkbltGrElem.C
src/tkbltGrElemBar.C
src/tkbltGrElemLine.C
src/tkbltGrElemLineSpline.C
src/tkbltGrHairs.C
src/tkbltGrHairsOp.C
src/tkbltGrLegd.C
src/tkbltGrLegdOp.C
src/tkbltGrMarkerOp.C
src/tkbltGrMarkerOption.C
src/tkbltGrMarker.C
src/tkbltGrMarkerLine.C
src/tkbltGrMarkerPolygon.C
src/tkbltGrMarkerText.C
src/tkbltGrMisc.C
src/tkbltGrPenOp.C
src/tkbltGrPenOption.C
src/tkbltGrPen.C
src/tkbltGrPenBar.C
src/tkbltGrPenLine.C
src/tkbltGrPostscript.C
src/tkbltGrPostscriptOp.C
src/tkbltGrPSOutput.C
src/tkbltGrText.C
src/tkbltGrXAxisOp.C
src/tkbltGraph.C
src/tkbltGraphBar.C
src/tkbltGraphLine.C
src/tkbltGraphOp.C
src/tkbltGraphSup.C
src/tkbltInt.C
src/tkbltNsUtil.C
src/tkbltParse.C
src/tkbltOp.C
src/tkbltStubInit.c
src/tkbltStubLib.C
src/tkbltSwitch.C
src/tkbltVecCmd.C
src/tkbltVecOp.C
src/tkbltVecMath.C
src/tkbltVector.C
])
TEA_ADD_HEADERS([
src/tkbltVector.h
src/tkbltDecls.h
])
TEA_ADD_INCLUDES([-I./src])
TEA_ADD_LIBS([-lstdc++])
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([src/tkbltStubLib.C])
TEA_ADD_TCL_SOURCES([library/graph.tcl])
#--------------------------------------------------------------------
# __CHANGE__
#
# You can add more files to clean if your extension creates any extra
# files by extending CLEANFILES.
# Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure
# and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var.
#
# A few miscellaneous platform-specific items:
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------
#CLEANFILES="$CLEANFILES pkgIndex.tcl"
if test "${TEA_PLATFORM}" = "windows" ; then
# Ensure no empty if clauses
:
#TEA_ADD_SOURCES([win/winFile.c])
#TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
else
# Ensure no empty else clauses
:
#TEA_ADD_SOURCES([unix/unixFile.c])
#TEA_ADD_LIBS([-lsuperfly])
fi
#--------------------------------------------------------------------
# __CHANGE__
# Choose which headers you need. Extension authors should try very
# hard to only rely on the Tcl public header files. Internal headers
# contain private data structures and are subject to change without
# notice.
# This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG
#--------------------------------------------------------------------
TEA_PUBLIC_TCL_HEADERS
TEA_PRIVATE_TCL_HEADERS
TEA_PUBLIC_TK_HEADERS
TEA_PRIVATE_TK_HEADERS
TEA_PATH_X
#--------------------------------------------------------------------
# Check whether --enable-threads or --disable-threads was given.
# This auto-enables if Tcl was compiled threaded.
#--------------------------------------------------------------------
TEA_ENABLE_THREADS
#--------------------------------------------------------------------
# The statement below defines a collection of symbols related to
# building as a shared library instead of a static library.
#--------------------------------------------------------------------
TEA_ENABLE_SHARED
#--------------------------------------------------------------------
# This macro figures out what flags to use with the compiler/linker
# when building shared/static debug/optimized objects. This information
# can be taken from the tclConfig.sh file, but this figures it all out.
#--------------------------------------------------------------------
TEA_CONFIG_CFLAGS
#--------------------------------------------------------------------
# Set the default compiler switches based on the --enable-symbols option.
#--------------------------------------------------------------------
TEA_ENABLE_SYMBOLS
#--------------------------------------------------------------------
# This macro generates a line to use when building a library. It
# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
# and TEA_LOAD_TCLCONFIG macros above.
#--------------------------------------------------------------------
TEA_MAKE_LIB
#--------------------------------------------------------------------
# Determine the name of the tclsh and/or wish executables in the
# Tcl and Tk build directories or the location they were installed
# into. These paths are used to support running test cases only,
# the Makefile should not be making use of these paths to generate
# a pkgIndex.tcl file or anything else at extension build time.
#--------------------------------------------------------------------
TEA_PROG_TCLSH
TEA_PROG_WISH
#--------------------------------------------------------------------
# These are for tkbltConfig.sh
#--------------------------------------------------------------------
TEA_EXPORT_CONFIG([tkblt])
#--------------------------------------------------------------------
# Finally, substitute all of the various values into the Makefile.
# You may alternatively have a special pkgIndex.tcl.in or other files
# which require substituting th AC variables in. Include these here.
#--------------------------------------------------------------------
AC_OUTPUT([Makefile pkgIndex.tcl tkbltConfig.sh])
......@@ -229,10 +229,16 @@ TEA_MAKE_LIB
TEA_PROG_TCLSH
TEA_PROG_WISH
#--------------------------------------------------------------------
# These are for tkbltConfig.sh
#--------------------------------------------------------------------
TEA_EXPORT_CONFIG([tkblt])
#--------------------------------------------------------------------
# Finally, substitute all of the various values into the Makefile.
# You may alternatively have a special pkgIndex.tcl.in or other files
# which require substituting th AC variables in. Include these here.
#--------------------------------------------------------------------
AC_OUTPUT([Makefile pkgIndex.tcl])
AC_OUTPUT([Makefile pkgIndex.tcl tkbltConfig.sh])
File mode changed from 100755 to 100644
2016-03-11 Sean Woods <yoda@etoyoc.com>
*tcl.m4 Fixed the search for Tcl and Wish shells under MinGW. Static builds and threaded builds
get an "s" or "t" added to the name.
2015-08-28 Jan Nijtmans <nijtmans@users.sf.net>
* tcl.m4: Rfe [00189c4afc]: Allow semi-static UCRT build on
Windows with VC 14.0
2013-10-08 Jan Nijtmans <nijtmans@users.sf.net>
* tcl.m4: Bug [172223e008]: Wrong filename in
--disable-shared compile on MinGW
2013-10-04 Jan Nijtmans <nijtmans@users.sf.net>
* tcl.m4: stub library is no longer linked with msvcrt??.dll.
2013-10-01 Jan Nijtmans <nijtmans@users.sf.net>
* tcl.m4: Workaround for MinGW bug #2065: "gcc --shared" links
with libgcc_s_dw2-1.dll when using 64-bit division in C
2013-07-04 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Bug [3324676]: AC_PROG_INSTALL incompat,
* tcl.m4: Bug [3324676]: AC_PROG_INSTALL incompat,
Bug [3606445]: Unneeded -DHAVE_NO_SEH=1 when not building on Windows
2013-07-02 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4
* tcl.m4: Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4
(thanks to Brian Griffin)
2013-06-20 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Use X11/Xlib.h for checking where X11 can be found
* tcl.m4: Use X11/Xlib.h for checking where X11 can be found
in stead of X11/XIntrinsic.h. Suggested by Pietro Cerutti.
2013-06-04 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Eliminate NO_VIZ macro as current
* tcl.m4: Eliminate NO_VIZ macro as current
zlib uses HAVE_HIDDEN in stead. One more last-moment
fix for FreeBSD by Pietro Cerutti
2013-05-19 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Fix for FreeBSD, and remove support for old
FreeBSD versions. Patch by Pietro Cerutti
* tcl.m4: Fix for FreeBSD, and remove support for old
FreeBSD versions. Patch by Pietro Cerutti
2013-03-12 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Patch by Andrew Shadura, providing better support for
* tcl.m4: Patch by Andrew Shadura, providing better support for
* three architectures they have in Debian.
2012-08-07 Stuart Cassoff <stwo@users.sourceforge.net>
......
###
# Tcl Parsable version of data from xxxConfig.sh
###
name {@PACKAGE_NAME@}
version {@PACKAGE_VERSION@}
libfile {@PKG_LIB_FILE@}
srcdir {@srcdir@}
prefix {@prefix@}
exec_prefix {@exec_prefix@}
exeext {@EXEEXT@}
tk {@TEA_TK_EXTENSION@}
bindir {@bindir@}
libdir {@libdir@}
includedir {@includedir@}
datarootdir {@datarootdir@}
datadir {@datadir@}
mandir {@mandir@}
cleanfiles {@CLEANFILES@}
AR {@AR@}
CC {@CC@}
CFLAGS {@CFLAGS@}
CFLAGS_DEBUG {@CFLAGS_DEBUG@}
CFLAGS_OPTIMIZE {@CFLAGS_OPTIMIZE@}
CFLAGS_DEFAULT {@CFLAGS_DEFAULT@}
CFLAGS_WARNING {@CFLAGS_WARNING@}
CPPFLAGS {@CPPFLAGS@}
DEFS {@DEFS@ @PKG_CFLAGS@}
EXEEXT {@EXEEXT@}
LDFLAGS {@LDFLAGS@}
LDFLAGS_DEFAULT {@LDFLAGS_DEFAULT@}
LIBS {@PKG_LIBS@ @LIBS@}
MAKE_LIB {@MAKE_LIB@}
MAKE_SHARED_LIB {@MAKE_SHARED_LIB@}
MAKE_STATIC_LIB {@MAKE_STATIC_LIB@}
MAKE_STUB_LIB {@MAKE_STUB_LIB@}
OBJEXT {@OBJEXT@}
PKG_CFLAGS {@PKG_CFLAGS@}
RANLIB {@RANLIB@}
RANLIB_STUB {@RANLIB_STUB@}
SHELL {@SHELL@}
SHARED_BUILD {@SHARED_BUILD@}
SHLIB_CFLAGS {@SHLIB_CFLAGS@}
SHLIB_LD {@SHLIB_LD@}
SHLIB_LD_LIBS {@SHLIB_LD_LIBS@}
SHLIB_SUFFIX {@SHLIB_SUFFIX@}
STLIB_LD {@STLIB_LD@}
TCL_DEFS {@TCL_DEFS@}
TCL_VERSION {@TCL_VERSION@}
TCL_PATCH_LEVEL {@TCL_PATCH_LEVEL@}
TCL_BIN_DIR {@TCL_BIN_DIR@}
TCL_SRC_DIR {@TCL_SRC_DIR@}
TEA_TK_EXTENSION {@TEA_TK_EXTENSION@}
TK_VERSION {@TK_VERSION@}
TK_PATCH_LEVEL {@TK_PATCH_LEVEL@}
TK_BIN_DIR {@TK_BIN_DIR@}
TK_SRC_DIR {@TK_SRC_DIR@}
TEA_PLATFORM {@TEA_PLATFORM@}
TEA_WINDOWINGSYSTEM {@TEA_WINDOWINGSYSTEM@}
TEA_SYSTEM {@TEA_SYSTEM@}
TEACUP_OS {@TEACUP_OS@}
TEACUP_ARCH {@TEACUP_ARCH@}
TEACUP_TOOLSET {@TEACUP_TOOLSET@}
TEACUP_PROFILE {@TEACUP_PROFILE@}
PRACTCL_DEFS {@PRACTCL_DEFS@}
PRACTCL_TOOLSET {@PRACTCL_TOOLSET@}
PRACTCL_SHARED_LIB {@PRACTCL_SHARED_LIB@}
PRACTCL_STATIC_LIB {@PRACTCL_STATIC_LIB@}
PRACTCL_STUB_LIB {@PRACTCL_STUB_LIB@}
PRACTCL_LIBS {@PKG_LIBS@ @LIBS@}
PRACTCL_VC_MANIFEST_EMBED_DLL {@PRACTCL_VC_MANIFEST_EMBED_DLL@}
PRACTCL_VC_MANIFEST_EMBED_EXE {@PRACTCL_VC_MANIFEST_EMBED_EXE@}
PRACTCL_NAME_LIBRARY {@PRACTCL_NAME_LIBRARY@}
PRACTCL_PKG_LIBS {@PKG_LIBS@}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
# tkbltConfig.sh --
#
# This shell script (for sh) is generated automatically by tkblt's
# configure script. It will create shell variables for most of
# the configuration options discovered by the configure script.
# This script is intended to be included by the configure scripts
# for tkblt extensions so that they don't have to figure this all
# out for themselves. This file does not duplicate information
# already provided by tclConfig.sh, so you may need to use that
# file in addition to this one.
#
# The information in this file is specific to a single platform.
# tkblt's version number.
tkblt_VERSION='@PACKAGE_VERSION@'
# The name of the tkblt library (may be either a .a file or a shared library):
tkblt_LIB_FILE=@PKG_LIB_FILE@
# String to pass to linker to pick up the tkblt library from its
# build directory.
tkblt_BUILD_LIB_SPEC='@tkblt_BUILD_LIB_SPEC@'
# String to pass to linker to pick up the tkblt library from its
# installed directory.
tkblt_LIB_SPEC='@tkblt_LIB_SPEC@'
# The name of the tkblt stub library (a .a file):
tkblt_STUB_LIB_FILE=@PKG_STUB_LIB_FILE@
# String to pass to linker to pick up the tkblt stub library from its
# build directory.
tkblt_BUILD_STUB_LIB_SPEC='@tkblt_BUILD_STUB_LIB_SPEC@'
# String to pass to linker to pick up the tkblt stub library from its
# installed directory.
tkblt_STUB_LIB_SPEC='@tkblt_STUB_LIB_SPEC@'
# String to pass to linker to pick up the tkblt stub library from its
# build directory.
tkblt_BUILD_STUB_LIB_PATH='@tkblt_BUILD_STUB_LIB_PATH@'
# String to pass to linker to pick up the tkblt stub library from its
# installed directory.
tkblt_STUB_LIB_PATH='@tkblt_STUB_LIB_PATH@'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment