]> granicus.if.org Git - procps-ng/commitdiff
build-sys: a minimialst approach to ncurses v3.3.0
authorJim Warner <james.warner@comcast.net>
Sat, 29 Oct 2011 21:52:46 +0000 (16:52 -0500)
committerCraig Small <csmall@enc.com.au>
Mon, 31 Oct 2011 11:05:17 +0000 (22:05 +1100)
. 3 pgms require non-wide <curses.h> or <ncurses.h>

This patch represents the tests for a minimal environment
consistent with current ncurses needs.

It should allow a successful configure and build

configure.ac

index 8dffeb0bd2da16a076fdeee70cd91bc7f96eb689..58f8529ad6dd15ad19cf7e07e480a9e3d5747d34 100644 (file)
@@ -100,15 +100,13 @@ AC_ARG_WITH([ncurses],
 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])
+  AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
+  AC_CHECK_HEADERS(curses.h ncurses.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
   if test "x$have_ncurses" = xno; then
     AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
   fi
   AM_CONDITIONAL(WITH_NCURSES, true)
-  NCURSES_LIBS="-lncursesw"
+  NCURSES_LIBS="-lncurses"
 fi
 AC_SUBST([NCURSES_LIBS])