--- configure.orig	Sat Jan  1 23:53:48 2005
+++ configure	Sun Jan  2 22:05:19 2005
@@ -5297,7 +5297,7 @@
 # if cache empty (not tested or failed) and want static avcodec (then it failed) ...
 if ( `test \( \( x${ac_cv_lib_avcodec_img_convert+set} = x \) -a \( x$static_avcodec = xyes \) \)` ) ; then
 	# build embedded ffmpeg
-	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ${MAKE-make} )
+	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --cc=$CC --extra-libs=-lm --disable-opts --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ${MAKE-gmake} )
 	# try to link it statically, or reset cache, set static_avcodec=no
 	top_srcdir=`pwd`
 	ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat"
@@ -5658,9 +5658,6 @@
 
 echo "$as_me:$LINENO: checking for audio_init in -lavformat" >&5
 echo $ECHO_N "checking for audio_init in -lavformat... $ECHO_C" >&6
-if test "${ac_cv_lib_avformat_audio_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
 echo -n "(static?) ... "
 ac_check_lib_save_LIBS=$LIBS
@@ -5722,11 +5719,8 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_audio_init" >&5
 echo "${ECHO_T}$ac_cv_lib_avformat_audio_init" >&6
-else
-  ac_cv_lib_avformat_audio_init=no
-fi
 
-if test $ac_cv_lib_avformat_audio_init = yes; then
+if test x$ac_cv_lib_avformat_audio_init = xyes; then
   ac_my_have_ffmpeg_audio="1"
 else
   unset ac_cv_lib_avformat_audio_init ; echo "$as_me:$LINENO: checking for audio_init in -lavformat" >&5