From c512c4a863365012a99172df5bcf256ab52f7cc3 Mon Sep 17 00:00:00 2001 From: joye Date: Thu, 2 Jul 2015 18:55:28 +0000 Subject: *** empty log message *** --- Makefile.in | 14 +++++++------- configure | 8 ++++++-- configure.in | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4c6c774..f1bad27 100755 --- a/Makefile.in +++ b/Makefile.in @@ -114,8 +114,8 @@ STLIB_LD = @STLIB_LD@ #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@ +#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@ @@ -127,8 +127,8 @@ TK_SRC_DIR = @TK_SRC_DIR@ # require for testing here (like TCLX_LIBRARY). #======================================================================== -#EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) -EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) +EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) +#EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ @@ -138,9 +138,9 @@ PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ TCLSH_PROG = @TCLSH_PROG@ TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG) -WISH_ENV = TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` -WISH_PROG = @WISH_PROG@ -WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG) +#WISH_ENV = TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` +#WISH_PROG = @WISH_PROG@ +#WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG) SHARED_BUILD = @SHARED_BUILD@ diff --git a/configure b/configure index e9af0fa..b372ad6 100755 --- a/configure +++ b/configure @@ -9261,8 +9261,12 @@ $as_echo "enabled $tcl_ok debugging" >&6; } # link against the non-stubbed Tcl library. Add Tk too if necessary. #-------------------------------------------------------------------- -#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) -#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs]) + +$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h + + +$as_echo "#define USE_TK_STUBS 1" >>confdefs.h + SHLIB_LD_LIBS='${LIBS} -lstdc++' #-------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 491b712..1a14aff 100755 --- a/configure.in +++ b/configure.in @@ -202,8 +202,8 @@ TEA_ENABLE_SYMBOLS # link against the non-stubbed Tcl library. Add Tk too if necessary. #-------------------------------------------------------------------- -#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) -#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs]) +AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) +AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs]) SHLIB_LD_LIBS='${LIBS} -lstdc++' #-------------------------------------------------------------------- -- cgit v0.12