# HG changeset patch
# User diego
# Date 1177591149 0
# Node ID fab09eb403ed72cd157ff07729f34ee57a2ad974
# Parent  3f8ec638b3a718b3d8f2d44a6d47129de4d5df72
Merge config.h variable declarations into libavutil test.

diff -r 3f8ec638b3a7 -r fab09eb403ed configure
--- 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'