From ad1399c23b0a168510bb00c41fa7901dd871207f Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 26 Jan 2004 10:52:30 +0000
Subject: [PATCH]   * configure.ac:     + Check for curses.h as well as
 ncurses.h.   * src/caca.c src/event.c src/graphics.c:     + Include curses.h
 if ncurses.h was not found.

---
 configure.ac     | 2 +-
 debian/changelog | 7 +++++++
 src/caca.c       | 6 +++++-
 src/event.c      | 6 +++++-
 src/graphics.c   | 6 +++++-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e213e6..2af9b6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ fi
 
 if test "${enable_ncurses}" != "no"; then
   ac_cv_my_have_ncurses="no"
-  AC_CHECK_HEADERS(ncurses.h,
+  AC_CHECK_HEADERS(curses.h ncurses.h,
    [AC_CHECK_LIB(ncurses, initscr,
      [ac_cv_my_have_ncurses="yes"
       AC_DEFINE(USE_NCURSES, 1, Define to activate the ncurses backend driver)
diff --git a/debian/changelog b/debian/changelog
index f593c1e..abbbcbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcaca (0.8-2) unstable; urgency=low
+
+  * src/caca.c src/event.c src/graphics.c:
+    + Include <ncurses.h> instead of <curses.h> to fix m68k FTBFS.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Mon, 26 Jan 2004 11:47:32 +0100
+
 libcaca (0.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/src/caca.c b/src/caca.c
index 7a71972..02ef4ec 100644
--- a/src/caca.c
+++ b/src/caca.c
@@ -39,7 +39,11 @@
 #   endif
 #endif
 #if defined(USE_NCURSES)
-#   include <curses.h>
+#   if defined(HAVE_NCURSES_H)
+#       include <ncurses.h>
+#   else
+#       include <curses.h>
+#   endif
 #endif
 #if defined(USE_CONIO)
 #   include <dos.h>
diff --git a/src/event.c b/src/event.c
index c47e3df..f8b13c4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -37,7 +37,11 @@
 #   endif
 #endif
 #if defined(USE_NCURSES)
-#   include <curses.h>
+#   if defined(HAVE_NCURSES_H)
+#       include <ncurses.h>
+#   else
+#       include <curses.h>
+#   endif
 #endif
 #if defined(USE_CONIO)
 #   include <conio.h>
diff --git a/src/graphics.c b/src/graphics.c
index 9c63575..fc02630 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -37,7 +37,11 @@
 #   endif
 #endif
 #if defined(USE_NCURSES)
-#   include <curses.h>
+#   if defined(HAVE_NCURSES_H)
+#       include <ncurses.h>
+#   else
+#       include <curses.h>
+#   endif
 #endif
 #if defined(USE_CONIO)
 #   include <conio.h>