summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:41:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-25 21:41:48 (GMT)
commit8cb46af23606d4e993cacdaacf5580b2fcfaf42d (patch)
tree4f4ce82b9dcefb9ddf1e108f35de95791cb2387e
parentba25abd391cd3ba24b8a75f1276ac6b9561ee490 (diff)
parent9d0cf098518e48651256d556d750716978ea57df (diff)
downloadtcl-8cb46af23606d4e993cacdaacf5580b2fcfaf42d.zip
tcl-8cb46af23606d4e993cacdaacf5580b2fcfaf42d.tar.gz
tcl-8cb46af23606d4e993cacdaacf5580b2fcfaf42d.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 0e231ab..d3951b6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7008,6 +7008,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
@@ -7741,6 +7742,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 8c29334..cb6704b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1218,6 +1218,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([
@@ -1531,6 +1532,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=""