diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:39:09 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 12:39:09 +0000 |
| commit | 0c94045c6f67e8b69afe391dfe8e95c8e17d1628 (patch) | |
| tree | 71ec326ad8ef9aa79e3e24c3cd77aec822e04e78 /configure | |
| parent | d6e42f30a1ec477bd3c27e175ae73375b8530e09 (diff) | |
| download | mpv-0c94045c6f67e8b69afe391dfe8e95c8e17d1628.tar.bz2 mpv-0c94045c6f67e8b69afe391dfe8e95c8e17d1628.tar.xz | |
Merge config.h variable declarations into libavutil test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23131 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -6175,7 +6175,11 @@ EOF fi fi _libavutil=no +_def_libavutil='#undef USE_LIBAVUTIL' +_def_libavutil_so='#undef USE_LIBAVUTIL_SO' test "$_libavutil_a" = yes || test "$_libavutil_so" = yes && _libavutil=yes +test "$_libavutil_a" = yes && _def_libavutil='#define USE_LIBAVUTIL 1' +test "$_libavutil_so" = yes && _def_libavutil='#define USE_LIBAVUTIL_SO 1' # neither static nor shared libavutil is available, but it is mandatory ... if test "$_libavutil" = no ; then die "You need static or shared libavutil, MPlayer will not compile without!" @@ -6265,14 +6269,6 @@ _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' -if test "$_libavutil_a" = yes ; then - _def_libavutil='#define USE_LIBAVUTIL 1' -elif test "$_libavutil_so" = yes ; then - _def_libavutil_so='#define USE_LIBAVUTIL_SO 1' -fi - _def_libavcodec='#undef USE_LIBAVCODEC' _def_libavcodec_so='#undef USE_LIBAVCODEC_SO' _def_lavc_dsputil='#undef USE_LIBAVCODEC_DSPUTIL' |