summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-02-19 23:52:45 (GMT)
committerhobbs <hobbs>2007-02-19 23:52:45 (GMT)
commit18bcf9971777b9bf6d2eacd064c42f0f7e58ae47 (patch)
treec5e791bd9b1eaff57d9ba29b24ce6a592d2ac49c
parentde9611c48d37dc29f0c06e2f04705c60d0c2b85f (diff)
downloadtk-18bcf9971777b9bf6d2eacd064c42f0f7e58ae47.zip
tk-18bcf9971777b9bf6d2eacd064c42f0f7e58ae47.tar.gz
tk-18bcf9971777b9bf6d2eacd064c42f0f7e58ae47.tar.bz2
* unix/tcl.m4: use SHLIB_SUFFIX=".so" on HP-UX ia64 arch.
* unix/configure: autoconf-2.59
-rw-r--r--ChangeLog8
-rwxr-xr-xunix/configure6
-rw-r--r--unix/tcl.m46
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a5cf46c..98ae25a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-19 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * unix/tcl.m4: use SHLIB_SUFFIX=".so" on HP-UX ia64 arch.
+ * unix/configure: autoconf-2.59
+
+ * library/tkfbox.tcl (::tk::IconList_Goto): avoid goto issues in
+ empty dirs. [Bug 1662959]
+
2007-02-09 Joe Mistachkin <joe@mistachkin.com>
* win/nmakehlp.c: Properly cleanup after nmakehlp, including the
diff --git a/unix/configure b/unix/configure
index d9d80cc..9487ac3 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5174,7 +5174,11 @@ _ACEOF
LIBS="$LIBS -lxnet" # Use the XOPEN network library
- SHLIB_SUFFIX=".sl"
+ if test "`uname -m`" = "ia64" ; then
+ SHLIB_SUFFIX=".so"
+ else
+ SHLIB_SUFFIX=".sl"
+ fi
echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 1a19fce..1ca5af3 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1291,7 +1291,11 @@ dnl AC_CHECK_TOOL(AR, ar)
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?])
LIBS="$LIBS -lxnet" # Use the XOPEN network library
- SHLIB_SUFFIX=".sl"
+ if test "`uname -m`" = "ia64" ; then
+ SHLIB_SUFFIX=".so"
+ else
+ SHLIB_SUFFIX=".sl"
+ fi
AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
if test "$tcl_ok" = yes; then
SHLIB_CFLAGS="+z"