From bf3848ef94f3c4e09c150b51dab07e14c4435f05 Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Wed, 26 Jul 2006 03:05:50 +0000
Subject: Put mp4ff back into the tree

git-svn-id: https://svn.musicpd.org/mpd/trunk@4461 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 configure.ac | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 7ea6039c3..3d08665ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,8 @@ AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
 
 AC_SUBST(MPD_LIBS)
 AC_SUBST(MPD_CFLAGS)
+AC_SUBST(MP4FF_LIB)
+AC_SUBST(MP4FF_SUBDIR)
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -357,6 +359,8 @@ if test x$enable_mpc = xyes; then
 	CPPFLAGS=$oldcppflags
 fi
 
+MP4FF_SUBDIR=""
+
 if test x$enable_aac = xyes; then
 	if test "x$faad_libraries" != "x" ; then
 		FAAD_LIBS="-L$faad_libraries"
@@ -366,7 +370,7 @@ if test x$enable_aac = xyes; then
 		FAAD_LIBS="-L$libdir"
 	fi
 
-	FAAD_LIBS="$FAAD_LIBS -lfaad -lmp4ff"
+	FAAD_LIBS="$FAAD_LIBS -lfaad"
 
 	if test "x$faad_includes" != "x" ; then
 		FAAD_CFLAGS="-I$faad_includes"
@@ -383,7 +387,6 @@ if test x$enable_aac = xyes; then
 	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
 	CPPFLAGS=$CFLAGS
 	AC_CHECK_HEADER(faad.h,,enable_aac=no)
-	AC_CHECK_HEADER(mp4ff.h,,enable_aac=no)
 	if test x$enable_aac = xyes; then
 		AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include <faad.h>])
 	fi
@@ -391,17 +394,14 @@ 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,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],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,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no)
 		fi
 	fi
 	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(mp4ff,mp4ff_open_read,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no)
-	fi
-	if test x$enable_aac = xyes; then
-		AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen)
+  		AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen)
 		AC_COMPILE_IFELSE([
 #include <faad.h>
 
@@ -636,7 +636,7 @@ if test x$enable_mod = xyes; then
 	fi
 fi
 
-AC_OUTPUT(doc/Makefile src/Makefile Makefile )
+AC_OUTPUT(src/mp4ff/Makefile doc/Makefile src/Makefile Makefile )
 
 echo ""
 echo "########### MPD CONFIGURATION ############"
-- 
cgit v1.2.3