changeset 100:7be4c601acfa trunk

[svn] - the FLAC developers suck
author nenolod
date Mon, 23 Oct 2006 19:12:38 -0700
parents 98de08786b0a
children dc891c666ce1
files ChangeLog m4/libFLAC.m4
diffstat 2 files changed, 23 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 23 12:25:24 2006 -0700
+++ b/ChangeLog	Mon Oct 23 19:12:38 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-23 19:25:24 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [198]
+  - specifically blacklist the musepack mp2/mp3 variant
+  
+  trunk/src/mpg123/mpg123.c |    7 +++++++
+  1 file changed, 7 insertions(+)
+
+
 2006-10-22 01:17:49 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [196]
   Flac now plays on 1.13, but not on 1.12. API breakage *sucks*, upstream should stop doing it.
--- a/m4/libFLAC.m4	Mon Oct 23 12:25:24 2006 -0700
+++ b/m4/libFLAC.m4	Mon Oct 23 19:12:38 2006 -0700
@@ -32,7 +32,7 @@
     LIBFLAC_CFLAGS="-I$prefix/include"
   fi
 
-  AC_MSG_CHECKING(for libFLAC >= 1.1.2)
+  AC_MSG_CHECKING(for libFLAC >= 1.1.3)
   no_libFLAC=""
 
 
@@ -55,8 +55,17 @@
 
 int main ()
 {
-FLAC__format_vorbiscomment_entry_name_is_legal("foo");
-  system("touch conf.libFLACtest");
+  char cmdbuf[16384];
+
+  /* this will just bail if < 1.1.2 -nenolod */
+  FLAC__format_vorbiscomment_entry_name_is_legal("foo");
+
+  /* we need the version of FLAC available, so dump it here. */
+  sprintf(cmdbuf, "echo '%c%c%c' > conf.libFLACtest", 
+          FLAC__VERSION_STRING[0], FLAC__VERSION_STRING[2],
+	  FLAC__VERSION_STRING[4]);
+
+  system(cmdbuf);
   return 0;
 }
 
@@ -71,7 +80,9 @@
   else
      AC_MSG_RESULT(no)
      if test -f conf.libFLACtest ; then
-       :
+       FLAC_VERSION=`cat conf.libFLACtest`
+       AC_DEFINE_UNQUOTED(AUD_FLAC_VERSION, $FLAC_VERSION,
+	 [Available version of FLAC on your system.])
      else
        echo "*** Could not run libFLAC test program, checking why..."
        CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"