--- bootstrap.orig	2005-12-20 09:02:57.000000000 -0500
+++ bootstrap	2005-12-20 09:17:09.000000000 -0500
@@ -45,35 +45,6 @@
 fi
 
 allargs="$@"
-#
-# Test for faac and possible error
-#
-if test $target_system = "Linux"; then
-    have_faac=no
-    if which faac >/dev/null 2>/dev/null; then
-	have_faac=yes
-    fi
-
-    if test $have_faac = "yes"; then
-	# we have lame and faac - see if faac is built with mp4 support
-	faac --help >&faac_help
-	sdf=`grep "MP4 support unavailable" faac_help`
-	rm -f faac_help
-	if test -z "$sdf"; then
-	    if which mpeg4ip-config >/dev/null 2>/dev/null; then
-		echo "Warning - faac uses libmp4v, but we've detected a version"
-		echo "of mpeg4ip.  If you get errors building mp4live, please"
-		echo "rebuild faac without mp4v2 support"
-	    else
-		echo "Error - we have detected a version of faac that has libmp4v2 support"
-		echo "and no copy of mpeg4ip-config.  This means faac was built with"
-		echo "faad2 and the libraries will be incompatible".
-		echo "Please reinstall faac without mp4v2 support"
-		exit 1
-	    fi
-	fi
-    fi
-fi
 set -x
 
 # if src tree is created via cvs export to tar.gz