diff options
| author | andreas_kupries <akupries@shaw.ca> | 2009-07-23 22:49:15 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2009-07-23 22:49:15 (GMT) |
| commit | bd734d2cf44d9550acd5c2ca3e6c5b17f9b03f72 (patch) | |
| tree | bb266e4b6080a9f87761ad98dbe1162bb8e036ad /unix | |
| parent | c1fefc1d02ee22ae574e79cc397b5a477b0efcf4 (diff) | |
| download | tcl-bd734d2cf44d9550acd5c2ca3e6c5b17f9b03f72.zip tcl-bd734d2cf44d9550acd5c2ca3e6c5b17f9b03f72.tar.gz tcl-bd734d2cf44d9550acd5c2ca3e6c5b17f9b03f72.tar.bz2 | |
* generic/tclIO.c (Tcl_GetChannelHandle): Do not crash for
* generic/tclPipe.c (FileForRedirect): getHandleProc == NULL, this
is allowed. Provide a nice error message in the bypass
area. Updated caller to check the bypass for a mesage. This fixes
the bug [Bug 2826248] reported by Andy Sonnenburg
<andy22286@users.sourceforge.net>
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 6 | ||||
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index d210013..2e1dcc6 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.272 2009/07/18 08:16:06 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.273 2009/07/23 22:49:15 andreas_kupries Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -912,8 +912,8 @@ install-private-headers: libraries $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ fi; -Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in - $(SHELL) config.status +#Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in +# $(SHELL) config.status #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in # $(SHELL) config.status diff --git a/unix/configure b/unix/configure index 6b4b375..f490ca6 100755 --- a/unix/configure +++ b/unix/configure @@ -7174,6 +7174,12 @@ fi fi + + # 64bit not requested or not, may still be a 64bit platform. + if test "`uname -m`" = ia64 ; then + SHLIB_LD_LIBS="-L/lib/hpux64 ${SHLIB_LD_LIBS}" +fi + ;; HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 479ea08..28050dd 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1312,7 +1312,13 @@ dnl AC_CHECK_TOOL(AR, ar) CFLAGS="$CFLAGS +DD64" LDFLAGS_ARCH="+DD64" ]) - ]) ;; + ]) + + # 64bit not requested or not, may still be a 64bit platform. + AS_IF([test "`uname -m`" = ia64], [ + SHLIB_LD_LIBS="-L/lib/hpux64 ${SHLIB_LD_LIBS}" + ]) + ;; HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) |