Commit 65d11fbb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

ncurses: rewrite configure detection with pkg-config

This makes sure that the correct header files are checked and used.
That is to say the ncursesw headers as opposed to ncurses.
parent d17ebaf1
......@@ -3795,26 +3795,18 @@ dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
[AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
if test "${enable_ncurses}" != "no"; then
VLC_SAVE_FLAGS
LIBS=""
AC_CHECK_HEADER(ncurses.h, [
AC_CHECK_LIB(ncursesw, mvprintw, [
AC_SEARCH_LIBS([tgetent], [ncursesw tinfow tinfo], [
AS_IF([test "${enable_ncurses}" != "no"] ,[
PKG_CHECK_MODULES([NCURSES], [ncursesw], [
VLC_ADD_PLUGIN([ncurses])
VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}])
ALIASES="${ALIASES} nvlc"
VLC_ADD_LIBS([ncurses],[-lncursesw ${LIBS}])
], [
AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([tgetent not found])])
])
], [
AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([libncursesw not found])])
AS_IF([test -n "${enable_ncurses}"], [
AC_MSG_ERROR([${NCURSES_PKG_ERRORS}.])
])
], [
AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([ncurses.h not found])])
])
VLC_RESTORE_FLAGS
fi
])
dnl
dnl Lirc plugin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment