# HG changeset patch # User siretart # Date 1277714585 0 # Node ID 176e30f35c73a42be51f6d77823c9a54ffc89095 # Parent 13ca93203358926cf70f7861520394ce062c2756 Revert the previous two commits to configure and clarify the res_comment. diff -r 13ca93203358 -r 176e30f35c73 configure --- a/configure Mon Jun 28 08:26:14 2010 +0000 +++ b/configure Mon Jun 28 08:43:05 2010 +0000 @@ -7577,7 +7577,10 @@ echocheck "libvpx" if test "$_libvpx_lavc" = auto; then _libvpx_lavc=no - cat > $TMPC << EOF + if test "$_libavcodec_a" != yes; then + res_comment="dynamic linking to libvpx is irrelevant when using dynamic libavcodec" + else + cat > $TMPC << EOF #include #include #include @@ -7589,7 +7592,8 @@ return 0; } EOF - cc_check -lvpx && _libvpx_lavc=yes && extra_ldflags="$extra_ldflags -lvpx" + cc_check -lvpx && _libvpx_lavc=yes && extra_ldflags="$extra_ldflags -lvpx" + fi fi if test "$_libvpx_lavc" = yes ; then def_libvpx_lavc='#define CONFIG_LIBVPX 1'