From 8e0d8d2a866548a8a21ab016d147e4ae021878cb Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 8 Sep 2012 16:51:09 +0100
Subject: [PATCH] Check for ncurses headers on cygwin

---
 configure.ac      | 2 ++
 src/input_win.c   | 7 +++++++
 src/preferences.c | 7 +++++++
 src/preferences.h | 8 ++++++++
 src/status_bar.c  | 7 +++++++
 src/ui.h          | 8 ++++++++
 src/windows.c     | 5 +++++
 7 files changed, 44 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2b83f249..deec1a16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ AC_CHECK_LIB([headunit], [main], [],
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdlib.h string.h])
+AC_CHECK_HEADERS([ncurses.h], [], [])
+AC_CHECK_HEADERS([ncurses/ncurses.h], [], [])
 
 PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl])
 PKG_CHECK_MODULES([NOTIFY], [libnotify], [], 
diff --git a/src/input_win.c b/src/input_win.c
index 29d221c2..6f553b42 100644
--- a/src/input_win.c
+++ b/src/input_win.c
@@ -39,10 +39,17 @@
  * cols         : 4
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 #include "common.h"
 #include "command.h"
diff --git a/src/preferences.c b/src/preferences.c
index 6620de6c..d0e3dc2d 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -20,11 +20,18 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 #include "log.h"
 #include "prof_autocomplete.h"
diff --git a/src/preferences.h b/src/preferences.h
index cad9bea0..452720d9 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -23,8 +23,16 @@
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
 
+#include "config.h"
+
 #include <glib.h>
+
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 void prefs_load(void);
 void prefs_close(void);
diff --git a/src/status_bar.c b/src/status_bar.c
index 28456f6f..763f5ada 100644
--- a/src/status_bar.c
+++ b/src/status_bar.c
@@ -20,10 +20,17 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 #include "ui.h"
 
diff --git a/src/ui.h b/src/ui.h
index 28040448..cc0b11f9 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -23,8 +23,16 @@
 #ifndef WINDOWS_H
 #define WINDOWS_h
 
+#include "config.h"
+
 #include <glib.h>
+
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 #include "jabber.h"
 
diff --git a/src/windows.c b/src/windows.c
index df0da33d..eaa78ce2 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -28,7 +28,12 @@
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
+#endif
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#endif
 
 #include "command.h"
 #include "contact.h"