diff options
| author | stanton <stanton> | 1999-02-04 21:00:29 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-02-04 21:00:29 (GMT) |
| commit | db7a3943c3777814d839ee0d6aa509ee82c00e4b (patch) | |
| tree | 6ce0320d1183cb09e5cc7d8ee5582608c58af60b | |
| parent | 45cce1faadfd2d1c5bc1d453fb9c86a22e23fb4b (diff) | |
| download | tk-db7a3943c3777814d839ee0d6aa509ee82c00e4b.zip tk-db7a3943c3777814d839ee0d6aa509ee82c00e4b.tar.gz tk-db7a3943c3777814d839ee0d6aa509ee82c00e4b.tar.bz2 | |
* unix/configure.in: TK_LD_SEARCH_FLAGS was set incorrectly if
SHLIB_LD_LIBS='${LIBS}', and shared linking is performed through
the C compiler. Systems affected are Linux, MP-RAS and NEXTSTEP,
but also with gcc on many more systems. [Bug: 908]
| -rw-r--r-- | unix/configure.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in index 3546419..aed841d 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.25 1999/01/29 00:32:40 rjohnson Exp $ +# RCS: @(#) $Id: configure.in,v 1.26 1999/02/04 21:00:29 stanton Exp $ TK_VERSION=8.0 TK_MAJOR_VERSION=8 @@ -267,7 +267,18 @@ fi # variable LIB_RUNTIME_DIR. eval "TK_CC_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" -TK_LD_SEARCH_FLAGS=`echo ${TK_CC_SEARCH_FLAGS} |sed -e "s|-Wl,||g" -e "s|,| |g"` + +# The following case handles the differences between linking with "ld" +# and the compiler + +case $SHLIB_LD in + *ld*) + TK_LD_SEARCH_FLAGS=`echo ${TK_CC_SEARCH_FLAGS} |sed -e "s|-Wl,||g" -e "s|,| |g"` + ;; + *) + TK_LD_SEARCH_FLAGS="${TK_CC_SEARCH_FLAGS}" + ;; +esac #-------------------------------------------------------------------- # Check for the existence of various libraries. The order here |