diff options
| author | andreas_kupries <akupries@shaw.ca> | 2009-07-23 23:01:59 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2009-07-23 23:01:59 (GMT) |
| commit | 2bab3ed49e96d767dafcf287960de0598225dfa1 (patch) | |
| tree | 0ab739ed519a0e3f72b491c2b441c7acd6f9c66d /unix | |
| parent | bd734d2cf44d9550acd5c2ca3e6c5b17f9b03f72 (diff) | |
| download | tcl-2bab3ed49e96d767dafcf287960de0598225dfa1.zip tcl-2bab3ed49e96d767dafcf287960de0598225dfa1.tar.gz tcl-2bab3ed49e96d767dafcf287960de0598225dfa1.tar.bz2 | |
Revert series of local changes not relevant to the last commit.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 6 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 |
3 files changed, 4 insertions, 15 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 2e1dcc6..8d56305 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.273 2009/07/23 22:49:15 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.274 2009/07/23 23:02:00 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 f490ca6..a926936 100755 --- a/unix/configure +++ b/unix/configure @@ -7175,11 +7175,6 @@ 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 28050dd..479ea08 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1312,13 +1312,7 @@ 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) |