--- configure.orig	Wed Aug 23 09:46:04 2006
+++ configure	Wed Aug 23 21:49:44 2006
@@ -21673,10 +21673,10 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent'
 
 # Prevent multiple expansion
 
@@ -36974,7 +36974,7 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $all_libraries $LIBS 1>&5'
 
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -37019,7 +37019,7 @@
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	OLD_LIBS=$LIBS
-	LIBS="-lavformat -lavcodec -lavutil"
+	LIBS="-lavformat -lavcodec"
 	cat >conftest.$ac_ext <<_ACEOF
 #include <ffmpeg/avformat.h>
 		#include <ffmpeg/avcodec.h>