summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--unix/tcl.m45
-rw-r--r--win/tcl.m47
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5765f17..e745183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-16 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/tcl.m4 (SC_LOAD_TCLCONFIG):
+ * win/tcl.m4 (SC_LOAD_TCLCONFIG): Subst TCL_DBGX
+ into TCL_STUB_LIB_FILE and TCL_STUB_LIB_FLAG
+ variables so that an extension does not need
+ to subst TCL_DBGX into its makefile. [Tk Bug 504356]
+
2002-01-16 Don Porter <dgp@users.sourceforge.net>
* doc/ParseCmd.3 (Tcl_ParseVar):
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 2b146e7..7b59a80 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -219,12 +219,13 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
fi
#
- # The eval is required to do the TCL_DBGX substitution in the
- # TCL_LIB_FILE variable
+ # 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}
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_SRC_DIR)
diff --git a/win/tcl.m4 b/win/tcl.m4
index d835e06..de9ddbf 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -106,11 +106,14 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
AC_MSG_RESULT([file not found])
fi
- # The eval is required to do the TCL_DBGX substitution in the
- # TCL_LIB_FILE variable.
+ #
+ # 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}
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCL_SRC_DIR)