diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win/configure.in | 35 |
2 files changed, 40 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2000-07-21 Mo DeJong <mdejong@redhat.com> + + * win/configure.in: Define ${prefix} and + ${exec_prefix} like unix/configure.in. + Fix or add TCL_SRC_DIR, TCL_STUB_LIB_FILE, + TCL_STUB_LIB_FLAG, TCL_BUILD_STUB_LIB_SPEC, + TCL_STUB_LIB_SPEC, TCL_BUILD_STUB_LIB_PATH, + TCL_STUB_LIB_PATH. + 2000-07-20 Eric Melski <ericm@ajubasolutions.com> * generic/tclStubInit.c: diff --git a/win/configure.in b/win/configure.in index ea43b56..e767b1b 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,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.24 2000/07/07 11:13:07 mo Exp $ +# RCS: @(#) $Id: configure.in,v 1.25 2000/07/21 16:22:47 mo Exp $ AC_INIT(../generic/tcl.h) @@ -12,6 +12,13 @@ TCL_MINOR_VERSION=4 TCL_PATCH_LEVEL="a1" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION +if test "${prefix}" = "NONE"; then + prefix=/usr/local +fi +if test "${exec_prefix}" = "NONE"; then + exec_prefix=$prefix +fi + #-------------------------------------------------------------------- # Check whether --enable-gcc or --disable-gcc was given. Do this # before AC_PROG_CC and AC_CYGWIN are called so the compiler can @@ -93,10 +100,23 @@ TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -eval "TCL_SRC_DIR=`cd $srcdir/..; pwd`" -eval "TCL_STUB_LIB_FILE=${LIBPREFIX}tclstub$VER${LIBSUFFIX}" -eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}" +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 + +# FIXME: We use LIBSUFFIX (includes ${TCL_DBGX} not g), is that right? +eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\"" +eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBSUFFIX}\"" +eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\"" +eval "TCL_STUB_LIB_SPEC=\"-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}\"" +eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\"" +eval "TCL_STUB_LIB_PATH=\"${exec_prefix}/lib/${TCL_STUB_LIB_FILE}\"" eval "DLLSUFFIX=${DLLSUFFIX}" eval "LIBPREFIX=${LIBPREFIX}" @@ -112,8 +132,15 @@ AC_SUBST(TCL_MAJOR_VERSION) AC_SUBST(TCL_MINOR_VERSION) AC_SUBST(TCL_PATCH_LEVEL) AC_SUBST(TCL_LIB_FILE) +AC_SUBST(TCL_LIB_FLAG) AC_SUBST(TCL_DLL_FILE) AC_SUBST(TCL_STUB_LIB_FILE) +AC_SUBST(TCL_STUB_LIB_FLAG) +AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) +AC_SUBST(TCL_STUB_LIB_SPEC) +AC_SUBST(TCL_BUILD_STUB_LIB_PATH) +AC_SUBST(TCL_STUB_LIB_PATH) + AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_DBGX) |