Mercurial > mplayer.hg
changeset 23113:fab09eb403ed
Merge config.h variable declarations into libavutil test.
| author | diego |
|---|---|
| date | Thu, 26 Apr 2007 12:39:09 +0000 |
| parents | 3f8ec638b3a7 |
| children | 6746f3da381b |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Apr 26 12:35:32 2007 +0000 +++ b/configure Thu Apr 26 12:39:09 2007 +0000 @@ -6175,7 +6175,11 @@ 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 @@ 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'