diff options
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/win/configure.in b/win/configure.in index f7bb113..435caf3 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.17 2000/05/03 00:18:37 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.18 2000/06/13 21:07:35 ericm Exp $ AC_INIT(../generic/tk.h) @@ -75,9 +75,9 @@ AC_SUBST(MAN2TCLFLAGS) SC_ENABLE_SYMBOLS -TK_DBGX=${DBGX} CFLAGS=${CFLAGS_DEFAULT} LDFLAGS=${LDFLAGS_DEFAULT} +TK_DBGX=${DBGX} #-------------------------------------------------------------------- # Locate and source the tclConfig.sh file. @@ -92,15 +92,28 @@ SC_PROG_TCLSH # Perform final evaluations of variables with possible substitutions. #-------------------------------------------------------------------- +TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" +TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" +TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" + eval "TK_SRC_DIR=`cd $srcdir; pwd`" +eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub$VER${LIBSUFFIX}" eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" -eval "TK_LIB_FILE=tk$VER${LIBSUFFIX}" -eval "TK_STUB_LIB_FILE=tkstub$VER${LIBSUFFIX}" +eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" + +eval "TCL_STUB_LIB_FILE=${LIBPREFIX}tclstub$VER${LIBSUFFIX}" eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}" -eval "TCL_LIB_FILE=tcl$VER${LIBSUFFIX}" -eval "TCL_STUB_LIB_FILE=tclstub$VER${LIBSUFFIX}" +eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" + +eval "DLLSUFFIX=${DLLSUFFIX}" +eval "LIBPREFIX=${LIBPREFIX}" +eval "LIBSUFFIX=${LIBSUFFIX}" eval "EXESUFFIX=${EXESUFFIX}" +CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX} +CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX} +CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} + AC_SUBST(TK_VERSION) AC_SUBST(TK_MAJOR_VERSION) AC_SUBST(TK_MINOR_VERSION) @@ -122,13 +135,19 @@ AC_SUBST(TCL_STUB_LIB_FILE) AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_DBGX) - +AC_SUBST(CFG_TK_SHARED_LIB_SUFFIX) +AC_SUBST(CFG_TK_UNSHARED_LIB_SUFFIX) +AC_SUBST(CFG_TK_EXPORT_FILE_SUFFIX) +dnl AC_SUBST(TCL_SHARED_BUILD) AC_SUBST(PATHTYPE) +AC_SUBST(CYGPATH) +AC_SUBST(VPSEP) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(EXTRA_CFLAGS) +AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) @@ -141,13 +160,23 @@ AC_SUBST(LDFLAGS_OPTIMIZE) AC_SUBST(LDFLAGS_CONSOLE) AC_SUBST(LDFLAGS_WINDOW) AC_SUBST(AR) +AC_SUBST(RANLIB) AC_SUBST(RC) +AC_SUBST(RC_OUT) +AC_SUBST(RC_TYPE) +AC_SUBST(RC_INCLUDE) +AC_SUBST(RES) +AC_SUBST(LIBS) +AC_SUBST(LIBS_GUI) AC_SUBST(DLLSUFFIX) +AC_SUBST(LIBPREFIX) AC_SUBST(LIBSUFFIX) AC_SUBST(EXESUFFIX) AC_SUBST(LIBRARIES) AC_SUBST(MAKE_LIB) +AC_SUBST(POST_MAKE_LIB) AC_SUBST(MAKE_DLL) +AC_SUBST(MAKE_EXE) AC_SUBST(TK_XINCLUDES) AC_SUBST(XINCLUDES) |