Rebuild configure and defs.h.in from new configure.in, and update code to match.

This simplifies the inclusion logic in ircterm.h, and updates term.c to include
term.h if available.  This removes the declarations for setupterm(), tigetstr(),
tigetnum(), tigetflag(), tgetent(), tgetstr(), tgetnum() and tgetflag() from
term.c as those should be defined in term.h or termcap.h.

This should make the system declaration of tparm() available to term.c, which
will fix a crash on NetBSD x86-64 caused by the implicit declaration of tparm()
having a return type of 'int' while the real function has a return type of
'char *'.

We have to include term.h in term.c, not in ircterm.h because term.h defines
a large number of macros, at least two of which ('lines' and 'goto_window')
conflict with names in use in the rest of the codebase.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@435 13b04d17-f746-0410-82c6-800466cd88b0

include/defs.h.in

@@ -159,6 +159,9 @@
 /* Define to 1 if you have the <ncurses/termcap.h> header file. */
 #undef HAVE_NCURSES_TERMCAP_H
 
+/* Define to 1 if you have the <ncurses/term.h> header file. */
+#undef HAVE_NCURSES_TERM_H
+
 /* Define to 1 if you have the <ndir.h> header file. */
 #undef HAVE_NDIR_H
 
@@ -297,11 +300,11 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
-/* Define this if you have the tparm function in an included lib. */
-#undef HAVE_TPARM
+/* Define to 1 if you have the <term.h> header file. */
+#undef HAVE_TERM_H
 
-/* Define this if you have the tputs function in an included lib. */
-#undef HAVE_TPUTS
+/* Define to 1 if you have the `tparm' function. */
+#undef HAVE_TPARM
 
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
@@ -396,12 +399,6 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define this if tparm is declared in termcap.h. */
-#undef TPARM_DECLARED
-
-/* Define this if tputs is declared in termcap.h. */
-#undef TPUTS_DECLARED
-
 /* Define your maildir here. */
 #undef UNIX_MAIL
 

include/ircterm.h

@@ -13,23 +13,18 @@
 #ifndef IRCTERM_H_
 # define IRCTERM_H_
 
-#ifdef HAVE_NCURSES_H
-# include <ncurses.h>
-# ifdef HAVE_NCURSES_TERMCAP_H
-#  include <ncurses/termcap.h>
-# elif defined(HAVE_TERMCAP_H)
-#  ifndef __CYGWIN__
-#     include <termcap.h>
-#  endif
-# endif
-#else
-# ifdef HAVE_CURSES_H
-#  include <curses.h>
-# endif
-# ifdef HAVE_TERMCAP_H
-#  include <termcap.h>
-# endif
+#if defined(HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+#include <curses.h>
 #endif
+
+#if defined(HAVE_NCURSES_TERMCAP_H)
+#include <ncurses/termcap.h>
+#elif defined(HAVE_TERMCAP_H)
+#include <termcap.h>
+#endif
+
 #ifdef __EMX__
 #include <termcap.h>
 #endif