--- faac/configure.in.orig	2005-11-05 00:00:12.937616568 +0100
+++ faac/configure.in	2005-11-05 00:25:08.762216664 +0100
@@ -21,12 +21,23 @@
 AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP))
 
 AC_CHECK_LIB(gnugetopt, getopt_long)
-AC_CHECK_LIB(mp4v2, MP4MetadataDelete,
-		    [AC_MSG_NOTICE([*** Building with MP4 support ***])
-		     MY_DEFINE([HAVE_LIBMP4V2])
-		     LIBS="$LIBS -lstdc++ -lmp4v2"],
-		     [AC_MSG_NOTICE([*** Building without MP4 support ***])],
-		     -lstdc++)
+
+AC_ARG_ENABLE(mp4v2, [  --disable-mp4v2         do not build MP4 support])
+if test x"$enable_mp4v2" = xno; then
+    AC_MSG_NOTICE([*** Building without MP4 support ***])
+else
+    AC_CHECK_LIB(mp4v2, MP4MetadataDelete,
+        [AC_MSG_NOTICE([*** Building with MP4 support ***])
+         MY_DEFINE([HAVE_LIBMP4V2])
+         LIBS="$LIBS -lstdc++ -lmp4v2"],
+        [if test x"$enable_mp4v2" = xyes; then
+            AC_MSG_ERROR([*** libmp4v2 not found. Can't build MP4 support ***])
+         else
+            AC_MSG_NOTICE([*** Building without MP4 support ***])
+         fi],
+        -lstdc++)
+fi
+
 AC_C_BIGENDIAN
 
 dnl Checks for header files required for mp4.h