0.9.3-rc2

ChangeLog

@@ -7,6 +7,7 @@ ver 0.9.3 (2003/10/31)
 6) Optimize interface output (write in 4kB chunks instead of on every '\n')
 7) Fix bug that prevented rm command from working
 8) Fix bug where deleting current song skips the next song
+9) Use iconv to convert vorbis comments from UTF-8 to Latin1
 
 ver 0.9.2 (2003/10/6)
 1) Fix FreeBSD Compilation Problems

configure

@@ -1037,7 +1037,7 @@ Optional Features:
   --disable-ogg     disable ogg support
   --disable-flac    disable flac support
   --disable-mp3     disable mp3 support
-  --disable-audiofile disable audiofile support
+  --disable-audiofile disable audiofile support, disables wave support
   --enable-mpd-mad     use mpd libmad
   --disable-id3     disable id3 support
   --enable-mpd-id3tag    use mpd libid3tag
@@ -18478,9 +18478,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 MPD_CFLAGS="-Wall"
 MPD_LIBS=""
 
-# Check whether --enable-ogg or --disable-ogg was given.
-if test "${enable_ogg+set}" = set; then
-  enableval="$enable_ogg"
+# Check whether --enable-iconv or --disable-iconv was given.
+if test "${enable_iconv+set}" = set; then
+  enableval="$enable_iconv"
 
 else
   enable_iconv=yes
@@ -18830,9 +18830,71 @@ echo "${ECHO_T}$ac_cv_header_iconv_h" >&6
 fi
 if test $ac_cv_header_iconv_h = yes; then
   MPD_CFLAGS="$MPD_CFLAGS -DHAVE_ICONV"
+else
+  enable_iconv=no
 fi
 
 
+	if test x$enable_iconv = xyes; then
+		echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
+echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
+if test "${ac_cv_lib_iconv_iconv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-liconv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char iconv ();
+int
+main ()
+{
+iconv ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_iconv_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_iconv_iconv=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6
+if test $ac_cv_lib_iconv_iconv = yes; then
+  MPD_LIBS="$MPD_LIBS -liconv"
+fi
+
+	fi
 fi
 
 echo "$as_me:$LINENO: checking for ipv6" >&5

configure.in

@@ -19,11 +19,11 @@ AC_SUBST(MPD_CFLAGS)
 MPD_CFLAGS="-Wall"
 MPD_LIBS=""
 
-AC_ARG_ENABLE(ogg,[  --disable-iconv     disable iconv support],,enable_iconv=yes)
+AC_ARG_ENABLE(iconv,[  --disable-iconv     disable iconv support],,enable_iconv=yes)
 AC_ARG_ENABLE(ogg,[  --disable-ogg     disable ogg support],,enable_ogg=yes)
 AC_ARG_ENABLE(flac,[  --disable-flac    disable flac support],,enable_flac=yes)
 AC_ARG_ENABLE(mp3,[  --disable-mp3     disable mp3 support],,enable_mp3=yes)
-AC_ARG_ENABLE(audiofile,[  --disable-audiofile disable audiofile support],,enable_audiofile=yes)
+AC_ARG_ENABLE(audiofile,[  --disable-audiofile disable audiofile support, disables wave support],,enable_audiofile=yes)
 AC_ARG_ENABLE(mpd_mad,[  --enable-mpd-mad     use mpd libmad],use_mpd_mad=yes,)
 AC_ARG_ENABLE(id3,[  --disable-id3     disable id3 support],,enable_id3=yes)
 AC_ARG_ENABLE(mpd_id3tag,[  --enable-mpd-id3tag    use mpd libid3tag],use_mpd_id3tag=yes,)
@@ -40,7 +40,10 @@ AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",)
 AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
 
 if test x$enable_iconv = xyes; then
-	AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS -DHAVE_ICONV",)
+	AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS -DHAVE_ICONV",enable_iconv=no)
+	if test x$enable_iconv = xyes; then
+		AC_CHECK_LIB(iconv,iconv,MPD_LIBS="$MPD_LIBS -liconv",)
+	fi
 fi
 
 AC_MSG_CHECKING(for ipv6)