diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:25:27 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:25:27 +0000 |
commit | 60b90aa68222e71775355507e021763ece715256 (patch) | |
tree | 4abf61fe858f8a8eabb03acedb80dd4fb7f8ccf8 /configure | |
parent | 4dbffcb9627d8cf922e5185f0503be75daa61b05 (diff) | |
download | mpv-60b90aa68222e71775355507e021763ece715256.tar.bz2 mpv-60b90aa68222e71775355507e021763ece715256.tar.xz |
Merge static and shared libpostproc checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23125 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -6265,20 +6265,14 @@ _libavformat=no 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' + _res_comment="static" fi -fi -echores "$_libpostproc_a" - - -if test "$_libpostproc_a" != yes ; then -echocheck "FFmpeg libpostproc (dynamic)" -if test "$_libpostproc_so" = auto ; then +elif test "$_libpostproc_so" = auto ; then _libpostproc_so=no cat > $TMPC << EOF #define USE_LIBPOSTPROC 1 @@ -6290,13 +6284,13 @@ if test "$_libpostproc_so" = auto ; then 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' |