- updated to 2.24

[packages/cpmtools.git] / cpmtools-link.patch

--- cpmtools-2.18/configure.in.orig	2014-04-16 19:32:18.657557292 +0200
+++ cpmtools-2.18/configure.in	2014-04-16 19:39:39.014214783 +0200
@@ -62,14 +62,16 @@
 
 dnl Check for curses. If not found, don't build fsed.cpm
 dnl Try both curses and ncurses
-AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm LIBS="-lcurses $LIBS", FSED_CPM=)
+AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lncurses", FSED_CPM=)
 if test x"$FSED_CPM" = x""; then
-  AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm LIBS="-lncurses $LIBS", FSED_CPM=)
+  AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lcurses", FSED_CPM=)
+fi
+AC_CHECK_LIB(tinfo, raw, NCURSESLIBS="$NCURSESLIBS -ltinfo")
+AC_SUBST(NCURSESLIBS)
   if test x"$FSED_CPM" != x""; then
     AC_DEFINE(NEED_NCURSES)
     AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
   fi
-fi
 
 dnl If using libdsk, check it's available. 
 if test "$LIBDSK" != ""; then
--- cpmtools-2.13/Makefile.in.orig	2010-11-16 08:31:59.727101613 +0100
+++ cpmtools-2.13/Makefile.in	2010-11-16 08:32:59.059104128 +0100
@@ -20,6 +20,7 @@
 EXEEXT =        @EXEEXT@
 OBJEXT =        .@OBJEXT@
 LIBS=           @LIBS@ @LDLIBS@
+NCURSESLIBS=	@NCURSESLIBS@
 LDDEPS=		@LDDEPS@
 CPPFLAGS=	@CPPFLAGS@ -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\"
 #
@@ -63,7 +64,7 @@
 		$(CC) $(LDFLAGS) -o $@ fsck.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
 
 fsed.cpm$(EXEEXT):	fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
-		$(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
+		$(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(NCURSESLIBS) $(LIBS)
 
 fsck.test:	fsck.cpm
 		-./fsck.cpm -f ibm-3740 -n badfs/status