diff --git a/configure.ac b/configure.ac
index e209afe6a7814bbe9e6e4e17b20153ac2a2f7104..236d5f93dd876f34ad338fe35ecb1d669c69ad1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(tig.c)
-cursed=no
-AC_CHECK_HEADERS([ncursesw/ncurses.h],
- [AC_SEARCH_LIBS([initscr], [ncursesw], [cursed=yes])])
-case "$cursed" in "no")
- AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h],
- [AC_SEARCH_LIBS([wclear], [ncurses], [cursed=yes])])
-
- case "$cursed" in "no")
- AC_ERROR([ncurses not found])
- esac
-
+AX_WITH_CURSES
+case "$ax_cv_ncurses" in "no")
+ AC_ERROR([ncurses not found])
+esac
+case "$ax_cv_ncursesw" in "no")
AC_MSG_WARN([The found ncurses library does not support wide-char.])
AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
esac
+AC_SUBST(CURSES_LIB)
AM_ICONV