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: Rewrite the liboggflac tests.
f946a182 · Avuton Olrich · d3fcb81d · f946a182
Commit f946a182 authored Apr 17, 2010 by Avuton Olrich
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

configure.ac configure.ac +3 -6

No files found.
--- 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)