--- faac/configure.in.orig	2006-08-13 18:17:26 +0400
+++ faac/configure.in.orig	2006-08-27 19:03:42 +0400
@@ -30,11 +30,12 @@ 
 
 AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                            external_mp4v2=no, -lstdc++),
+                            external_mp4v2=no),
                external_mp4v2=no, [#include <mp4.h>])
 
 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 ***])
--- faac/frontend/Makefile.am.orig	2004-07-28 12:18:21 +0400
+++ faac/frontend/Makefile.am.orig	2006-08-27 19:03:17 +0400
@@ -7,5 +7,5 @@ 
 LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
 else
 INCLUDES = -I$(top_srcdir)/include 
-LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm
 endif