aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-19 15:56:31 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-19 15:56:31 +0000
commit278985b2fdff985ca9ba88444bc4a91ae92fe9d0 (patch)
tree41262357d23d7fd16518a497538d77a8c6613213
parente40c676dba90b097596f1fb845eff432e59594ca (diff)
downloadmpd-278985b2fdff985ca9ba88444bc4a91ae92fe9d0.tar.gz
mpd-278985b2fdff985ca9ba88444bc4a91ae92fe9d0.tar.xz
mpd-278985b2fdff985ca9ba88444bc4a91ae92fe9d0.zip
more fun with LOCALE and LANGINFO
git-svn-id: https://svn.musicpd.org/mpd/trunk@299 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--configure.ac22
-rw-r--r--src/path.c12
2 files changed, 13 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index 008774b36..1879c7e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,11 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
AM_ICONV
+MPD_CFLAGS="$MPD_CFLAGS $INCICONV"
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
AC_MSG_CHECKING(for ipv6)
@@ -204,7 +206,7 @@ if test x$enable_aac = xyes; then
FAAD_LIBS="-L$libdir"
fi
- FAAD_LIBS="$FAAD_LIBS -lfaad -lmp4v2 -lstdc++"
+ FAAD_LIBS="$FAAD_LIBS -lfaad"
if test "x$faad_includes" != "x" ; then
FAAD_CFLAGS="-I$faad_includes"
@@ -220,22 +222,12 @@ if test x$enable_aac = xyes; then
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
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
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
if test x$enable_aac = xyes; then
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
CFLAGS=$oldcflags
LIBS=$oldlibs
diff --git a/src/path.c b/src/path.c
index d475d356b..a7f143dc7 100644
--- a/src/path.c
+++ b/src/path.c
@@ -24,8 +24,8 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_LC_MESSAGES
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LOCALE
+#ifdef HAVE_LANGINFO
#include <locale.h>
#include <langinfo.h>
#endif
@@ -87,8 +87,8 @@ char * getFsCharset() {
}
void initPaths() {
-#ifdef HAVE_LC_MESSAGES
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LOCALE
+#ifdef HAVE_LANGINFO
char * originalLocale;
#endif
#endif
@@ -97,8 +97,8 @@ void initPaths() {
if(getConf()[CONF_FS_CHARSET]) {
charset = strdup(getConf()[CONF_FS_CHARSET]);
}
-#ifdef HAVE_LC_MESSAGES
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LOCALE
+#ifdef HAVE_LANGINFO
else if((originalLocale = setlocale(LC_ALL,""))) {
char * temp;