diff options
| author | redman <redman> | 1999-03-11 00:48:54 (GMT) |
|---|---|---|
| committer | redman <redman> | 1999-03-11 00:48:54 (GMT) |
| commit | 69ee2609ee8597545759c164761f5ee1b2dc288a (patch) | |
| tree | 03ede24df75d6b4a4d77d59e57e2462211432f45 /unix | |
| parent | efc437635b611678c18d7f1d2e538bb2efb0ac51 (diff) | |
| download | tk-69ee2609ee8597545759c164761f5ee1b2dc288a.zip tk-69ee2609ee8597545759c164761f5ee1b2dc288a.tar.gz tk-69ee2609ee8597545759c164761f5ee1b2dc288a.tar.bz2 | |
Fix problems with tktest and configuration problems with vs. without
stubs.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 16 | ||||
| -rw-r--r-- | unix/configure.in | 7 |
2 files changed, 13 insertions, 10 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 51ebe72..6cb6c53 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.1.4.5 1999/03/10 07:13:49 stanton Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.1.4.6 1999/03/11 00:48:54 redman Exp $ # Current Tk version; used in various names. @@ -378,17 +378,19 @@ objs: ${OBJS} wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) - $(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(WISH_LIBS) \ - $(TK_CC_SEARCH_FLAGS) -o wish + $(CC) @LD_FLAGS@ $(WISH_OBJS) \ + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) - ${CC} @LD_FLAGS@ $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \ - $(TK_CC_SEARCH_FLAGS) -o tktest + ${CC} @LD_FLAGS@ $(TKTEST_OBJS) \ + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) ${CC} @LD_FLAGS@ test.o tkTest.o tkSquare.o \ - @TK_BUILD_LIB_SPEC@ $(LIBS) \ - @TK_LD_SEARCH_FLAGS@ -lXt -o xttest + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest # Note, in the target below TCL_LIBRARY needs to be set or else # "make test" won't work in the case where the compilation directory diff --git a/unix/configure.in b/unix/configure.in index 36d6798..f0540cb 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.1.4.10 1999/03/10 07:13:50 stanton Exp $ +# RCS: @(#) $Id: configure.in,v 1.1.4.11 1999/03/11 00:48:54 redman Exp $ TK_VERSION=8.1 TK_MAJOR_VERSION=8 @@ -492,11 +492,12 @@ if test "$tk_ok" = "yes" ; then # Don't link Tk directly to Tcl. - SHLIB_LD_LIBS="\${TCL_BUILD_STUB_LIB_SPEC}" + SHLIB_LD_LIBS=${TCL_BUILD_STUB_LIB_SPEC} else AC_MSG_RESULT(dynamic linking) - TCL_BUILD_STUB_LIB_SPEC="" + MAKE_STUB_LIB="\# nothing to do here..." + SHLIB_LD_LIBS=${TCL_BUILD_LIB_SPEC} TCL_STUB_FLAGS="" fi |