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

do not exclude iconv support if unicode is enabled

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-01-17 14:10:44 +01:00
parent 7d82da3fed
commit fd5a3e142c
6 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@@ -13,6 +13,15 @@ AC_ARG_ENABLE(unicode, AS_HELP_STRING([--enable-unicode], [Enable utf8 support])
AC_ARG_WITH(taglib, AS_HELP_STRING([--with-taglib], [Enable tag editor]), [taglib=$withval], [taglib=no])
AC_ARG_WITH(curl, AS_HELP_STRING([--with-curl], [Enable fetching lyrics from the Internet]), [curl=$withval], [curl=no])
dnl ======================
dnl = checking for iconv =
dnl ======================
AC_CHECK_FILE([/usr/share/i18n/SUPPORTED], AC_DEFINE([SUPPORTED_LOCALES], ["/usr/share/i18n/SUPPORTED"], [ ]),
AC_CHECK_FILE([/etc/locale.gen], AC_DEFINE([SUPPORTED_LOCALES], ["/etc/locale.gen"], [ ]),
AC_MSG_NOTICE(cannot find list of supported locales, iconv support will be disabled))
)
AC_CHECK_HEADERS([iconv.h], , AC_MSG_NOTICE(cannot find iconv.h header, iconv support will be disabled))
dnl ========================
dnl = checking for ncurses =
dnl ========================
@@ -23,11 +32,6 @@ if test "$unicode" = "yes" ; then
else
ncurses_config_bin=ncurses5-config
ncurses_lib=ncurses
AC_CHECK_FILE([/usr/share/i18n/SUPPORTED], AC_DEFINE([SUPPORTED_LOCALES], ["/usr/share/i18n/SUPPORTED"], [ ]),
AC_CHECK_FILE([/etc/locale.gen], AC_DEFINE([SUPPORTED_LOCALES], ["/etc/locale.gen"], [ ]),
AC_MSG_ERROR([cannot find list of supported locales]))
)
AC_CHECK_HEADERS([iconv.h], ,)
fi
AC_PATH_PROG(NCURSES_CONFIG, $ncurses_config_bin)
if test "$NCURSES_CONFIG" != "" ; then