We partially 'restored' terminfo functions with commit 22c4d82, but i…

…t was a very partial restoration : terminfo.c was not actually compiled/linked into the library on most platforms. Reported by Pavel Stehule, issue #253.

common/libobjs.mif

@@ -5,6 +5,7 @@ PDCURSES_CURSES_H	= $(PDCURSES_SRCDIR)/curses.h
 PDCURSES_CURSPRIV_H	= $(PDCURSES_SRCDIR)/curspriv.h
 PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		= $(PDCURSES_SRCDIR)/panel.h
+TERM_HEADER		= $(PDCURSES_SRCDIR)/term.h
 
 srcdir	= $(PDCURSES_SRCDIR)/pdcurses
 demodir	= $(PDCURSES_SRCDIR)/demos
@@ -15,7 +16,7 @@ getch.$(O) getstr.$(O) getyx.$(O) inch.$(O) inchstr.$(O) \
 initscr.$(O) inopts.$(O) insch.$(O) insstr.$(O) instr.$(O) kernel.$(O) \
 keyname.$(O) mouse.$(O) move.$(O) outopts.$(O) overlay.$(O) pad.$(O) \
 panel.$(O) printw.$(O) refresh.$(O) scanw.$(O) scr_dump.$(O) scroll.$(O) \
-slk.$(O) termattr.$(O) touch.$(O) util.$(O) window.$(O) debug.$(O)
+slk.$(O) termattr.$(O) terminfo.$(O) touch.$(O) util.$(O) window.$(O) debug.$(O)
 
 PDCOBJS = pdcclip.$(O) pdcdisp.$(O) pdcgetsc.$(O) pdckbd.$(O) pdcscrn.$(O) \
 pdcsetsc.$(O) pdcutil.$(O)

common/watcom.mif

@@ -95,7 +95,7 @@ LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj &
     getch.obj getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj &
     insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj &
     outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj &
-    scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj &
+    scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj &
     touch.obj util.obj window.obj debug.obj
 
 PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj &

dos/Makefile.dmc

@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H   = $(PDCURSES_SRCDIR)\curspriv.h
 PDCURSES_HEADERS   = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 
 PANEL_HEADER   = $(PDCURSES_SRCDIR)\panel.h
+TERM_HEADER   = $(PDCURSES_SRCDIR)\term.h
 
 srcdir      = $(PDCURSES_SRCDIR)\pdcurses
 osdir      = $(PDCURSES_SRCDIR)\dos
@@ -52,7 +53,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
 getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
 insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
 outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
-scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
+scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
 touch.obj util.obj window.obj debug.obj
 
 PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -66,6 +67,7 @@ testcurs.obj test_pan.obj tuidemo.obj widetest.obj worm.obj xmas.obj tui.obj
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_DOS_H)
 panel.obj ptest.obj: $(PANEL_HEADER)
+terminfo.obj: $(TERM_HEADER)
 
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
@@ -185,6 +187,9 @@ slk.obj: $(srcdir)\slk.c
 termattr.obj: $(srcdir)\termattr.c
    $(SRCBUILD)
 
+terminfo.obj: $(srcdir)\terminfo.c
+   $(SRCBUILD)
+
 touch.obj: $(srcdir)\touch.c
    $(SRCBUILD)
 

os2/Makefile

@@ -101,6 +101,7 @@ $(LIBOBJS) $(PDCOBJS) $(DEMOOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_OS2_H)
 $(DEMOS) : $(LIBCURSES)
 panel.o ptest.o: $(PANEL_HEADER)
+terminfo.o: $(TERM_HEADER)
 
 $(LIBOBJS) : %.o: $(srcdir)/%.c
 	$(CC) -c $(CFLAGS) -o$@ $<

os2/Makefile.bcc

@@ -53,7 +53,7 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 +inopts.obj +insch.obj +insstr.obj +instr.obj +kernel.obj +keyname.obj \
 +mouse.obj +move.obj +outopts.obj +overlay.obj +pad.obj +panel.obj \
 +printw.obj +refresh.obj +scanw.obj +scr_dump.obj +scroll.obj +slk.obj \
-+termattr.obj +touch.obj +util.obj +window.obj +debug.obj \
++termattr.obj +terminfo.obj +touch.obj +util.obj +window.obj +debug.obj \
 +pdcclip.obj +pdcdisp.obj +pdcgetsc.obj +pdckbd.obj +pdcscrn.obj \
 +pdcsetsc.obj +pdcutil.obj ,lib.map
 	-copy $(LIBCURSES) panel.lib

os2/iccos2.lrf

@@ -34,6 +34,7 @@
 -+scroll.obj &
 -+slk.obj &
 -+termattr.obj &
+-+terminfo.obj &
 -+touch.obj &
 -+util.obj &
 -+window.obj &

os2/iccos2.mak

@@ -160,6 +160,9 @@ slk.obj: $(srcdir)\slk.c $(PDCURSES_HEADERS)
 termattr.obj: $(srcdir)\termattr.c $(PDCURSES_HEADERS)
 	$(BUILD) $(srcdir)\termattr.c
 
+terminfo.obj: $(srcdir)\terminfo.c $(PDCURSES_HEADERS) $(TERM_HEADER)
+	$(BUILD) $(srcdir)\terminfo.c
+
 touch.obj: $(srcdir)\touch.c $(PDCURSES_HEADERS)
 	$(BUILD) $(srcdir)\touch.c
 

sdl1/Makefile

@@ -99,6 +99,7 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_SDL_H)
 $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
 tui.o tuidemo.o : $(PDCURSES_CURSES_H)
+terminfo.o : $(TERM_HEADER)
 panel.o ptest: $(PANEL_HEADER)
 
 $(LIBOBJS) : %.o: $(srcdir)/%.c

vt/Makefile

@@ -124,6 +124,7 @@ endif
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES)
 tui.o tuidemo.o : $(PDCURSES_CURSES_H)
+terminfo.o : $(TERM_HEADER)
 panel.o ptest: $(PANEL_HEADER)
 
 $(LIBOBJS) : %.o: $(srcdir)/%.c

vt/Makefile.dmc

@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H   = $(PDCURSES_SRCDIR)\curspriv.h
 PDCURSES_HEADERS   = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 
 PANEL_HEADER   = $(PDCURSES_SRCDIR)\panel.h
+TERM_HEADER   = $(PDCURSES_SRCDIR)\term.h
 
 srcdir      = $(PDCURSES_SRCDIR)\pdcurses
 osdir      = $(PDCURSES_SRCDIR)\vt
@@ -55,7 +56,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
 getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
 insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
 outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
-scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
+scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
 touch.obj util.obj window.obj debug.obj
 
 PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -68,6 +69,7 @@ testcurs.obj test_pan.obj tuidemo.obj widetest.obj worm.obj xmas.obj tui.obj
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_VT_H)
 panel.obj ptest.obj: $(PANEL_HEADER)
+terminfo.obj: $(TERM_HEADER)
 
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
@@ -187,6 +189,9 @@ slk.obj: $(srcdir)\slk.c
 termattr.obj: $(srcdir)\termattr.c
    $(SRCBUILD)
 
+terminfo.obj: $(srcdir)\terminfo.c
+   $(SRCBUILD)
+
 touch.obj: $(srcdir)\touch.c
    $(SRCBUILD)
 

vt/Makefile.vc

@@ -101,6 +101,7 @@ $(PDCOBJS) : $(PDCURSES_WIN_H)
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
 panel.obj : $(PANEL_HEADER)
+terminfo.obj : $(TERM_HEADER)
 
 !ifndef DLL
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)

wincon/Makefile.dmc

@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H	= $(PDCURSES_SRCDIR)\curspriv.h
 PDCURSES_HEADERS	= $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 
 PANEL_HEADER	= $(PDCURSES_SRCDIR)\panel.h
+TERM_HEADER	= $(PDCURSES_SRCDIR)\term.h
 
 srcdir		= $(PDCURSES_SRCDIR)\pdcurses
 osdir		= $(PDCURSES_SRCDIR)\wincon
@@ -50,7 +51,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
 getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
 insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
 outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
-scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
+scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
 touch.obj util.obj window.obj debug.obj
 
 PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -65,6 +66,7 @@ LIBS = winmm.lib
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_WIN_H)
 panel.obj ptest.obj: $(PANEL_HEADER)
+term.obj : $(TERM_HEADER)
 
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
@@ -185,6 +187,9 @@ slk.obj: $(srcdir)\slk.c
 termattr.obj: $(srcdir)\termattr.c
 	$(SRCBUILD)
 
+terminfo.obj: $(srcdir)\terminfo.c
+	$(SRCBUILD)
+
 touch.obj: $(srcdir)\touch.c
 	$(SRCBUILD)
 

wingui/Makefile.dmc

@@ -12,6 +12,7 @@ PDCURSES_CURSPRIV_H   = $(PDCURSES_SRCDIR)\curspriv.h
 PDCURSES_HEADERS   = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 
 PANEL_HEADER   = $(PDCURSES_SRCDIR)\panel.h
+TERM_HEADER   = $(PDCURSES_SRCDIR)\term.h
 
 srcdir      = $(PDCURSES_SRCDIR)\pdcurses
 osdir      = $(PDCURSES_SRCDIR)\wingui
@@ -51,7 +52,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
 getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
 insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \
 outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \
-scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \
+scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \
 touch.obj util.obj window.obj debug.obj
 
 PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
@@ -66,6 +67,7 @@ LIBS = advapi32.lib gdi32.lib user32.lib shell32.lib comdlg32.lib winmm.lib
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_WIN_H)
 panel.obj ptest.obj: $(PANEL_HEADER)
+terminfo.obj : $(TERM_HEADER)
 
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
@@ -186,6 +188,9 @@ slk.obj: $(srcdir)\slk.c
 termattr.obj: $(srcdir)\termattr.c
    $(SRCBUILD)
 
+terminfo.obj: $(srcdir)\terminfo.c
+   $(SRCBUILD)
+
 touch.obj: $(srcdir)\touch.c
    $(SRCBUILD)
 

wingui/Makefile.vc

@@ -101,6 +101,7 @@ $(PDCOBJS) : $(PDCURSES_WIN_H)
 $(DEMOOBJS) : $(PDCURSES_CURSES_H)
 $(DEMOS) : $(LIBCURSES)
 panel.obj : $(PANEL_HEADER)
+terminfo.obj : $(TERM_HEADER)
 
 !ifndef DLL
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)