Mercurial > mplayer.hg
changeset 31512:176e30f35c73
Revert the previous two commits to configure and clarify the res_comment.
| author | siretart |
|---|---|
| date | Mon, 28 Jun 2010 08:43:05 +0000 |
| parents | 13ca93203358 |
| children | 01f7cf82b7b1 |
| files | configure |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 <vpx/vpx_encoder.h> #include <vpx/vpx_decoder.h> #include <vpx/vp8dx.h> @@ -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'