summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-09-01 12:29:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-09-01 12:29:09 (GMT)
commitfac8128473f66d73695363dedea6746ef6c4e8aa (patch)
tree8a4eb1501b1f743f16bbb9fc194e275d63e326ba /unix/configure
parentcb4d037f18fe2e801256ce75d34695bdabf10a71 (diff)
downloadtk-fac8128473f66d73695363dedea6746ef6c4e8aa.zip
tk-fac8128473f66d73695363dedea6746ef6c4e8aa.tar.gz
tk-fac8128473f66d73695363dedea6746ef6c4e8aa.tar.bz2
Combine TCL_SHLIB_LD_EXTRAS+TK_SHLIB_LD_EXTRAS (for Cygwin and FreeBSD) to a single SHLIB_LD_LIBS usable for both Tcl and Tk
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure6
1 files changed, 2 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index 4bfb919..d1c777d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5144,8 +5144,7 @@ fi
LD_SEARCH_FLAGS=""
TCL_NEEDS_EXP_FILE=1
TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
- TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a'
- TK_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a'
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6
if test "${ac_cv_cygwin+set}" = set; then
@@ -5850,8 +5849,7 @@ fi
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""