From f946a182a3101ae2115c23bb4841c69309663363 Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sat, 17 Apr 2010 15:20:34 -0700
Subject: configure.ac: Rewrite the liboggflac tests.

Rewrite the liboggflac tests, the m4 macro is way too complicated for no
reason and it's buggy.
---
 configure.ac | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 8606da0d7..3e5561d42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -951,16 +951,13 @@ if test x$use_tremor = xyes && test $xenable_oggflac = xyes; then
 		enable_oggflac=no
 fi
 
-if test x$enable_oggflac = xyes; then	
-	oldmpdcflags="$MPD_CFLAGS"
-	oldmpdlibs="$MPD_LIBS"
-	AM_PATH_LIBOGGFLAC(MPD_LIBS="$MPD_LIBS $LIBOGGFLAC_LIBS"
-				MPD_CFLAGS="$MPD_CFLAGS $LIBOGGFLAC_CFLAGS",
-			   enable_oggflac=no)
+if test x$enable_oggflac = xyes; then
+	AC_CHECK_HEADER([OggFLAC/stream_decoder.h],, enable_oggflac=no)
 fi
 
 if test x$enable_oggflac = xyes; then
 	AC_DEFINE(HAVE_OGGFLAC,1,[Define for OggFLAC support])
+	MPD_LIBS="$MPD_LIBS -lOggFLAC -lFLAC -lm"
 fi
 
 AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
-- 
cgit v1.2.3