Mercurial > mplayer.hg

changeset 23115:66366cb13021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge config.h variable declarations into libavformat test.
author diego
date Thu, 26 Apr 2007 12:58:46 +0000
parents 6746f3da381b
children 7008af009c45
files configure
diffstat 1 files changed, 8 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Apr 26 12:53:26 2007 +0000
+++ b/configure	Thu Apr 26 12:58:46 2007 +0000
@@ -6259,7 +6259,15 @@
   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 @@
 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