summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
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/tcl.m4
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/tcl.m4')
-rw-r--r--unix/tcl.m46
1 files changed, 2 insertions, 4 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 10408a8..5a27062 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1246,8 +1246,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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"
AC_CACHE_CHECK(for Cygwin version of gcc,
ac_cv_cygwin,
AC_TRY_COMPILE([
@@ -1555,8 +1554,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# 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=""