From cbd6770f2fedb0988f28e951994b50b65b4c0221 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 9 Oct 2011 18:25:09 +0200
Subject: configure.ac: substitute FAAD_CFLAGS, FAAD_LIBS

Don't use MPC_CFLAGS, MPD_LIBS.
---
 m4/faad.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'm4')

diff --git a/m4/faad.m4 b/m4/faad.m4
index 00778755..8576b7d3 100644
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -50,10 +50,10 @@ if test x$enable_aac = xyes; then
 		AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
 	fi
 	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
+		AC_CHECK_LIB(faad,faacDecInit2,,enable_aac=no)
 		if test x$enable_aac = xno; then
 			enable_aac=yes
-			AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
+			AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no)
 		fi
 	fi
 	if test x$enable_aac = xyes; then
@@ -188,5 +188,11 @@ if test x$enable_aac = xyes; then
 	CPPFLAGS=$oldcppflags
 else
 	enable_mp4=no
+	FAAD_CFLAGS=""
+	FAAD_LIBS=""
 fi
+
+AC_SUBST(FAAD_CFLAGS)
+AC_SUBST(FAAD_LIBS)
+
 ])
-- 
cgit v1.2.3