summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:36:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:36:36 (GMT)
commit08621b1203b08a12d7d6cd08dfe52028149d65b8 (patch)
treec13453ab87cd5c08764e1a9173f3fd2aea69072c
parentbb5d8271f3be0825aab0d79ebae05f4fc7fb02cd (diff)
downloadtk-08621b1203b08a12d7d6cd08dfe52028149d65b8.zip
tk-08621b1203b08a12d7d6cd08dfe52028149d65b8.tar.gz
tk-08621b1203b08a12d7d6cd08dfe52028149d65b8.tar.bz2
Fix TK_SHLIB_LD_EXTRAS for FreeBSD (and Cygwin), reported by Pietro Cerutti
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
2 files changed, 4 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure
index cd11970..52d2e86 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5145,6 +5145,7 @@ fi
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'
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
@@ -5858,6 +5859,7 @@ fi
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index e9795b8..c57111b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1247,6 +1247,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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'
AC_CACHE_CHECK(for Cygwin version of gcc,
ac_cv_cygwin,
AC_TRY_COMPILE([
@@ -1563,6 +1564,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""