[tin-dev] [tin 2.6.3] snapshots

[Urs Janßen]

Urs Janßen wrote:
> Thr following should fix this. It didn't show up on other systems
> lacking heapsort() as they have a smater make... (that SINIX is

it doesn't, but the following should

=== modified file 'configure.in'
--- old/configure.in	2023-12-06 09:12:10 +0000
+++ new/configure.in	2023-12-11 19:31:07 +0000
@@ -147,7 +147,7 @@
 	else
 		CF_VERBOSE(will use our own heapsort function)
 		EXTRAO_DEP=''
-		EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/heapsort.o"
+		EXTRAOBJS="\$(OBJDIR)/heapsort.o $EXTRAOBJS"
 	fi
 fi
 if test "x$cf_use_heapsort" = xyes; then
@@ -193,8 +193,8 @@
 CF_WITH_PROGRAM(slrnface,
 [  --with-slrnface         (default: from system path)])
 if test -n "$ac_cv_path_PATH_SLRNFACE"; then
-	EXTRAO_DEP=""
-	EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/xface.o"
+	EXTRAO_DEP=''
+	EXTRAOBJS="\$(OBJDIR)/xface.o $EXTRAOBJS"
 fi
 
 ## Default shell
@@ -542,7 +542,7 @@
 		 use_trace=yes
 		 AC_DEFINE(USE_TRACE,1,[Define this to 1 if we will use ncurses' trace-functions])
 		 EXTRAO_DEP=''
-		 EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o"],
+		 EXTRAOBJS="\$(OBJDIR)/trace.o $EXTRAOBJS"],
 		 use_trace=no)])],
 	[use_trace=no])
 #AC_MSG_CHECKING(if you want debugging-trace)

=== modified file 'src/Makefile.in'
--- old/src/Makefile.in	2023-12-01 13:37:47 +0000
+++ new/src/Makefile.in	2023-12-11 19:45:10 +0000
@@ -213,15 +213,13 @@
 	$(SRCDIR)/wildmat.c \
 	$(SRCDIR)/xref.c
 
-EXTRAOBJS = @EXTRAOBJS@
-
 EXTRA_INTLLIBS = @INTLDIR_MAKE@ @INTLLIBS@
 EXTRA_PCREHDRS = @PCREDIR_MAKE@ ../pcre/pcre.h
 EXTRA_PCRELIBS = @PCREDIR_MAKE@ ../pcre/$(PRELIB)pcre.a
 EXTRA_CANLIBS = @CANDIR_MAKE@ ../libcanlock/$(PRELIB)canlock.a
 EXTRALIBS = $(EXTRA_INTLLIBS) $(EXTRA_PCRELIBS) $(EXTRA_CANLIBS)
 
-OFILES	= @ALLOCA@ $(EXTRAOBJS) \
+OFILES	= @ALLOCA@ @EXTRAOBJS@ \
 	$(OBJDIR)/active$o \
 	$(OBJDIR)/art$o \
 	$(OBJDIR)/attrib$o \
@@ -558,7 +556,6 @@
 $(OBJDIR)/hashstr$o :		$(SRCDIR)/hashstr.c $(TIN_DEP)
 $(OBJDIR)/header$o :		$(SRCDIR)/header.c $(TIN_DEP) \
 				$(INCDIR)/tnntp.h
-$(OBJDIR)/heapsort$o :		$(SRCDIR)/heapsort.c $(TIN_DEP)
 $(OBJDIR)/help$o :		$(SRCDIR)/help.c $(TIN_DEP) \
 				$(INCDIR)/keymap.h
 $(OBJDIR)/inews$o :		$(SRCDIR)/inews.c $(TIN_DEP) \
@@ -649,7 +646,6 @@
 				$(INCDIR)/keymap.h \
 				$(INCDIR)/version.h
 $(OBJDIR)/wildmat$o :		$(SRCDIR)/wildmat.c $(TIN_DEP)
-$(OBJDIR)/xface$o :		$(SRCDIR)/xface.c $(TIN_DEP)
 $(OBJDIR)/xref$o :		$(SRCDIR)/xref.c $(TIN_DEP) \
 				$(INCDIR)/newsrc.h
- at EXTRAO_DEP@$(EXTRAOBJS) :	$(TIN_DEP)
+ at EXTRAO_DEP@@EXTRAOBJS@ :	$(TIN_DEP)