Respin configure and defs.h.in for new configure.in, and update ircterm.h to match.

ircterm.h now includes ncurses/ncurses.h if present, which is necessary for Cygwin.


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

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 434 .
+# From configure.in Revision: 437 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -11339,7 +11339,8 @@ done
 
 
 
-for ac_header in ncurses.h curses.h
+
+for ac_header in ncurses.h ncurses/ncurses.h curses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -11483,7 +11484,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
+ break
 fi
 
 done
@@ -11508,6 +11509,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #if defined(HAVE_NCURSES_H)
       #include <ncurses.h>
+      #elif defined(HAVE_NCURSES_NCURSES_H)
+      #include <ncurses/ncurses.h>
       #elif defined(HAVE_CURSES_H)
       #include <curses.h>
       #endif

include/defs.h.in

@@ -156,6 +156,9 @@
 /* Define to 1 if you have the <ncurses.h> header file. */
 #undef HAVE_NCURSES_H
 
+/* Define to 1 if you have the <ncurses/ncurses.h> header file. */
+#undef HAVE_NCURSES_NCURSES_H
+
 /* Define to 1 if you have the <ncurses/termcap.h> header file. */
 #undef HAVE_NCURSES_TERMCAP_H
 

include/ircterm.h

@@ -15,6 +15,8 @@
 
 #if defined(HAVE_NCURSES_H)
 #include <ncurses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #elif defined(HAVE_CURSES_H)
 #include <curses.h>
 #endif