From a545db1c389dd92b2e9225a7e33c562e47be0ce9 Mon Sep 17 00:00:00 2001 From: ericm Date: Thu, 30 Mar 2000 19:02:31 +0000 Subject: * unix/configure.in: Applied patch from [Bug: 4237]; ensures that srcdir is fully qualified. * unix/Makefile.in: Applied patch from [Bug: 4237]; if tcltest was not compiled, make test/tktest failed. Now it has a rule to build tcltest if it has not been built. FossilOrigin-Name: 382e101a9022d79ef826e6131e7e2c6150da5f15 --- unix/Makefile.in | 12 +++++++++--- unix/configure.in | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 5fa8bcc..e35d14b 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.42 2000/03/02 23:53:07 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.43 2000/03/30 19:02:31 ericm Exp $ # Current Tk version; used in various names. @@ -384,7 +384,13 @@ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish -tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) +# This rule is executed if the user tried to run tktest without first +# building tcltest in the Tcl bin directory. Just do it for them. +${TCL_BIN_DIR}/tcltest: + cd ${TCL_BIN_DIR} ; \ + make tcltest + +tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE) ${CC} @LDFLAGS@ $(TKTEST_OBJS) \ @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest @@ -409,7 +415,7 @@ test: tktest ./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS) # Useful target to launch a built tktest with the proper path,... -runtest: +runtest: tktest LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \ export LD_LIBRARY_PATH; \ LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \ diff --git a/unix/configure.in b/unix/configure.in index e23dfd5..2745e97 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.47 2000/02/10 08:53:16 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.48 2000/03/30 19:02:32 ericm Exp $ TK_VERSION=8.3 TK_MAJOR_VERSION=8 @@ -17,6 +17,8 @@ fi if test "${exec_prefix}" = "NONE"; then exec_prefix=$prefix fi +# Make sure srcdir is fully qualified! +srcdir=`cd $srcdir ; pwd` TK_SRC_DIR=`cd $srcdir/..; pwd` AC_PROG_RANLIB -- cgit v0.12