Merge config.h variable declarations into libavformat test.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23133 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 8 insertions, 17 deletions

diff --git a/configure b/configure
index 082be1072b..837b9943ad 100755
--- a/configure
+++ b/configure
@@ -6259,7 +6259,15 @@ EOF
   fi
 fi
 _libavformat=no
+_def_libavformat='#undef USE_LIBAVFORMAT'
+_def_libavformat_so='#undef USE_LIBAVFORMAT_SO'
+_def_libavformat_win32='#undef CONFIG_WIN32'
 test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes
+test "$_libavformat_a"  = yes && _def_libavformat='#define USE_LIBAVFORMAT 1'
+test "$_libavformat_so" = yes \
+  && _def_libavformat_so='#define USE_LIBAVFORMAT_SO 1'
+fi
+win32 && _def_libavformat_win32='#define CONFIG_WIN32 1'
 echores "$_libavformat"
 
 echocheck "FFmpeg libpostproc"
@@ -6287,23 +6295,6 @@ _libpostproc=no
 test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes
 echores "$_libpostproc"
 
-_def_libavformat='#undef USE_LIBAVFORMAT'
-_def_libavformat_so='#undef USE_LIBAVFORMAT_SO'
-_def_libavformat_win32='#undef CONFIG_WIN32'
-if test "$_libavformat_a" = yes ; then
-  _def_libavformat='#define USE_LIBAVFORMAT 1'
-  if win32 ; then
-    _def_libavformat_win32='#define CONFIG_WIN32 1'
-  fi
-else
-  if test "$_libavformat_so" = yes ; then
-    _def_libavformat_so='#define USE_LIBAVFORMAT_SO 1'
-    if win32 ; then
-      _def_libavformat_win32='#define CONFIG_WIN32 1'
-    fi
-  fi
-fi
-
 _def_libpostproc='#undef USE_LIBPOSTPROC'
 _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
 if test "$_libpostproc_a" = yes ; then