summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authormdejong <mdejong>2002-01-29 08:04:37 (GMT)
committermdejong <mdejong>2002-01-29 08:04:37 (GMT)
commit898a4f73b7810f4318b7c61fc162c73febd261c8 (patch)
tree8c0b17877985f3cf55753cb76dcffc8a1c9da402 /unix/tcl.m4
parentfe24d04c6483292efc629c4542d61f514fb33ba4 (diff)
downloadtk-898a4f73b7810f4318b7c61fc162c73febd261c8.zip
tk-898a4f73b7810f4318b7c61fc162c73febd261c8.tar.gz
tk-898a4f73b7810f4318b7c61fc162c73febd261c8.tar.bz2
* unix/Makefile.in: Remove commented out vars.
* unix/configure: Regen. * unix/configure.in: Don't subst vars that are already taken care of in SC_LOAD_TCLCONFIG. * unix/tcl.m4: Update from Tcl. * win/configure: Regen. * win/tcl.m4: Update from Tcl.
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m434
1 files changed, 30 insertions, 4 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 7b59a80..76eeace 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -219,17 +219,43 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
fi
#
+ # If the TCL_BIN_DIR is the build directory (not the install directory),
+ # then set the common variable name to the value of the build variables.
+ # For example, the variable TCL_LIB_SPEC will be set to the value
+ # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+ # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+ # installed and uninstalled version of Tcl.
+ #
+
+ if test -f $TCL_BIN_DIR/Makefile ; then
+ TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+ TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+ TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+ fi
+
+ #
# eval is required to do the TCL_DBGX substitution
#
- eval TCL_LIB_FILE=${TCL_LIB_FILE}
- eval TCL_LIB_FLAG=${TCL_LIB_FLAG}
- eval TCL_STUB_LIB_FILE=${TCL_STUB_LIB_FILE}
- eval TCL_STUB_LIB_FLAG=${TCL_STUB_LIB_FLAG}
+ eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+ eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+ eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+
+ eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+ eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+ eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+ AC_SUBST(TCL_VERSION)
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_SRC_DIR)
+
AC_SUBST(TCL_LIB_FILE)
+ AC_SUBST(TCL_LIB_FLAG)
+ AC_SUBST(TCL_LIB_SPEC)
+
+ AC_SUBST(TCL_STUB_LIB_FILE)
+ AC_SUBST(TCL_STUB_LIB_FLAG)
+ AC_SUBST(TCL_STUB_LIB_SPEC)
])
#------------------------------------------------------------------------