configure.ac: substitute FAAD_CFLAGS, FAAD_LIBS

Makefile.am

@@ -473,6 +473,7 @@ DECODER_CFLAGS = \
 	$(MPG123_CFLAGS) \
 	$(FFMPEG_CFLAGS) \
 	$(MPCDEC_CFLAGS) \
+	$(FAAD_CFLAGS) \
 	$(CUE_CFLAGS)
 
 DECODER_LIBS = \
@@ -490,6 +491,7 @@ DECODER_LIBS = \
 	$(MP4FF_LIBS) \
 	$(FFMPEG_LIBS) \
 	$(MPCDEC_LIBS) \
+	$(FAAD_LIBS) \
 	$(CUE_LIBS)
 
 DECODER_SRC = \

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)
+
 ])