summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2006-03-02 01:02:27 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2006-03-02 01:02:27 (GMT)
commit45b133684957ab2a31753fb1503c2e7d1d18aa5a (patch)
tree708c1554e7fc4940ea66f3050ee67070dca453cd
parent476a3e28876df91e6dd4b39375fd00f9ee7a5922 (diff)
downloadtk-45b133684957ab2a31753fb1503c2e7d1d18aa5a.zip
tk-45b133684957ab2a31753fb1503c2e7d1d18aa5a.tar.gz
tk-45b133684957ab2a31753fb1503c2e7d1d18aa5a.tar.bz2
* unix/tcl.m4: Fix for tk bug #1334613 to sort out shared library
* unix/configure: issues on NetBSD. Regenerated configure script.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb6ebbc..03abca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-02 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * unix/tcl.m4: Fix for tk bug #1334613 to sort out shared library
+ * unix/configure: issues on NetBSD. Regenerated configure script.
+
2006-02-27 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* generic/tkBitmap.c (Tk_GetBitmapFromData): Improve thread-safety.
diff --git a/unix/configure b/unix/configure
index 4fec79f..7bd69a8 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2747,7 +2747,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 9b86a7b..462a443 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1436,7 +1436,7 @@ dnl AC_CHECK_TOOL(AR, ar)
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""