diff options
| author | jenglish <jenglish@flightlab.com> | 2005-01-30 18:38:51 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2005-01-30 18:38:51 (GMT) |
| commit | 7dd48ea53b8ed4c3b4d60859692eacef9888d649 (patch) | |
| tree | 540bb6c79751ae1a947243d7dcb709e9a89e59c0 | |
| parent | 46d71e8de0a65f1856b0ca9201420ba435bf92a7 (diff) | |
| download | tcl-7dd48ea53b8ed4c3b4d60859692eacef9888d649.zip tcl-7dd48ea53b8ed4c3b4d60859692eacef9888d649.tar.gz tcl-7dd48ea53b8ed4c3b4d60859692eacef9888d649.tar.bz2 | |
Restored two double-evals that were removed in the DBGX purge.
These are still needed on some platforms to account for TCL_TRIM_DOTS.
[Bug 1112654]
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | unix/configure.in | 10 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2005-01-30 Joe English <jenglish@users.sourceforge.net> + + * unix/configure.in: Restored two double-evals that were + removed in the DBGX purge; these are still needed on some + platforms to account for TCL_TRIM_DOTS. [Bug 1112654] + + * unix/configure: NOT REGENERATED: only have autoconf 2.59 here, + need to find someone with autoconf 2.57. + 2005-01-28 Jeff Hobbs <jeffh@ActiveState.com> * unix/configure, unix/tcl.m4: add solaris 64-bit gcc build diff --git a/unix/configure.in b/unix/configure.in index 67efaeb..9cfcbd9 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.126 2005/01/10 18:43:37 jenglish Exp $ +# RCS: @(#) $Id: configure.in,v 1.127 2005/01/30 18:38:55 jenglish Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.57) @@ -439,7 +439,10 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" SC_ENABLE_FRAMEWORK # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed -# so that the backslashes quoting the DBX braces are dropped. +# since on some platforms TCL_LIB_FILE contains shell escapes. +# (See also: TCL_TRIM_DOTS). + +eval "TCL_LIB_FILE=${TCL_LIB_FILE}" # Note: in the following variable, it's important to use the absolute # path name of the Tcl directory rather than "..": this is because @@ -498,7 +501,10 @@ fi #-------------------------------------------------------------------- # Replace ${VERSION} with contents of ${TCL_VERSION} +# double-eval to account for TCL_TRIM_DOTS. +# eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" +eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" |