# HG changeset patch
# User nenolod
# Date 1161659199 25200
# Node ID a22d1b51712ee43e244bad485726c5c550eebecc
# Parent  03aaf25229d617193687147dbd0889f502c9d660
[svn] - bleah fix FLAC check

diff -r 03aaf25229d6 -r a22d1b51712e ChangeLog
--- a/ChangeLog	Mon Oct 23 19:56:04 2006 -0700
+++ b/ChangeLog	Mon Oct 23 20:06:39 2006 -0700
@@ -1,3 +1,14 @@
+2006-10-24 02:56:04 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [210]
+  - choose between flac112 or flac113 based on which version is 
+    determined
+  - if anyone meets a FLAC developer; tell them I want them to die in a 
+    fire, thx.
+  
+  trunk/configure.ac |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-24 02:55:09 +0000  William Pitcock <nenolod@nenolod.net>
   revision [208]
   - 1.1.2 compatible plugin (I HATE YOU FLAC PEOPLE)
diff -r 03aaf25229d6 -r a22d1b51712e m4/libFLAC.m4
--- a/m4/libFLAC.m4	Mon Oct 23 19:56:04 2006 -0700
+++ b/m4/libFLAC.m4	Mon Oct 23 20:06:39 2006 -0700
@@ -32,7 +32,7 @@
     LIBFLAC_CFLAGS="-I$prefix/include"
   fi
 
-  AC_MSG_CHECKING(for libFLAC >= 1.1.3)
+  AC_MSG_CHECKING(for libFLAC >= 1.1.2)
   no_libFLAC=""
 
 
@@ -74,15 +74,19 @@
        LIBS="$ac_save_LIBS"
   fi
 
+  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.])
+  fi
+
   if test "x$no_libFLAC" = "x" ; then
      AC_MSG_RESULT(yes)
      ifelse([$1], , :, [$1])     
   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"