Mercurial > mplayer.hg
changeset 23107:18b824724eea
Merge static and shared libpostproc checks.
| author | diego |
|---|---|
| date | Thu, 26 Apr 2007 12:25:27 +0000 |
| parents | f47defd03fa8 |
| children | 7c60ea3e4902 |
| files | configure |
| diffstat | 1 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Apr 26 12:20:36 2007 +0000 +++ b/configure Thu Apr 26 12:25:27 2007 +0000 @@ -6265,20 +6265,14 @@ test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes echores "$_libavformat" -echocheck "FFmpeg libpostproc (static)" +echocheck "FFmpeg libpostproc" if test "$_libpostproc_a" = auto ; then _libpostproc_a=no if test -d libpostproc && test -f libpostproc/postprocess.h ; then - _libpostproc='yes' _libpostproc_a='yes' -fi -fi -echores "$_libpostproc_a" - - -if test "$_libpostproc_a" != yes ; then -echocheck "FFmpeg libpostproc (dynamic)" -if test "$_libpostproc_so" = auto ; then + _res_comment="static" +fi +elif test "$_libpostproc_so" = auto ; then _libpostproc_so=no cat > $TMPC << EOF #define USE_LIBPOSTPROC 1 @@ -6290,13 +6284,13 @@ EOF if cc_check -lpostproc $_ld_lm ; then _ld_extra="$_ld_extra -lpostproc" - _libpostproc=yes _libpostproc_so=yes _res_comment="using libpostproc.so, but static libpostproc is recommended" fi fi -echores "$_libpostproc_so" -fi #if test "$_libpostproc" != yes ; then +_libpostproc=no +test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes +echores "$_libpostproc" _def_libavutil='#undef USE_LIBAVUTIL' _def_libavutil_so='#undef USE_LIBAVUTIL_SO'