From 1c041c5380b764bed95e621f15a17c24a2d558e4 Mon Sep 17 00:00:00 2001 From: mdejong Date: Tue, 29 Jan 2002 08:23:36 +0000 Subject: * unix/configure.in: Don't set TCL_LIB_SPEC and TCL_STUB_LIB_SPEC variables since this breaks the AIX build. This was used in the past to support linking with Tcl from the build dir or the install dir, but it is no longer needed. --- ChangeLog | 9 +++++++++ unix/configure | 3 --- unix/configure.in | 5 +---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 253e632..1da82a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2002-01-28 Mo DeJong + * unix/configure: Regen. + * unix/configure.in: Don't set TCL_LIB_SPEC and + TCL_STUB_LIB_SPEC variables since this breaks + the AIX build. This was used in the past to + support linking with Tcl from the build dir + or the install dir, but it is no longer needed. + +2002-01-28 Mo DeJong + * unix/Makefile.in: Remove commented out vars. * unix/configure: Regen. * unix/configure.in: Don't subst vars that are already diff --git a/unix/configure b/unix/configure index 27238d5..5f87529 100755 --- a/unix/configure +++ b/unix/configure @@ -4420,9 +4420,6 @@ EOF 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)' - if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} diff --git a/unix/configure.in b/unix/configure.in index 0a67215..a5c65a5 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. # -# RCS: @(#) $Id: configure.in,v 1.68 2002/01/29 08:04:37 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.69 2002/01/29 08:23:36 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -345,9 +345,6 @@ SC_ENABLE_SHARED 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)' - if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} -- cgit v0.12