1 files changed, 7 insertions, 16 deletions
diff --git a/unix/configure.in b/unix/configure.in
index 890c0d4..3439b09 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 Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.38 1999/07/08 01:11:33 redman Exp $
+# RCS: @(#) $Id: configure.in,v 1.39 1999/07/08 03:59:10 wart Exp $
 
 TK_VERSION=8.2
 TK_MAJOR_VERSION=8
@@ -333,15 +333,8 @@ SC_BUGGY_STRTOD
 
 SC_ENABLE_SHARED
 
-#if test "$TK_SHARED_LIB_SUFFIX" = "" ; then
-#    TK_SHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}${SHLIB_SUFFIX}'
-#fi
-#if test "$TK_UNSHARED_LIB_SUFFIX" = "" ; then
-#    TK_UNSHARED_LIB_SUFFIX='${VERSION}\$\{TK_DBGX\}.a'
-#fi
-
-TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
-TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+eval eval "TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}"
+eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}"
 
 TCL_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_LIB_FLAG)'
 TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'
@@ -371,9 +364,9 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
 
 if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
     if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-	TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
+	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
     else
-	TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
+	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
     fi
     TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
     TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
@@ -398,17 +391,15 @@ fi
 
 # Replace ${VERSION} with contents of ${TK_VERSION}
 eval "STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-# Replace DBGX with TK_DBGX
-eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
 
 MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
 
 TK_STUB_LIB_FILE=${STUB_LIB_FILE}
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
+    eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
 else
-    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}"
+    eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}"
 fi
 
 TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"