summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2001-04-25 21:51:06 (GMT)
committermdejong <mdejong>2001-04-25 21:51:06 (GMT)
commit5ba5d121498334fb1b09f603ada829b1b5b0a7f4 (patch)
tree78b95997e5efd4f19be6279d6a6aad6b58b48355
parentd56521d980a50d7e846fb183f51b1e7fee6e606f (diff)
downloadtk-5ba5d121498334fb1b09f603ada829b1b5b0a7f4.zip
tk-5ba5d121498334fb1b09f603ada829b1b5b0a7f4.tar.gz
tk-5ba5d121498334fb1b09f603ada829b1b5b0a7f4.tar.bz2
* unix/configure: Regen.
* unix/configure.in: Use $@ in MAKE_LIB and MAKE_STUB_LIB commands instead of using a delayed subst variable. Replace instances of STUB_LIB_FILE with TK_STUB_LIB_FILE.
-rw-r--r--ChangeLog7
-rwxr-xr-xunix/configure13
-rw-r--r--unix/configure.in13
3 files changed, 19 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 370974b..3d5c748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-04-25 Mo DeJong <mdejong@redhat.com>
+ * unix/configure: Regen.
+ * unix/configure.in: Use $@ in MAKE_LIB and MAKE_STUB_LIB
+ commands instead of using a delayed subst variable. Replace
+ instances of STUB_LIB_FILE with TK_STUB_LIB_FILE.
+
+2001-04-25 Mo DeJong <mdejong@redhat.com>
+
* unix/Makefile.in: Use TCL_STUB_LIB_FILE instead of STUB_LIB_FILE.
* unix/configure: Regen.
* unix/configure.in: Don't subst STUB_LIB_FILE, use TCL_STUB_LIB_FILE
diff --git a/unix/configure b/unix/configure
index be1df67..21c4e19 100755
--- a/unix/configure
+++ b/unix/configure
@@ -537,7 +537,7 @@ else
fi
-# RCS: @(#) $Id: configure.in,v 1.56 2001/04/02 02:08:55 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.57 2001/04/25 20:52:48 mdejong Exp $
TK_VERSION=8.4
TK_MAJOR_VERSION=8
@@ -4128,7 +4128,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
RANLIB=":"
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
@@ -4136,7 +4136,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
else
TK_SHLIB_CFLAGS=""
TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX}
- MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \$@ \${OBJS}"
TCL_STUB_FLAGS=""
fi
@@ -4177,11 +4177,10 @@ TK_SHARED_BUILD=${SHARED_BUILD}
#--------------------------------------------------------------------
# Replace ${VERSION} with contents of ${TK_VERSION}
-eval "STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
+eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
-
-TK_STUB_LIB_FILE=${STUB_LIB_FILE}
+# FIXME: Why don't we use MAKE_STUB_LIB from tclConfig.sh here?
+MAKE_STUB_LIB="ar cr \$@ \${STUB_LIB_OBJS}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
diff --git a/unix/configure.in b/unix/configure.in
index 57085a9..7ca3fe1 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.57 2001/04/25 20:52:48 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.58 2001/04/25 21:51:06 mdejong Exp $
TK_VERSION=8.4
TK_MAJOR_VERSION=8
@@ -334,7 +334,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} -o \[$]@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
RANLIB=":"
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
@@ -342,7 +342,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
else
TK_SHLIB_CFLAGS=""
TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX}
- MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \[$]@ \${OBJS}"
TCL_STUB_FLAGS=""
fi
@@ -383,11 +383,10 @@ TK_SHARED_BUILD=${SHARED_BUILD}
#--------------------------------------------------------------------
# Replace ${VERSION} with contents of ${TK_VERSION}
-eval "STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
+eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
-
-TK_STUB_LIB_FILE=${STUB_LIB_FILE}
+# FIXME: Should we add MAKE_STUB_LIB to tclConfig.sh ?
+MAKE_STUB_LIB="ar cr \[$]@ \${STUB_LIB_OBJS}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"