diff -urN faac-1.28/configure.in faac-1.28.src/configure.in
--- faac-1.28/configure.in	2009-02-05 01:55:38.000000000 +0100
+++ faac-1.28.src/configure.in	2009-02-10 19:38:50.000000000 +0100
@@ -36,6 +36,7 @@
 
 if test x$external_mp4v2 = xyes; then
   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+  MY_DEFINE(HAVE_LIBMP4V2)
 else
   if test x$WITHMP4V2 = xyes; then
      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff -urN faac-1.28/frontend/Makefile.am faac-1.28.src/frontend/Makefile.am
--- faac-1.28/frontend/Makefile.am	2008-12-16 01:56:00.000000000 +0100
+++ faac-1.28.src/frontend/Makefile.am	2009-02-10 19:40:22.000000000 +0100
@@ -3,10 +3,5 @@
 
 faac_SOURCES = main.c input.c
 
-if WITH_MP4V2
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
-else
-INCLUDES = -I$(top_srcdir)/include 
-LDADD = $(top_builddir)/libfaac/libfaac.la -lm
-endif
+INCLUDES = -I$(top_srcdir)/include
+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lstdc++ -lmp4v2