--- faac-1.24.ebuild.orig	2005-11-05 01:03:55.000000000 +0100
+++ faac-1.24.ebuild	2005-11-05 00:38:27.000000000 +0100
@@ -11,13 +11,13 @@
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 sparc x86"
-IUSE=""
+IUSE="aac"
 
 RDEPEND=">=media-libs/libsndfile-1.0.0"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.3.5
 	sys-devel/automake
-	!<media-libs/faad2-2.0-r3"
+	aac? ( >=media-libs/faad2-2.0-r3 )"
 
 S=${WORKDIR}/${PN}
 
@@ -25,11 +25,19 @@
 	unpack ${A}
 	cd ${S}
 
+	# Add an option to enable/disable linking against libmp4v2
+	epatch "${FILESDIR}/${PN}-configure-mp4-support.patch"
+
 	eautoreconf
 	elibtoolize
 	epunt_cxx
 }
 
+src_compile() {
+	econf $(use_enable aac mp4v2) || die "Configuration failed."
+	emake || die "Compilation failed."
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf