diff options
| -rw-r--r-- | unix/configure.in | 8 | ||||
| -rw-r--r-- | unix/tclConfig.sh.in | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/unix/configure.in b/unix/configure.in index 0aa8848..67e833c 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -1204,8 +1204,7 @@ fi VERSION='${VERSION}' eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}" - -# Trick to replace ${DBGX} with ${TCL_DBGX} in TCL_LIB_FILE def +# Trick to replace DBGX with TCL_DBGX DBGX='${TCL_DBGX}' eval "TCL_LIB_FILE=${TCL_LIB_FILE}" @@ -1220,8 +1219,8 @@ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi -TCL_BUILD_LIB_SPEC="-L`pwd` \${TCL_LIB_FLAG}" -TCL_LIB_SPEC="-L${exec_prefix}/lib \${TCL_LIB_FLAG}" +TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" +TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" #-------------------------------------------------------------------- # The statements below define the symbol TCL_PACKAGE_PATH, which @@ -1243,7 +1242,6 @@ AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX) AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX) -AC_SUBST(CFG_TCL_LIB_FILE) AC_SUBST(TCL_DBGX) AC_SUBST(DL_LIBS) AC_SUBST(DL_OBJS) diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in index 62d5db5..d895177 100644 --- a/unix/tclConfig.sh.in +++ b/unix/tclConfig.sh.in @@ -9,7 +9,7 @@ # # The information in this file is specific to a single platform. # -# SCCS: %Z% $Id: tclConfig.sh.in,v 1.5 1998/07/29 10:30:30 welch Exp $ +# SCCS: %Z% $Id: tclConfig.sh.in,v 1.6 1998/07/29 17:41:12 welch Exp $ # Tcl's version number. TCL_VERSION='@TCL_VERSION@' @@ -35,7 +35,7 @@ TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@' TCL_SHARED_BUILD=@TCL_SHARED_BUILD@ # The name of the Tcl library (may be either a .a file or a shared library): -TCL_LIB_FILE="@TCL_LIB_FILE@" +TCL_LIB_FILE='@TCL_LIB_FILE@' # Additional libraries to use when linking Tcl. TCL_LIBS='@DL_LIBS@ @LIBS@ @MATH_LIBS@' @@ -84,7 +84,7 @@ TCL_COMPAT_OBJS='@LIBOBJS@' TCL_RANLIB='@RANLIB@' # -l flag to pass to the linker to pick up the Tcl library -TCL_LIB_FLAG="@TCL_LIB_FLAG@" +TCL_LIB_FLAG='@TCL_LIB_FLAG@' # String to pass to linker to pick up the Tcl library from its # build directory. |