From: Jim Warner <james.warner@comcast.net>
Date: Fri, 28 Oct 2011 12:30:48 +0000 (-0500)
Subject: build-sys: ensure consistent procps-ng ncurses
X-Git-Tag: v3.3.0~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8348b4cc972e627eeedcb69a1b88ed51df7854bc;p=procps-ng

build-sys: ensure consistent procps-ng ncurses

. 1 program uses curses (top)
. 2 programs use ncurses (slabtop, watch)
. all 3 include non-wide <curses.h> or <ncurses.h>
. those 3 do not currently need wide support
. but anticipating nls, we link against libncursesw

This patch ensures an environment consistent with current
and future ncurses needs.
---

diff --git a/configure.ac b/configure.ac
index 8d33183a..8dffeb0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,9 +101,11 @@ if test "x$with_ncurses" = xno; then
   AM_CONDITIONAL(WITH_NCURSES, false)
 else
   AC_CHECK_LIB(ncursesw, initscr, [have_ncurses=yes], [have_ncurses=no])
+  AC_CHECK_HEADERS(curses.h, [], [have_ncurses=no])
+  AC_CHECK_HEADERS(ncurses.h, [], [have_ncurses=no])
   AC_CHECK_HEADERS(ncursesw/ncurses.h, [], [have_ncurses=no])
   if test "x$have_ncurses" = xno; then
-    AC_MSG_ERROR([ncurses support missing (for partial build use --without-ncurses)])
+    AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
   fi
   AM_CONDITIONAL(WITH_NCURSES, true)
   NCURSES_LIBS="-lncursesw"