diff options
| author | nijtmans <nijtmans> | 2009-11-23 20:17:36 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2009-11-23 20:17:36 (GMT) |
| commit | 1e53451f28489099ede27c46d8672b7281e44614 (patch) | |
| tree | 9f5d34f3682d12c06c74e9e2929d7b3d4c6afb00 /win/configure.in | |
| parent | a572d7070900a843d0b8cc6c6bee105f8411c90c (diff) | |
| download | tcl-1e53451f28489099ede27c46d8672b7281e44614.zip tcl-1e53451f28489099ede27c46d8672b7281e44614.tar.gz tcl-1e53451f28489099ede27c46d8672b7281e44614.tar.bz2 | |
#undef STATIC_BUILD in tclWin(Dde|Reg).c, in order to make
sure that Xxxxx_Init is always exported even when Tcl is built
static (otherwise we cannot create a DLL).
tclThreadTest.c: Make all functions static, except TclThread_Init.
fCmd.test Enable fCmd-30.1 when registry is available.
tcl.m4 Fix ${SHLIB_LD_LIBS} definition, fix conflicts
configure.in between static libraries and import library on windows.
configure (regenerated)
Makefile.in Simplifications related to tcl.m4 changes.
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/win/configure.in b/win/configure.in index 4f6356e..f8d54ce 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.118 2009/04/30 22:37:46 nijtmans Exp $ +# RCS: @(#) $Id: configure.in,v 1.119 2009/11/23 20:17:36 nijtmans Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.59) @@ -404,22 +404,9 @@ eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\"" eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\"" eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\"" -eval "TCL_STATIC_LIB_FILE=\"${LIBPREFIX}tcl${VER}s${LIBSUFFIX}\"" -eval "TCL_STATIC_LIB_FLAG=\"-ltcl${VER}s${LIBFLAGSUFFIX}\"" - -eval "TCL_IMPORT_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" -eval "TCL_IMPORT_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\"" - -if test ${SHARED_BUILD} = 0 ; then - eval "TCL_LIB_FILE=\"${TCL_STATIC_LIB_FILE}\"" - eval "TCL_LIB_FLAG=\"${TCL_STATIC_LIB_FLAG}\"" -else - eval "TCL_LIB_FILE=\"${TCL_IMPORT_LIB_FILE}\"" - eval "TCL_LIB_FLAG=\"${TCL_IMPORT_LIB_FLAG}\"" -fi -eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` ${TCL_LIB_FLAG}\"" -eval "TCL_LIB_SPEC=\"-L${libdir} ${TCL_LIB_FLAG}\"" - +eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" +eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` -ltcl${VER}${FLAGSUFFIX}\"" +eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\"" # Install time header dir can be set via --includedir eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" |