dselect: Use ncursesw header files

This should be changed in the future to check for the presence of the
header files in configure.

diff --git a/ChangeLog b/ChangeLog
index 9383e525e3bd76a55152670e5fc689369ab0b373..a2338bc6d1a9c562d7de406e2a6be577cd74cdc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-30  Guillem Jover  <guillem@debian.org>
+
+       * dselect/main.cc: Use <ncursesw/term.h> instead of <term.h>.
+       * dselect/dselect.h: Use <ncursesw/curses.h> instead of <curses.h>.
+       * dselect/Makefile.am (curkeys.h): Likewise.
+
 2008-03-30  Guillem Jover  <guillem@debian.org>
 
        * po/POTFILES.in: Add 'lib/cleanup.c', 'lib/log.c', 'lib/myopt-util.c'

diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index e433dfc345c98262046b3ff9de3e379bef47d5b2..f4a97ad697f90e8771c8e5407c63feff79f593cd 100644 (file)
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -46,7 +46,7 @@ CLEANFILES = curkeys.h
 
 curkeys.$(OBJEXT): curkeys.h
 curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
-       cursesfile=`echo '#include <curses.h>' | \
+       cursesfile=`echo '#include <ncursesw/curses.h>' | \
                $(CC) -E - | grep 'curses.h' | head -n 1 | \
                sed -e 's/^[^"]*"//; s/".*$$//'`; \
        if [ "$$cursesfile" = "" ]; then \

diff --git a/dselect/dselect.h b/dselect/dselect.h
index abc3c9aa6f207d9dbb4a70c974863d6c390fc03c..cf5f553c7d3f16f2833f67ae402d989f46a9ace3 100644 (file)
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -28,7 +28,7 @@
 
 #include <signal.h>
 #undef ERR
-#include <curses.h>
+#include <ncursesw/curses.h>
 
 struct helpmenuentry {
   char key;

diff --git a/dselect/main.cc b/dselect/main.cc
index 99702cf1226799cb80b7b840ab53f531476b180f..ac277e9308071e590d27100bbc4a8d0160989693 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -37,7 +37,7 @@ extern "C" {
 #include <ctype.h>
 #include <assert.h>
 
-#include <term.h>
+#include <ncursesw/term.h>
 
 extern "C" {
 #include <dpkg.h>