oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

use AM_LANGINFO_CODESET in configure.ac, old configure.ac wasn't checking

Browse Source 
for CODESET

git-svn-id: https://svn.musicpd.org/mpd/trunk@990 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-11 15:17:20 +00:00
parent 69cd6eacaf
commit 011757d89c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -70,7 +70,9 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no) dnl doesn't work for systems that don't have CODESET like OpenBSD
dnl AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no)
AM_LANGINFO_CODESET
AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no) AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no)
if test x$enable_ipv6 = xyes; then if test x$enable_ipv6 = xyes; then
@ -499,7 +501,7 @@ else
echo "locale support ................disabled" echo "locale support ................disabled"
fi fi
if test x$enable_langinfo = xyes; then if test x$am_cv_langinfo_codeset = xyes; then
echo "langinfo support ..............enabled" echo "langinfo support ..............enabled"
else else
echo "langinfo support ..............disabled" echo "langinfo support ..............disabled"

4
src/path.c
View File

@ -29,7 +29,7 @@
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_LOCALE #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO #ifdef HAVE_LANGINFO_CODESET
#include <locale.h> #include <locale.h>
#include <langinfo.h> #include <langinfo.h>
#endif #endif
@ -138,7 +138,7 @@ void initPaths(char * playlistDirArg, char * musicDirArg) {
charset = strdup(getConf()[CONF_FS_CHARSET]); charset = strdup(getConf()[CONF_FS_CHARSET]);
} }
#ifdef HAVE_LOCALE #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO #ifdef HAVE_LANGINFO_CODESET
else if((originalLocale = setlocale(LC_CTYPE,NULL))) { else if((originalLocale = setlocale(LC_CTYPE,NULL))) {
char * temp; char * temp;
char * currentLocale; char * currentLocale;