Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove support for PDCurses

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-15 20:00:33 +01:00
parent 5d75becca9
commit 1a1105793d
8 changed files with 15 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
configure.ac
View File

@@ -15,7 +15,6 @@ AC_ARG_ENABLE(clock, AS_HELP_STRING([--enable-clock], [Enable clock screen @<:@d
AC_ARG_ENABLE(unicode, AS_HELP_STRING([--enable-unicode], [Enable utf8 support @<:@default=yes@:>@]), [unicode=$enableval], [unicode=yes])
AC_ARG_WITH(curl, AS_HELP_STRING([--with-curl], [Enable fetching lyrics from the Internet @<:@default=auto@:>@]), [curl=$withval], [curl=auto])
AC_ARG_WITH(fftw, AS_HELP_STRING([--with-fftw], [Enable fftw support (required for frequency spectrum vizualization) @<:@default=auto@:>@]), [fftw=$withval], [fftw=auto])
AC_ARG_WITH(pdcurses, AS_HELP_STRING([--with-pdcurses[=LIBNAME]], [Link against pdcurses instead of ncurses @<:@default=XCurses@:>@]), [pdcurses=$withval], [pdcurses=no])
AC_ARG_WITH(taglib, AS_HELP_STRING([--with-taglib], [Enable tag editor @<:@default=auto@:>@]), [taglib=$withval], [taglib=auto])
if test "$outputs" = "yes"; then
@@ -226,35 +225,23 @@ AC_CHECK_HEADERS([pthread.h],
dnl ========================
dnl = checking for ncurses =
dnl ========================
if test "$pdcurses" = "no" ; then
if test "$unicode" = "yes" ; then
curses_config_bin="ncursesw6-config ncursesw5-config"
AC_DEFINE([NCMPCPP_UNICODE], [1], [enables unicode support])
else
curses_config_bin="ncurses6-config ncurses5-config"
fi
if test "$unicode" = "yes" ; then
curses_config_bin="ncursesw6-config ncursesw5-config"
AC_DEFINE([NCMPCPP_UNICODE], [1], [enables unicode support])
else
if test "$pdcurses" = "yes" ; then
pdcurses_lib=XCurses
curses_config_bin=xcurses-config
else
pdcurses_lib=$pdcurses
fi
AC_DEFINE([USE_PDCURSES], [1], [enables pdcurses support])
curses_config_bin="ncurses6-config ncurses5-config"
fi
AC_PATH_PROGS(CURSES_CONFIG, $curses_config_bin)
if test "$CURSES_CONFIG" != "" ; then
CPPFLAGS="$CPPFLAGS `$CURSES_CONFIG --cflags`"
LDFLAGS="$LDFLAGS `$CURSES_CONFIG --libs`"
fi
if test "$pdcurses" = "no" ; then
AC_CHECK_LIB(ncursesw, initscr,
curses_lib=ncursesw,
curses_lib=ncurses
)
else
curses_lib=$pdcurses_lib
fi
AC_CHECK_LIB(ncursesw, initscr,
curses_lib=ncursesw,
curses_lib=ncurses
)
AC_CHECK_LIB($curses_lib, initscr,
if test "$CURSES_CONFIG" = "" ; then
LDFLAGS="$LDFLAGS -l$curses_lib"
@@ -262,9 +249,6 @@ AC_CHECK_LIB($curses_lib, initscr,
,
AC_MSG_ERROR([$curses_lib library is required])
)
if test "$pdcurses" != "no" ; then
AC_CHECK_LIB($curses_lib, Xinitscr, AC_DEFINE([XCURSES], [1], [x11 pdcurses available]), )
fi
AC_CHECK_HEADERS([curses.h], , AC_MSG_ERROR([missing curses.h header]))
dnl ======================