Conditional curses detection

Make the whole extra curses/ncurses/ncursesw only check if we didn't
find tinfo the "old" way.
This commit is contained in:
Anton Lundin
2013-01-17 16:39:04 +01:00
committed by Anton Lundin
parent eeb8ae99d7
commit dd5a69bc70
+1 -1
View File
@@ -224,6 +224,7 @@ AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where curses is install
CURSES_CPPFLAGS="-I${cv_curses}/include" CURSES_CPPFLAGS="-I${cv_curses}/include"
fi]) fi])
if test "x$ax_cv_have_TINFO" = xno ; then
# save away old LDFLAGS/CPPFLAGS and check for curses with cv_curses # save away old LDFLAGS/CPPFLAGS and check for curses with cv_curses
old_LDFLAGS="$LDFLAGS" old_LDFLAGS="$LDFLAGS"
old_CPPFLAGS="$CPPFLAGS" old_CPPFLAGS="$CPPFLAGS"
@@ -235,7 +236,6 @@ AX_WITH_CURSES
LDFLAGS="$old_LDFLAGS" LDFLAGS="$old_LDFLAGS"
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"
if test "x$ax_cv_have_TINFO" = xno ; then
if test "x$ax_cv_curses_which" = xno ; then if test "x$ax_cv_curses_which" = xno ; then
AC_MSG_ERROR([requires either tinfo, NcursesW or Ncurses library]) AC_MSG_ERROR([requires either tinfo, NcursesW or Ncurses library])
else else