diff options
| -rw-r--r-- | win/Makefile.in | 491 | ||||
| -rw-r--r-- | win/aclocal.m4 | 50 | ||||
| -rw-r--r-- | win/configure.in | 3 | ||||
| -rw-r--r-- | win/tkConfig.sh.in | 93 |
4 files changed, 619 insertions, 18 deletions
diff --git a/win/Makefile.in b/win/Makefile.in new file mode 100644 index 0000000..a039727 --- /dev/null +++ b/win/Makefile.in @@ -0,0 +1,491 @@ +# This file is a Makefile for Tk. 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. +# +# RCS: @(#) $Id: Makefile.in,v 1.1 1999/06/16 22:54:03 surles Exp $ + +TCLVERSION = @TCL_VERSION@ +VERSION = @TK_VERSION@ + +#---------------------------------------------------------------- +# Things you can change to personalize the Makefile for your own +# site (you can make these changes in either Makefile.in or +# Makefile, but changes to Makefile will get lost if you re-run +# the configuration script). +#---------------------------------------------------------------- + +# Default top-level directories in which to install architecture- +# specific files (exec_prefix) and machine-independent files such +# as scripts (prefix). The values specified here may be overridden +# at configure-time with the --exec-prefix and --prefix options +# to the "configure" script. + +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +# The following definition can be set to non-null for special systems +# like AFS with replication. It allows the pathnames used for installation +# to be different than those used for actually reference files at +# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix +# when installing files. +INSTALL_ROOT = + +# Directory from which applications will reference the library of Tk +# scripts (note: you can set the TK_LIBRARY environment variable at +# run-time to override this value): +TK_LIBRARY = $(prefix)/lib/tk$(VERSION) + +# Path to use at runtime to refer to LIB_INSTALL_DIR: +LIB_RUNTIME_DIR = $(exec_prefix)/lib + +# Directory in which to install the program wish: +BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin + +# Directory in which to install libtk.so or libtk.a: +LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib + +# Path name to use when installing library scripts: +SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) + +# Directory in which to install the include file tk.h: +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include + +# Top-level directory in which to install manual entries: +MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man + +# Directory in which to install manual entry for wish: +MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1 + +# Directory in which to install manual entries for Tk's C library +# procedures: +MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3 + +# Directory in which to install manual entries for the built-in +# Tk commands: +MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann + +# Libraries built with optimization switches have this additional extension +TK_DBGX = @TK_DBGX@ + +# The directory containing the Tcl source and header files. +TCL_SRC_DIR = @TCL_SRC_DIR@ + +# The directory containing the Tcl library archive file appropriate +# for this version of Tk: +TCL_BIN_DIR = @TCL_BIN_DIR@ + +# The directory containing the Tcl sources and headers appropriate +# for this version of Tk ("srcdir" will be replaced or has already +# been replaced by the configure script): +TCL_GENERIC_DIR = @TCL_SRC_DIR@/../generic + +# This is a switch passed to a Cygwin script that generates file +# names based on the platform. +PATHTYPE = @PATHTYPE@ + +# The name of the Tcl library. +TCL_LIB_FILE = "$(shell cygpath $(PATHTYPE) '@TCL_BIN_DIR@/@TCL_LIB_FILE@')" +TCL_STUB_LIB_FILE = "$(shell cygpath $(PATHTYPE) '@TCL_BIN_DIR@/@TCL_STUB_LIB_FILE@')" + +SRC_DIR = @srcdir@ +ROOT_DIR = $(SRC_DIR)/.. +WIN_DIR = $(SRC_DIR) +UNIX_DIR = $(SRC_DIR)/../unix +GENERIC_DIR = $(SRC_DIR)/../generic +BITMAP_DIR = $(ROOT_DIR)/bitmaps +XLIB_DIR = $(ROOT_DIR)/xlib +RC_DIR = $(WIN_DIR)/rc + +ROOT_DIR_NATIVE = $(shell cygpath $(PATHTYPE) '$(ROOT_DIR)') +WIN_DIR_NATIVE = $(shell cygpath $(PATHTYPE) '$(WIN_DIR)') +GENERIC_DIR_NATIVE = $(shell cygpath $(PATHTYPE) '$(GENERIC_DIR)') +BITMAP_DIR_NATIVE = $(shell cygpath $(PATHTYPE) '$(ROOT_DIR)/bitmaps') +XLIB_DIR_NATIVE = $(shell cygpath $(PATHTYPE) '$(ROOT_DIR)/xlib') +TCL_GENERIC_NATIVE = $(shell cygpath $(PATHTYPE) '$(TCL_GENERIC_DIR)') + +DLLSUFFIX = @DLLSUFFIX@ +LIBSUFFIX = @LIBSUFFIX@ +EXESUFFIX = @EXESUFFIX@ + +TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@ +TK_LIB_FILE = @TK_LIB_FILE@ +TK_DLL_FILE = @TK_DLL_FILE@ + +SHARED_LIBRARIES = $(TK_DLL_FILE) $(TK_STUB_LIB_FILE) +STATIC_LIBRARIES = $(TK_LIB_FILE) + +WISH = wish$(VER)${EXESUFFIX} +TKTEST = tktest${EXEEXT} +CAT32 = cat32 + +@SET_MAKE@ + +# Macro that expands to the first dependency argument with the appropriate +# path type already resolved. + +DEPARG = "$(shell cygpath $(PATHTYPE) $<)" + +# Setting the VPATH variable to a list of paths will cause the +# makefile to look into these paths when resolving .c to .obj +# dependencies. + +VPATH = $(GENERIC_DIR);$(WIN_DIR);$(UNIX_DIR);$(XLIB_DIR);$(RC_DIR) + +# warning flags +CFLAGS_WARNING = @CFLAGS_WARNING@ + +# The default switches for optimization or debugging +CFLAGS_DEBUG = @CFLAGS_DEBUG@ +CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ + +# The default switches for optimization or debugging +LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ + +# To change the compiler switches, for example to change from optimization to +# debugging symbols, change the following line: +#CFLAGS = $(CFLAGS_DEBUG) +#CFLAGS = $(CFLAGS_OPTIMIZE) +#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +CFLAGS = @CFLAGS@ + +AR = @AR@ +CC = @CC@ +RC = @RC@ +AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@ +LDFLAGS_WINDOW = @LDFLAGS_WINDOW@ +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +SHLIB_LD = @SHLIB_LD@ +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(TCL_STUB_LIB_FILE) gdi32.lib comdlg32.lib +SHLIB_CFLAGS = @SHLIB_CFLAGS@ +SHLIB_SUFFIX = @SHLIB_SUFFIX@ +VER = @TK_MAJOR_VERSION@@TK_MINOR_VERSION@ +DOTVER = @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@ +LIBS = @LIBS@ +RMDIR = rm -rf +MKDIR = mkdir -p +RM = rm -f +COPY = cp +CC_OBJNAME = @CC_OBJNAME@ +CC_EXENAME = @CC_EXENAME@ + +CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ +-I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ +-I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \ + -I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS} + +STUB_CC_SWITCHES = ${CC_SWITCHES} -DUSE_TCL_STUBS +CON_CC_SWITCHES = ${CC_SWITCHES} -DCONSOLE + +# Tk used to let the configure script choose which program to use +# for installing, but there are just too many different versions of +# "install" around; better to use the install-sh script that comes +# with the distribution, which is slower but guaranteed to work. + +INSTALL = cp +INSTALL_PROGRAM = ${INSTALL} +INSTALL_DATA = ${INSTALL} + +WISH_OBJS = \ + winMain.$(OBJEXT) + +TKTEST_OBJS = \ + testMain.$(OBJEXT) \ + tkSquare.$(OBJEXT) \ + tkTest.$(OBJEXT) + +XLIB_OBJS = \ + xcolors.$(OBJEXT) \ + xdraw.$(OBJEXT) \ + xgc.$(OBJEXT) \ + ximage.$(OBJEXT) \ + xutil.$(OBJEXT) + +TK_OBJS = \ + tkConsole.$(OBJEXT) \ + tkUnixMenubu.$(OBJEXT) \ + tkUnixScale.$(OBJEXT) \ + $(XLIB_OBJS) \ + tkWin3d.$(OBJEXT) \ + tkWin32Dll.$(OBJEXT) \ + tkWinButton.$(OBJEXT) \ + tkWinClipboard.$(OBJEXT) \ + tkWinColor.$(OBJEXT) \ + tkWinConfig.$(OBJEXT) \ + tkWinCursor.$(OBJEXT) \ + tkWinDialog.$(OBJEXT) \ + tkWinDraw.$(OBJEXT) \ + tkWinEmbed.$(OBJEXT) \ + tkWinFont.$(OBJEXT) \ + tkWinImage.$(OBJEXT) \ + tkWinInit.$(OBJEXT) \ + tkWinKey.$(OBJEXT) \ + tkWinMenu.$(OBJEXT) \ + tkWinPixmap.$(OBJEXT) \ + tkWinPointer.$(OBJEXT) \ + tkWinRegion.$(OBJEXT) \ + tkWinScrlbr.$(OBJEXT) \ + tkWinSend.$(OBJEXT) \ + tkWinTest.$(OBJEXT) \ + tkWinWindow.$(OBJEXT) \ + tkWinWm.$(OBJEXT) \ + tkWinX.$(OBJEXT) \ + stubs.$(OBJEXT) \ + tk3d.$(OBJEXT) \ + tkArgv.$(OBJEXT) \ + tkAtom.$(OBJEXT) \ + tkBind.$(OBJEXT) \ + tkBitmap.$(OBJEXT) \ + tkButton.$(OBJEXT) \ + tkCanvArc.$(OBJEXT) \ + tkCanvBmap.$(OBJEXT) \ + tkCanvImg.$(OBJEXT) \ + tkCanvLine.$(OBJEXT) \ + tkCanvPoly.$(OBJEXT) \ + tkCanvPs.$(OBJEXT) \ + tkCanvText.$(OBJEXT) \ + tkCanvUtil.$(OBJEXT) \ + tkCanvWind.$(OBJEXT) \ + tkCanvas.$(OBJEXT) \ + tkClipboard.$(OBJEXT) \ + tkCmds.$(OBJEXT) \ + tkColor.$(OBJEXT) \ + tkConfig.$(OBJEXT) \ + tkCursor.$(OBJEXT) \ + tkEntry.$(OBJEXT) \ + tkError.$(OBJEXT) \ + tkEvent.$(OBJEXT) \ + tkFileFilter.$(OBJEXT) \ + tkFocus.$(OBJEXT) \ + tkFont.$(OBJEXT) \ + tkFrame.$(OBJEXT) \ + tkGC.$(OBJEXT) \ + tkGeometry.$(OBJEXT) \ + tkGet.$(OBJEXT) \ + tkGrab.$(OBJEXT) \ + tkGrid.$(OBJEXT) \ + tkImage.$(OBJEXT) \ + tkImgBmap.$(OBJEXT) \ + tkImgGIF.$(OBJEXT) \ + tkImgPPM.$(OBJEXT) \ + tkImgPhoto.$(OBJEXT) \ + tkImgUtil.$(OBJEXT) \ + tkListbox.$(OBJEXT) \ + tkMacWinMenu.$(OBJEXT) \ + tkMain.$(OBJEXT) \ + tkMenu.$(OBJEXT) \ + tkMenubutton.$(OBJEXT) \ + tkMenuDraw.$(OBJEXT) \ + tkMessage.$(OBJEXT) \ + tkObj.$(OBJEXT) \ + tkOldConfig.$(OBJEXT) \ + tkOption.$(OBJEXT) \ + tkPack.$(OBJEXT) \ + tkPlace.$(OBJEXT) \ + tkPointer.$(OBJEXT) \ + tkRectOval.$(OBJEXT) \ + tkScale.$(OBJEXT) \ + tkScrollbar.$(OBJEXT) \ + tkSelect.$(OBJEXT) \ + tkText.$(OBJEXT) \ + tkTextBTree.$(OBJEXT) \ + tkTextDisp.$(OBJEXT) \ + tkTextImage.$(OBJEXT) \ + tkTextIndex.$(OBJEXT) \ + tkTextMark.$(OBJEXT) \ + tkTextTag.$(OBJEXT) \ + tkTextWind.$(OBJEXT) \ + tkTrig.$(OBJEXT) \ + tkUtil.$(OBJEXT) \ + tkVisual.$(OBJEXT) \ + tkStubInit.$(OBJEXT) \ + tkStubLib.$(OBJEXT) \ + tkWindow.$(OBJEXT) + +STUB_OBJS = \ + tkStubLib.$(OBJEXT) + +# Main targets. The default target -- all -- builds the binaries, +# performs any post processing on libraries or documents. + +all: binaries libraries doc + +binaries: @LIBRARIES@ $(WISH) + +libraries: + +doc: + +test: binaries $(TKTEST) + TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \ + ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \ + | ./$(CAT32) + +install: all install-binaries install-libraries install-doc install-demos + +install-binaries: + @echo "Install Directories:" + @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ + do \ + echo " $$i"; \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @echo "Installing $(TK_LIB_FILE)" + @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @echo "Installing $(WISH)" + @$(INSTALL_PROGRAM) $(WISH) $(BIN_INSTALL_DIR)/$(WISH) + @echo "Installing tkConfig.sh" + @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh + @if test "$(TK_STUB_LIB_FILE)" != "" ; then \ + echo "Installing $(TK_STUB_LIB_FILE)"; \ + $(INSTALL_DATA) $(TK_STUB_LIB_FILE) \ + $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \ + fi + +install-libraries: + @echo "Install Directories:" + @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ + $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ + do \ + echo " $$i"; \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + do \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + done; + @for i in $(ROOT_DIR)/library/*.tcl $(ROOT_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ + do \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \ + done; + @for i in $(ROOT_DIR)/library/images/*; \ + do \ + if [ -f $$i ] ; then \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/images; \ + fi; \ + done; + +install-demos: + @echo "Install Directories:" + @for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \ + $(SCRIPT_INSTALL_DIR)/demos \ + $(SCRIPT_INSTALL_DIR)/demos/images ; \ + do \ + echo " $$i"; \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @for i in $(ROOT_DIR)/library/demos/*; \ + do \ + if [ -f $$i ] ; then \ + echo "Installing $$i"; \ + sed -e '3 s|exec $(WISH)|exec $(WISH)|' \ + $$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \ + fi; \ + done; + @for i in $(DEMOPROGS); \ + do \ + chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \ + done; + @for i in $(ROOT_DIR)/library/demos/images/*; \ + do \ + if [ -f $$i ] ; then \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \ + fi; \ + done; + +install-doc: + + +$(WISH): $(TK_LIB_FILE) $(WISH_OBJS) wish.res + $(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ + wish.res $(CC_EXENAME) -link $(LDFLAGS_WINDOW) + +$(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.res $(CAT32) + $(CC) $(CFLAGS) $(TKTEST_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ + wish.res $(CC_EXENAME) -link $(LDFLAGS_WINDOW) + +$(CAT32): $(TCL_SRC_DIR)/cat.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) $(CFLAGS) cat32.obj $(CC_EXENAME) -link $(LDFLAGS_CONSOLE) + +# The following targets are configured by autoconf to generate either +# a shared library or static library + +${TK_STUB_LIB_FILE}: ${STUB_OBJS} + @$(RM) ${TK_STUB_LIB_FILE} + @MAKE_LIB@ ${STUB_OBJS} + +${TK_DLL_FILE}: ${TK_OBJS} tk.res + @$(RM) ${TK_DLL_FILE} + @MAKE_DLL@ ${TK_OBJS} tk.res + +${TK_LIB_FILE}: ${TK_OBJS} + @$(RM) ${TK_LIB_FILE} + @MAKE_LIB@ ${TK_OBJS} + +# Special case object file targets + +winMain.obj: winMain.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + +testMain.obj: winMain.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) -DTK_TEST $(CC_OBJNAME) + +tkTest.obj: tkTest.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + +tkSquare.obj: tkSquare.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + +# Add the object extension to the implicit rules. By default .obj is not +# automatically added. + +.SUFFIXES: .${OBJEXT} +.SUFFIXES: .res +.SUFFIXES: .rc + +# Implicit rule for all object files that will end up in the Tcl library + +.c.${OBJEXT}: + $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk ${DEPARG} $(CC_OBJNAME) + +.rc.res: + $(RC) -fo $@ -r -i "$(GENERIC_DIR_NATIVE)" -i "$(TCL_GENERIC_NATIVE)" $< + +depend: + +clean: + $(RM) *.lib *.exp *.dll *.${OBJEXT} *~ \#* TAGS a.out + $(RM) $(WISH) $(TKTEST) + $(RM) *.pch + +distclean: clean + $(RM) Makefile config.status config.cache config.log + +Makefile: Makefile.in + ./config.status diff --git a/win/aclocal.m4 b/win/aclocal.m4 index 9099193..e58d196 100644 --- a/win/aclocal.m4 +++ b/win/aclocal.m4 @@ -13,7 +13,7 @@ # Adds the following arguments to configure: # --with-tcl=... # -# Defines the following vars: +# Sets the following vars: # TCL_BIN_DIR Full path to the tclConfig.sh file #------------------------------------------------------------------------ @@ -34,7 +34,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ if test ! -f $TCL_BIN_DIR/tclConfig.sh; then AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) fi - AC_MSG_RESULT([$TCL_BIN_DIR]) + AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh) ]) #------------------------------------------------------------------------ @@ -51,7 +51,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ # Adds the following arguments to configure: # --with-tk=... # -# Defines the following vars: +# Sets the following vars: # TK_BIN_DIR Full path to the tkConfig.sh file #------------------------------------------------------------------------ @@ -73,7 +73,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ AC_MSG_ERROR(There is no tkConfig.sh in $TK_BIN_DIR: perhaps you did not specify the Tk *build* directory (not the toplevel Tk directory) or you forgot to configure Tk?) fi - AC_MSG_RESULT([$TK_BIN_DIR]) + AC_MSG_RESULT($TK_BIN_DIR/tkConfig.sh) ]) #------------------------------------------------------------------------ @@ -89,12 +89,11 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ # # Results: # -# Sets the following vars that should be in tclConfig.sh: +# Subst the following vars: # TCL_BIN_DIR # TCL_SRC_DIR # TCL_LIB_FILE -# Defines the following vars: -# TCL_THREADS +# #------------------------------------------------------------------------ AC_DEFUN(SC_LOAD_TCLCONFIG, [ @@ -107,9 +106,15 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ AC_MSG_RESULT([file not found]) fi - if test "$TCL_THREADS" = "1"; then - AC_DEFINE(TCL_THREADS) - fi + # The eval is required to do the TCL_DBGX substitution in the + # TCL_LIB_FILE variable. + + eval TCL_LIB_FILE=${TCL_LIB_FILE} + eval TCL_LIB_FLAG=${TCL_LIB_FLAG} + + AC_SUBST(TCL_BIN_DIR) + AC_SUBST(TCL_SRC_DIR) + AC_SUBST(TCL_LIB_FILE) ]) #------------------------------------------------------------------------ @@ -138,6 +143,11 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [ else AC_MSG_RESULT([could not find $TK_BIN_DIR/tkConfig.sh]) fi + + + AC_SUBST(TK_BIN_DIR) + AC_SUBST(TK_SRC_DIR) + AC_SUBST(TK_LIB_FILE) ]) #------------------------------------------------------------------------ @@ -153,7 +163,7 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [ # Adds the following arguments to configure: # --enable-gcc # -# Defines the following vars: +# Sets the following vars: # CC Command to use for the compiler #------------------------------------------------------------------------ @@ -162,6 +172,7 @@ AC_DEFUN(SC_ENABLE_GCC, [ [ok=$enableval], [ok=no]) if test "$ok" = "yes"; then CC=gcc + AC_PROG_CC else CC=cl fi @@ -181,8 +192,11 @@ AC_DEFUN(SC_ENABLE_GCC, [ # --enable-shared=yes|no # # Defines the following vars: +# STATIC_BUILD Used for building import/export libraries +# on Windows. +# +# Sets the following vars: # SHARED_BUILD Value of 1 or 0 -# STATIC_BUILD #------------------------------------------------------------------------ AC_DEFUN(SC_ENABLE_SHARED, [ @@ -223,17 +237,19 @@ AC_DEFUN(SC_ENABLE_SHARED, [ # # Defines the following vars: # TCL_THREADS -# #------------------------------------------------------------------------ AC_DEFUN(SC_ENABLE_THREADS, [ AC_MSG_CHECKING(for building with threads) AC_ARG_ENABLE(threads, [ --enable-threads build with threads], [tcl_ok=$enableval], [tcl_ok=no]) + if test "$tcl_ok" = "yes"; then AC_MSG_RESULT(yes) + TCL_THREADS=1 AC_DEFINE(TCL_THREADS) else + TCL_THREADS=0 AC_MSG_RESULT(no (default)) fi ]) @@ -269,13 +285,13 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no]) if test "$tcl_ok" = "yes"; then - CFLAGS_DEFAULT='${CFLAGS_DEBUG}' - LDFLAGS_DEFAULT='${LDFLAGS_DEBUG}' + CFLAGS_DEFAULT="${CFLAGS_DEBUG}" + LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}" DBGX=d AC_MSG_RESULT([yes]) else - CFLAGS_DEFAULT='${CFLAGS_OPTIMIZE}' - LDFLAGS_DEFAULT='${LDFLAGS_OPTIMIZE}' + CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}" + LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}" DBGX="" AC_MSG_RESULT([no]) fi diff --git a/win/configure.in b/win/configure.in index 7ed424b..96bbd78 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.3 1999/06/16 22:36:51 surles Exp $ +# RCS: @(#) $Id: configure.in,v 1.4 1999/06/16 23:28:46 surles Exp $ AC_INIT(../generic/tk.h) @@ -101,6 +101,7 @@ AC_SUBST(TK_DLL_FILE) AC_SUBST(TK_STUB_LIB_FILE) AC_SUBST(TK_SRC_DIR) AC_SUBST(TK_BIN_DIR) + AC_SUBST(TCL_VERSION) AC_SUBST(TCL_MAJOR_VERSION) AC_SUBST(TCL_MINOR_VERSION) diff --git a/win/tkConfig.sh.in b/win/tkConfig.sh.in new file mode 100644 index 0000000..09e4a90 --- /dev/null +++ b/win/tkConfig.sh.in @@ -0,0 +1,93 @@ +# tkConfig.sh -- +# +# This shell script (for sh) is generated automatically by Tk'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 Tk 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. +# +# RCS: @(#) $Id: tkConfig.sh.in,v 1.1 1999/06/16 22:54:03 surles Exp $ + +# Tk's version number. +TK_VERSION='@TK_VERSION@' +TK_MAJOR_VERSION='@TK_MAJOR_VERSION@' +TK_MINOR_VERSION='@TK_MINOR_VERSION@' +TK_PATCH_LEVEL='@TK_PATCH_LEVEL@' + +# -D flags for use with the C compiler. +TK_DEFS='@DEFS@' + +# Flag, 1: we built a shared lib, 0 we didn't +TK_SHARED_BUILD=@TK_SHARED_BUILD@ + +# This indicates if Tk was build with debugging symbols +TK_DBGX=@TK_DBGX@ + +# The name of the Tk library (may be either a .a file or a shared library): +TK_LIB_FILE='@TK_LIB_FILE@' + +# Additional libraries to use when linking Tk. +TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@' + +# Top-level directory in which Tcl's platform-independent files are +# installed. +TK_PREFIX='@prefix@' + +# Top-level directory in which Tcl's platform-specific files (e.g. +# executables) are installed. +TK_EXEC_PREFIX='@exec_prefix@' + +# -I switch(es) to use to make all of the X11 include files accessible: +TK_XINCLUDES='@XINCLUDES@' + +# Linker switch(es) to use to link with the X11 library archive. +TK_XLIBSW='@XLIBSW@' + +# -l flag to pass to the linker to pick up the Tcl library +TK_LIB_FLAG='@TK_LIB_FLAG@' + +# String to pass to linker to pick up the Tk library from its +# build directory. +TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the Tk library from its +# installed directory. +TK_LIB_SPEC='@TK_LIB_SPEC@' + +# Location of the top-level source directory from which Tk was built. +# This is the directory that contains a README file as well as +# subdirectories such as generic, unix, etc. If Tk was compiled in a +# different place than the directory containing the source files, this +# points to the location of the sources, not the location where Tk was +# compiled. +TK_SRC_DIR='@TK_SRC_DIR@' + +# Needed if you want to make a 'fat' shared library library +# containing tk objects or link a different wish. +TK_CC_SEARCH_FLAGS='@TK_CC_SEARCH_FLAGS@' +TK_LD_SEARCH_FLAGS='@TK_LD_SEARCH_FLAGS@' + +# The name of the Tk stub library (.a): +TK_STUB_LIB_FILE='@TK_STUB_LIB_FILE@' + +# -l flag to pass to the linker to pick up the Tk stub library +TK_STUB_LIB_FLAG='@TK_STUB_LIB_FLAG@' + +# String to pass to linker to pick up the Tk stub library from its +# build directory. +TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' + +# String to pass to linker to pick up the Tk stub library from its +# installed directory. +TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' + +# Path to the Tk stub library in the build directory. +TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' + +# Path to the Tk stub library in the install directory. +TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' |