summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:41:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:41:12 (GMT)
commit5d9939831c89629446b58080f3af09729cd719db (patch)
tree7535b19848d8611db0c6546a7bb6d65569cf5b66
parent2ceb7a607771e46bc6889bb04b70d989c78e59ee (diff)
downloadtcl-5d9939831c89629446b58080f3af09729cd719db.zip
tcl-5d9939831c89629446b58080f3af09729cd719db.tar.gz
tcl-5d9939831c89629446b58080f3af09729cd719db.tar.bz2
sync tcl.m4 with Tk version
-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 7f8922b..6800fe2 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6939,6 +6939,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
@@ -7652,6 +7653,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=""