From 89420b81b99afdd1c68f441f4a099c2d9e4e290a Mon Sep 17 00:00:00 2001 From: hobbs Date: Tue, 21 Sep 1999 04:21:26 +0000 Subject: * unix/Makefile.in: fixed gendate target - this never worked since RCS was intro'd. * unix/tcl.m4: * unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070] and fix for IRIX SHLIB_LB_LIBS. [Bug: 2610] --- unix/Makefile.in | 5 +++-- unix/aclocal.m4 | 4 ++-- unix/tcl.m4 | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index ed7422f..2138e82 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.45 1999/08/19 03:00:26 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.46 1999/09/21 04:21:26 hobbs Exp $ VERSION = @TCL_VERSION@ @@ -461,9 +461,10 @@ topDirName: gendate: yacc -l $(GENERIC_DIR)/tclGetDate.y sed -e 's/yy/TclDate/g' -e '/^#include /d' \ - -e "s/SCCSID/RCS: @(#) \$Id\$" + -e 's/SCCSID/RCS: @(#) $$Id: Makefile.in,v 1.46 1999/09/21 04:21:26 hobbs Exp $$/' \ -e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \ -e '/TclDatenewstate:/d' -e '/#pragma/d' \ + -e '/#include /d' \ $(GENERIC_DIR)/tclDate.c rm y.tab.c diff --git a/unix/aclocal.m4 b/unix/aclocal.m4 index a04638b..40cb6eb 100644 --- a/unix/aclocal.m4 +++ b/unix/aclocal.m4 @@ -646,7 +646,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ IRIX-5.*|IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" SHLIB_LD="ld -n32 -shared -rdata_shared" - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -726,7 +726,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LDFLAGS="-Wl,-Bexport" LD_SEARCH_FLAGS="" ;; - NetBSD-*|FreeBSD-[[12]].*|OpenBSD-*) + NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ SHLIB_CFLAGS="-fpic" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a04638b..40cb6eb 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -646,7 +646,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ IRIX-5.*|IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" SHLIB_LD="ld -n32 -shared -rdata_shared" - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -726,7 +726,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ LDFLAGS="-Wl,-Bexport" LD_SEARCH_FLAGS="" ;; - NetBSD-*|FreeBSD-[[12]].*|OpenBSD-*) + NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ SHLIB_CFLAGS="-fpic" -- cgit v0.12