From 13928ae30a295520395a194031f3bf3cfb1f8348 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 21 Apr 2017 16:53:15 -0400 Subject: Squashed 'tktable/' changes from f427097a..cd66cc43 cd66cc43 minor config change 368ded42 minor config change 7eb4b417 minor config change git-subtree-dir: tktable git-subtree-split: cd66cc437e29b7107160d8102a8ad58ce9c2f497 --- Makefile.in | 2 +- Makefile.in.old | 488 ------------------------------------------------------- configure | 1 + configure.ac | 1 + configure.in.old | 187 --------------------- 5 files changed, 3 insertions(+), 676 deletions(-) delete mode 100644 Makefile.in.old delete mode 100755 configure.in.old diff --git a/Makefile.in b/Makefile.in index 0ab9f24..530add1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,7 +161,7 @@ DEFS = @DEFS@ $(PKG_CFLAGS) \ -DTBL_RUNTIME_DIR=\"$(pkglibdir)\" # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile -CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl tktableConfig.sh +CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl CLEANFILES = @CLEANFILES@ CPPFLAGS = @CPPFLAGS@ diff --git a/Makefile.in.old b/Makefile.in.old deleted file mode 100644 index bec0449..0000000 --- a/Makefile.in.old +++ /dev/null @@ -1,488 +0,0 @@ -# Makefile.in -- -# -# This file is a Makefile for Sample TEA Extension. If it has the name -# "Makefile.in" then it is a template for a Makefile; to generate the -# actual Makefile, run "./configure", which is a configuration script -# generated by the "autoconf" program (constructs like "@foo@" will get -# replaced in the actual Makefile. -# -# Copyright (c) 1999 Scriptics Corporation. -# Copyright (c) 2003-2008 ActiveState Software -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: Makefile.in.old,v 1.1.1.1 2011/03/01 20:00:38 joye Exp $ - -#======================================================================== -# Nothing of the variables below this line need to be changed. Please -# check the TARGETS section below to make sure the make targets are -# correct. -#======================================================================== - -#======================================================================== -# The names of the source files is defined in the configure script. -# The object files are used for linking into the final library. -# This will be used when a dist target is added to the Makefile. -# It is not important to specify the directory, as long as it is the -# $(srcdir) or in the generic, win or unix subdirectory. -#======================================================================== - -PKG_SOURCES = @PKG_SOURCES@ -PKG_OBJECTS = @PKG_OBJECTS@ - -#======================================================================== -# PKG_TCL_SOURCES identifies Tcl runtime files that are associated with -# this package that need to be installed, if any. -#======================================================================== - -PKG_TCL_SOURCES = @PKG_TCL_SOURCES@ - -#======================================================================== -# This is a list of public header files to be installed, if any. -#======================================================================== - -PKG_HEADERS = @PKG_HEADERS@ - -PKG_EXTRA_FILES = license.txt README.txt - -PKG_MAN_PAGES = tkTable.n - -#======================================================================== -# "PKG_LIB_FILE" refers to the library (dynamic or static as per -# configuration options) composed of the named objects. -#======================================================================== - -PKG_LIB_FILE = @PKG_LIB_FILE@ -PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ - -lib_BINARIES = $(PKG_LIB_FILE) -BINARIES = tkTable.tcl.h $(lib_BINARIES) - -SHELL = @SHELL@ - -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ -mandir = @mandir@ -includedir = @includedir@ - -DESTDIR = - -PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) -pkgincludedir = $(includedir)/$(PKG_DIR) - -top_builddir = . - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ - -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -CC = @CC@ -CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ -CFLAGS_WARNING = @CFLAGS_WARNING@ -CLEANFILES = @CLEANFILES@ -EXEEXT = @EXEEXT@ -LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -MAKE_LIB = @MAKE_LIB@ -MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ -MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ -MAKE_STUB_LIB = @MAKE_STUB_LIB@ -OBJEXT = @OBJEXT@ -RANLIB = @RANLIB@ -RANLIB_STUB = @RANLIB_STUB@ -SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ -SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -STLIB_LD = @STLIB_LD@ -TCL_DEFS = @TCL_DEFS@ -TCL_SRC_DIR = @TCL_SRC_DIR@ -TCL_BIN_DIR = @TCL_BIN_DIR@ -TK_SRC_DIR = @TK_SRC_DIR@ -TK_BIN_DIR = @TK_BIN_DIR@ - -# Not used by sample, but retained for reference of what Tcl required -TCL_LIBS = @TCL_LIBS@ -TK_LIBS = @TK_LIBS@ - -#======================================================================== -# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our -# package without installing. The other environment variables allow us -# to test against an uninstalled Tcl. Add special env vars that you -# require for testing here (like TCLX_LIBRARY). -#======================================================================== - -EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ - TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ - @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ - PATH="$(EXTRA_PATH):$(PATH)" \ - TCLLIBPATH="$(top_builddir)" -TCLSH_PROG = @TCLSH_PROG@ -WISH_PROG = @WISH_PROG@ -TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) -WISH = $(TCLSH_ENV) $(WISH_PROG) - -# The local includes must come first, because the TK_XINCLUDES can be -# just a comment -INCLUDES = @PKG_INCLUDES@ \ - @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ - -## NO_EMBEDDED_RUNTIME means that the tkTable.tcl file will not be embedded -## into the executable, thus the default tkTable.tcl library file will not -## be available when the library is loaded. -## If this is defined, the tkTable.tcl file must be available in a -## predefined set of directories (see docs). -#TBL_CFLAGS += -DNO_EMBEDDED_RUNTIME - -## USE_EXIT_HANDLER is necessary for 8.1 before b3 and 8.0 -## It is a work-around for the improper unloading of DLLs when exiting -#TBL_CFLAGS += -DUSE_EXIT_HANDLER - -## NO_SORT_CELLS changes the behavior of certain commands (like curselection) -## to not sort the cells before returning them. If this is not important to -## you, it can cut save significant time for large return sets (> 1000 cells). -## You can always pass the data to [lsort -dictionary $cells] to get the same -## result. -#TBL_CFLAGS += -DNO_SORT_CELLS - -## Experimental, not documented, not complete... -#TBL_CFLAGS += -DPROCS - -## Jeff's magic extra debug flag -#TBL_CFLAGS += -DDEBUG - -PKG_CFLAGS = $(TBL_CFLAGS) @PKG_CFLAGS@ - -DEFS = @DEFS@ $(PKG_CFLAGS) \ - -DTBL_COMMAND=\"table\" \ - -DTBL_RUNTIME=\"tkTable.tcl\" \ - -DTBL_RUNTIME_DIR=\"$(pkglibdir)\" - -CONFIG_CLEAN_FILES = Makefile - -CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ -AR = @AR@ -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -#======================================================================== -# Start of user-definable TARGETS section -#======================================================================== - -#======================================================================== -# TEA TARGETS. Please note that the "libraries:" target refers to platform -# independent files, and the "binaries:" target inclues executable programs and -# platform-dependent libraries. Modify these targets so that they install -# the various pieces of your package. The make and install rules -# for the BINARIES that you specified above have already been done. -#======================================================================== - -all: binaries libraries doc - -#======================================================================== -# The binaries target builds executable programs, Windows .dll's, unix -# shared/static libraries, and any other platform-dependent files. -# The list of targets to build for "binaries:" is specified at the top -# of the Makefile, in the "BINARIES" variable. -#======================================================================== - -binaries: $(BINARIES) pkgIndex.tcl - -libraries: - -doc: - -install: all install-binaries install-libraries install-doc - -install-binaries: binaries install-lib-binaries install-bin-binaries - @mkdir -p $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir) - @list='$(PKG_EXTRA_FILES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ - fi; \ - done - -#======================================================================== -# This rule installs platform-independent files, such as header files. -#======================================================================== - -install-libraries: libraries - -#======================================================================== -# Install documentation. Unix manpages should go in the $(mandir) -# directory. -#======================================================================== - -install-doc: doc - @mkdir -p $(DESTDIR)$(pkglibdir)/html - @list='$(PKG_MAN_PAGES)'; for p in $$list; do \ - html=`basename $$p|sed -e 's/.[^.]*$$//'`.html; \ - $(INSTALL_DATA) $(srcdir)/doc/$$html $(DESTDIR)$(pkglibdir)/html/; \ - done - -html: - cd $(srcdir)/doc; \ - list='$(PKG_MAN_PAGES)'; for p in $$list; do \ - html=`basename $$p|sed -e 's/.[^.]*$$//'`.html; \ - echo "Creating \"$$html\" from \"$$p\""; \ - rm -f $$html; \ - groff -Tascii -man $$p \ - | rman -f HTML \ - > $$html; \ - done - -# Piping to cat is necessary on Windows to see the output, and -# harmless on Unix -test: binaries libraries - $(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) | cat - -demo: binaries libraries - $(WISH) `@CYGPATH@ $(srcdir)/demos/debug.tcl` $(TESTFLAGS) | cat - -shell: binaries libraries - @$(WISH) $(SCRIPT) - -gdb: - $(TCLSH_ENV) gdb $(WISH_PROG) $(SCRIPT) - -depend: - -#======================================================================== -# $(PKG_LIB_FILE) should be listed as part of the BINARIES variable -# mentioned above. That will ensure that this target is built when you -# run "make binaries". -# -# The $(PKG_OBJECTS) objects are created and linked into the final -# library. In most cases these object files will correspond to the -# source files above. -#======================================================================== - -$(PKG_LIB_FILE): $(PKG_OBJECTS) - -rm -f $(PKG_LIB_FILE) - ${MAKE_LIB} - $(RANLIB) $(PKG_LIB_FILE) - -#======================================================================== -# In the following lines, $(srcdir) refers to the toplevel directory -# containing your extension. If your sources are in a subdirectory, -# you will have to modify the paths to reflect this: -# -# tkpkg.$(OBJEXT): $(srcdir)/src/win/tkpkg.c -# $(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/tkpkg.c` -o $@ -# -# Setting the VPATH variable to a list of paths will cause the -# makefile to look into these paths when resolving .c to .obj -# dependencies. -#======================================================================== - -# I added leading $(srcdir) because autoconf 2.53 strips it off -VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win - -# I would prefer to use $< over $?, but FreeBSD's can't handle it, and -# with only one prereq, $? is sufficient -tkTable.tcl.h: $(srcdir)/library/tkTable.tcl - sed -e '/^\#/d' -e '/^$$/d' -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' < `@CYGPATH@ $?` > '$@' || { rm -f $@; exit 1; } - -.SUFFIXES: .c .$(OBJEXT) - -.c.@OBJEXT@: - $(COMPILE) -c `@CYGPATH@ $<` -o $@ - -pkgIndex.tcl: - (\ - echo 'if {[catch {package require Tcl 8.2}]} return';\ - echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ - [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\ - ) > pkgIndex.tcl - -#======================================================================== -# End of user-definable section -#======================================================================== - -#======================================================================== -# Don't modify the file to clean here. Instead, set the "CLEANFILES" -# variable in configure.in -#======================================================================== - -clean: - -test -z "$(BINARIES)" || rm -f $(BINARIES) - -rm -f *.$(OBJEXT) core *.core - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean: clean - -rm -f *.tab.c - -rm -f $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log config.status - -#======================================================================== -# Install binary object libraries. On Windows this includes both .dll and -# .lib files. Because the .lib files are not explicitly listed anywhere, -# we need to deduce their existence from the .dll file of the same name. -# -# You should not have to modify this target. -#======================================================================== - -install-lib-binaries: - @mkdir -p $(DESTDIR)$(pkglibdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ - echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ - ext=`echo $$p|sed -e "s/.*\.//"`; \ - if test "x$$ext" = "xdll"; then \ - lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ - if test -f $$lib; then \ - echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ - $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ - fi; \ - fi; \ - fi; \ - done - @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - destp=`basename $$p`; \ - echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ - fi; \ - done - -#======================================================================== -# Install binary executables (e.g. .exe files) -# -# You should not have to modify this target. -#======================================================================== - -install-bin-binaries: - @mkdir -p $(DESTDIR)$(bindir) - @list='$(bin_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \ - fi; \ - done - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -uninstall-binaries: - list='$(lib_BINARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - p=`basename $$p`; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - list='$(bin_BINARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/$$p; \ - done - -#======================================================================== -# Starkit creation - requires ActiveTcl or compatible tclsh -# You should not have to modify this target. -#======================================================================== - -STARKIT_EXT = .kit.tcl -STARKIT_TCLSH = $(TCLSH) -STARKIT_BASE = tclsh -STARKIT = $(PACKAGE_NAME)$(STARKIT_EXT) - -starkit-clean: - rm -f $(STARKIT) - -starkit: starkit-clean - @echo "Building $(STARKIT)" - (\ - echo 'package require vfs'; \ - echo 'package require Mk4tcl'; \ - echo ''; \ - echo 'set HEADER {#!/bin/sh';\ - echo '# \\'; \ - echo 'exec %1s "$$0" $${1+"$$@"}'; \ - echo 'package require starkit'; \ - echo 'starkit::header mk4 -readonly}'; \ - echo ''; \ - echo 'set HEADER [format "$$HEADER\n%c" [file tail [info nameofexe]] 0x1a]'; \ - echo 'set file "$(STARKIT)"'; \ - echo 'set fid [open $$file w]'; \ - echo 'puts $$fid $$HEADER'; \ - echo 'close $$fid'; \ - echo ''; \ - echo 'vfs::mk4::Mount $$file $$file'; \ - echo 'file copy $(PKG_LIB_FILE) $$file/'; \ - echo 'vfs::unmount $$file'; \ - ) | $(STARKIT_TCLSH) - -#======================================================================== -# Distribution creation -# You should not have to modify this target. -#======================================================================== - -TAR = tar -#COMPRESS = $(TAR) cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar -COMPRESS = $(TAR) zcvf $(PKG_DIR).tar.gz $(PKG_DIR) -DIST_ROOT = /tmp/dist -DIST_DIR = $(DIST_ROOT)/$(PKG_DIR) - -dist-clean: - rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.* - -dist: dist-clean - mkdir -p $(DIST_DIR) - cp -p $(srcdir)/README.* $(srcdir)/*.txt $(srcdir)/ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \ - $(srcdir)/configure $(srcdir)/configure.in $(DIST_DIR)/ - chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4 - chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in - - mkdir $(DIST_DIR)/tclconfig - cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \ - $(DIST_DIR)/tclconfig/ - chmod 664 $(DIST_DIR)/tclconfig/tcl.m4 - chmod +x $(DIST_DIR)/tclconfig/install-sh - - mkdir $(DIST_DIR)/demos - cp -p $(srcdir)/demos/*.{tcl,py,gif} $(DIST_DIR)/demos/ - - mkdir $(DIST_DIR)/doc - cp -p $(srcdir)/doc/*.{html,n} $(DIST_DIR)/doc/ - - mkdir $(DIST_DIR)/generic - cp -p $(srcdir)/generic/*.[ch] $(DIST_DIR)/generic/ - - mkdir $(DIST_DIR)/library - cp -p $(srcdir)/library/*.{tcl,py} $(DIST_DIR)/library/ - - mkdir $(DIST_DIR)/tests - cp -p $(srcdir)/tests/*.{tcl,test} $(DIST_DIR)/tests/ - - mkdir $(DIST_DIR)/unix - cp -p $(srcdir)/unix/tktable.spec $(DIST_DIR)/unix/ - - mkdir $(DIST_DIR)/win - cp -p $(srcdir)/win/makefile.vc $(DIST_DIR)/win/ - - (cd $(DIST_ROOT); $(COMPRESS);) - -.PHONY: all binaries clean depend distclean doc install libraries test - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/configure b/configure index cf3151e..1dbb5d3 100755 --- a/configure +++ b/configure @@ -5761,6 +5761,7 @@ done #-------------------------------------------------------------------- #CLEANFILES="$CLEANFILES pkgIndex.tcl" +CLEANFILES="$CLEANFILES tktableConfig.sh" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : diff --git a/configure.ac b/configure.ac index f7b0686..059e0d4 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,7 @@ TEA_ADD_TCL_SOURCES([library/tkTable.tcl library/tktable.py]) #-------------------------------------------------------------------- #CLEANFILES="$CLEANFILES pkgIndex.tcl" +CLEANFILES="$CLEANFILES tktableConfig.sh" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : diff --git a/configure.in.old b/configure.in.old deleted file mode 100755 index f5d1325..0000000 --- a/configure.in.old +++ /dev/null @@ -1,187 +0,0 @@ -#! /bin/bash -norc -# -# RCS: @(#) $Id: configure.in.old,v 1.1.1.1 2011/03/01 20:00:38 joye Exp $ -# -#-------------------------------------------------------------------- -# Sample configure.in 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. -#----------------------------------------------------------------------- - -AC_INIT([Tktable], [2.10]) - -#-------------------------------------------------------------------- -# 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.7]) - -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, AC_PROG_INSTALL 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([tkTable.c tkTableWin.c tkTableTag.c tkTableEdit.c - tkTableCell.c tkTableCellSort.c tkTableCmds.c tkTableUtil.c]) -# PostScript is on the drawing board -#TEA_ADD_SOURCES([tkTablePs.c]) -# This header isn't really meant for distribution -#TEA_ADD_HEADERS([generic/tkTable.h]) -TEA_ADD_INCLUDES([-I. -I\"`${CYGPATH} ${srcdir}/generic`\"]) -TEA_ADD_CFLAGS([]) -TEA_ADD_STUB_SOURCES([]) -TEA_ADD_TCL_SOURCES([library/tkTable.tcl library/tktable.py]) - -#-------------------------------------------------------------------- -# __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_PATH_TCLCONFIG/TEA_LOAD_TCLCONFIG -#-------------------------------------------------------------------- - -TEA_PUBLIC_TCL_HEADERS -TEA_PUBLIC_TK_HEADERS -#TEA_PRIVATE_TCL_HEADERS -#TEA_PRIVATE_TK_HEADERS - -#-------------------------------------------------------------------- -# For Unix/Tk builds, make sure that the X libraries/headers are found. -#-------------------------------------------------------------------- - -TEA_PATH_X - -#-------------------------------------------------------------------- -# __CHANGE__ -# A few miscellaneous platform-specific items: -# -# Define a special symbol for Windows (BUILD_Tktable in this case) so -# that we create the export library with the dll. -# -# Windows creates a few extra files that need to be cleaned up. -# You can add more files to clean if your extension creates any extra -# files. -# -# TEA_ADD any extra compiler/build info here. -#-------------------------------------------------------------------- - -if test "${TEA_PLATFORM}" = "windows" ; then - AC_DEFINE_UNQUOTED(BUILD_Tktable) - CLEANFILES="pkgIndex.tcl tkTable.tcl.h *.lib *.dll *.exp *.ilk *.pdb *.pch" - TEA_ADD_LIBS([gdi32.lib user32.lib]) -else - CLEANFILES="pkgIndex.tcl tkTable.tcl.h" -fi -AC_SUBST(CLEANFILES) - -#-------------------------------------------------------------------- -# Check whether --enable-threads or --disable-threads was given. -# So far only Tcl responds to this one. -#-------------------------------------------------------------------- - -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 - -#-------------------------------------------------------------------- -# Everyone should be linking against the Tcl stub library. If you -# can't for some reason, remove this definition. If you aren't using -# stubs, you also need to modify the SHLIB_LD_LIBS setting below to -# link against the non-stubbed Tcl library. -#-------------------------------------------------------------------- - -AC_DEFINE(USE_TCL_STUBS) -AC_DEFINE(USE_TK_STUBS) - -#-------------------------------------------------------------------- -# 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 - -#-------------------------------------------------------------------- -# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl -# file during the install process. Don't run the TCLSH_PROG through -# ${CYGPATH} because it's being used directly by make. -# Require that we use a tclsh shell version 8.2 or later since earlier -# versions have bugs in the pkg_mkIndex routine. -#-------------------------------------------------------------------- - -TEA_PROG_TCLSH -TEA_PROG_WISH - -#-------------------------------------------------------------------- -# Finally, substitute all of the various values into the Makefile. -#-------------------------------------------------------------------- - -AC_OUTPUT([Makefile]) -- cgit v0.12