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

more fun with LOCALE and LANGINFO 

git-svn-id: https://svn.musicpd.org/mpd/trunk@299 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-03-19 15:56:31 +00:00
parent e40c676dba
commit 278985b2fd
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -62,9 +62,11 @@ 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",)
AM_ICONV AM_ICONV
MPD_CFLAGS="$MPD_CFLAGS $INCICONV"
MPD_LIBS="$MPD_LIBS $LIBICONV" MPD_LIBS="$MPD_LIBS $LIBICONV"
AM_LANGINFO_CODESET
AM_LC_MESSAGES AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present]),)
AC_CHECK_HEADER(locale.h,AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present]),)
if test x$enable_ipv6 = xyes; then if test x$enable_ipv6 = xyes; then
AC_MSG_CHECKING(for ipv6) AC_MSG_CHECKING(for ipv6)
@ -204,7 +206,7 @@ if test x$enable_aac = xyes; then
FAAD_LIBS="-L$libdir" FAAD_LIBS="-L$libdir"
fi fi
FAAD_LIBS="$FAAD_LIBS -lfaad -lmp4v2 -lstdc++" FAAD_LIBS="$FAAD_LIBS -lfaad"
if test "x$faad_includes" != "x" ; then if test "x$faad_includes" != "x" ; then
FAAD_CFLAGS="-I$faad_includes" FAAD_CFLAGS="-I$faad_includes"
@ -219,23 +221,13 @@ if test x$enable_aac = xyes; then
CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
AC_CHECK_HEADER(faad.h,,enable_aac=no) AC_CHECK_HEADER(faad.h,,enable_aac=no)
if test x$enable_aac = xyes; then
AC_CHECK_HEADER(mp4.h,,[enable_aac=no;AC_MSG_WARN(
You need mp4v2 installed for AAC/MP4 decoding.
If mp4.h is present, be sure that mpeg4ip.h does not
include systems.h)])
fi
if test x$enable_aac = xyes; then
AC_CHECK_LIB(mp4v2, MP4Create,,[enable_aac=no;AC_MSG_WARN(You need mp4v2 installed for AAC/MP4 decoding)])
fi
if test x$enable_aac = xyes; then
AC_CHECK_LIB(mp4v2, MP4MetadataDelete,,[enable_aac=no;AC_MSG_WARN(You need mp4v2 installed for AAC/MP4 decoding)])
fi
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
AC_CHECK_LIB(faad, faacDecDecode,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no) AC_CHECK_LIB(faad, faacDecDecode,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no)
fi fi
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding]) AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding])
else
AC_MSG_WARN([faad2 lib needed for MP4/AAC support -- disabling MP4/AAC support])
fi fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs

12
src/path.c
View File

@ -24,8 +24,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO_CODESET #ifdef HAVE_LANGINFO
#include <locale.h> #include <locale.h>
#include <langinfo.h> #include <langinfo.h>
#endif #endif
@ -87,8 +87,8 @@ char * getFsCharset() {
} }
void initPaths() { void initPaths() {
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO_CODESET #ifdef HAVE_LANGINFO
char * originalLocale; char * originalLocale;
#endif #endif
#endif #endif
@ -97,8 +97,8 @@ void initPaths() {
if(getConf()[CONF_FS_CHARSET]) { if(getConf()[CONF_FS_CHARSET]) {
charset = strdup(getConf()[CONF_FS_CHARSET]); charset = strdup(getConf()[CONF_FS_CHARSET]);
} }
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO_CODESET #ifdef HAVE_LANGINFO
else if((originalLocale = setlocale(LC_ALL,""))) { else if((originalLocale = setlocale(LC_ALL,""))) {
char * temp; char * temp;