diff options
| author | hobbs <hobbs> | 2004-04-07 21:10:17 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-04-07 21:10:17 (GMT) |
| commit | bbbf72f5942c4fca232299946e6169fb4e796bcb (patch) | |
| tree | f8825a69bb1e7e73d6f56e118f422b2a68506ca2 /win | |
| parent | 7c3def8e8104cdeb9a96d6aff4a687642282f559 (diff) | |
| download | tcl-bbbf72f5942c4fca232299946e6169fb4e796bcb.zip tcl-bbbf72f5942c4fca232299946e6169fb4e796bcb.tar.gz tcl-bbbf72f5942c4fca232299946e6169fb4e796bcb.tar.bz2 | |
* win/configure: define TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC,
* win/configure.in: TCL_LIB_SPEC, TCL_PACKAGE_PATH in tclConfig.sh.
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 20 | ||||
| -rw-r--r-- | win/configure.in | 22 |
2 files changed, 33 insertions, 9 deletions
diff --git a/win/configure b/win/configure index 11ae24a..c141665 100755 --- a/win/configure +++ b/win/configure @@ -4082,10 +4082,10 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}" eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" -# FIMXE: These variables decls are missing -#TCL_LIB_FLAG -#TCL_BUILD_LIB_SPEC -#TCL_LIB_SPEC + +eval "TCL_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\"" +eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` ${TCL_LIB_FLAG}\"" +eval "TCL_LIB_SPEC=\"-L${libdir} ${TCL_LIB_FLAG}\"" eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\"" eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\"" @@ -4126,6 +4126,18 @@ else fi fi +#-------------------------------------------------------------------- +# The statements below define the symbol TCL_PACKAGE_PATH, which +# gives a list of directories that may contain packages. The list +# consists of one directory for machine-dependent binaries and +# another for platform-independent scripts. +#-------------------------------------------------------------------- + +if test "$prefix" != "$exec_prefix"; then + TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" +else + TCL_PACKAGE_PATH="${prefix}/lib" +fi diff --git a/win/configure.in b/win/configure.in index c2d5021..bad0cfd 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.79 2004/03/26 19:47:29 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.80 2004/04/07 21:10:17 hobbs Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.57) @@ -378,10 +378,10 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}" eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" -# FIMXE: These variables decls are missing -#TCL_LIB_FLAG -#TCL_BUILD_LIB_SPEC -#TCL_LIB_SPEC + +eval "TCL_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\"" +eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` ${TCL_LIB_FLAG}\"" +eval "TCL_LIB_SPEC=\"-L${libdir} ${TCL_LIB_FLAG}\"" eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\"" eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\"" @@ -422,6 +422,18 @@ else fi fi +#-------------------------------------------------------------------- +# The statements below define the symbol TCL_PACKAGE_PATH, which +# gives a list of directories that may contain packages. The list +# consists of one directory for machine-dependent binaries and +# another for platform-independent scripts. +#-------------------------------------------------------------------- + +if test "$prefix" != "$exec_prefix"; then + TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" +else + TCL_PACKAGE_PATH="${prefix}/lib" +fi AC_SUBST(TCL_VERSION) AC_SUBST(TCL_MAJOR_VERSION) |