summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-06-03 17:26:25 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-06-03 17:26:25 (GMT)
commit4c4aed41f6365a2197377d8d5a7a2676ebbe1090 (patch)
tree8ea600d803a9f58c14bb41fa5ba876b2ae155216
parent571f7eeadf502c33718f84705e0c4dc6c49babad (diff)
parent2dd83ab46b70e46cdb3ab9f1f4d2ecfa28d70325 (diff)
downloadtk-core_8_4_20_rc.zip
tk-core_8_4_20_rc.tar.gz
tk-core_8_4_20_rc.tar.bz2
-rw-r--r--doc/TkInitStubs.32
-rwxr-xr-xunix/configure4
-rwxr-xr-xunix/tcl.m44
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/TkInitStubs.3 b/doc/TkInitStubs.3
index 421ed10..274f6fa 100644
--- a/doc/TkInitStubs.3
+++ b/doc/TkInitStubs.3
@@ -1,5 +1,5 @@
'\"
-'\" Copyright (c) 1999 Scriptics Corportation
+'\" Copyright (c) 1999 Scriptics Corporation
'\"
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/unix/configure b/unix/configure
index cb307fb..56ac561 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2926,14 +2926,14 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
if test $doRpath = yes ; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
if test "${TCL_THREADS}" = "1" ; then
# The -pthread needs to go in the LDFLAGS, not LIBS
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 85b8f82..45d19ae 100755
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1564,14 +1564,14 @@ dnl AC_CHECK_TOOL(AR, ar)
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
if test $doRpath = yes ; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
if test "${TCL_THREADS}" = "1" ; then
# The -pthread needs to go in the LDFLAGS, not LIBS