Merge static and shared libavformat checks.

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

1 files changed, 18 insertions, 23 deletions

diff --git a/configure b/configure
index 377ef9a4a0..c8a3e66cd6 100755
--- a/configure
+++ b/configure
@@ -6235,31 +6235,15 @@ _libavcodec=no
 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes
 echores "$_libavcodec"
 
-echocheck "FFmpeg libavformat (static)"
+echocheck "FFmpeg libavformat"
 if test "$_libavformat_a" = auto ; then
   # Note: static linking is preferred to dynamic linking
   _libavformat_a=no
   if test -d libavformat && test -f libavformat/utils.c ; then
-    _libavformat=yes
     _libavformat_a=yes
+    _res_comment="static"
   fi
-fi
-echores "$_libavformat_a"
-
-echocheck "FFmpeg libpostproc (static)"
-if test "$_libpostproc_a" = auto ; then
-_libpostproc_a=no
-if test -d libpostproc && test -f libpostproc/postprocess.h ; then
-   _libpostproc='yes'
-   _libpostproc_a='yes'
-fi
-fi
-echores "$_libpostproc_a"
-
-
-if test "$_libavformat_a" != yes ; then
-echocheck "FFmpeg libavformat (dynamic)"
-if test "$_libavformat_so" = auto ; then
+elif test "$_libavformat_so" = auto ; then
   _libavformat_so=no
   cat > $TMPC <<EOF
   #include <ffmpeg/avformat.h>
@@ -6270,16 +6254,27 @@ EOF
     _inc_libavformat=`$_pkg_config --cflags libavformat`
     _ld_tmp=`$_pkg_config --libs libavformat`
     cc_check $_inc_libavformat $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \
-      && _libavformat=yes && _libavformat_so=yes
+      && _libavformat_so=yes
   elif cc_check $_ld_lm -lavformat ; then
     _ld_extra="$_ld_extra -lavformat"
-    _libavformat=yes
     _libavformat_so=yes
     _res_comment="using libavformat.so, but static libavformat is recommended"
   fi
 fi
-echores "$_libavformat_so"
-fi #if test "$_libavformat" != yes ; then
+_libavformat=no
+test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes
+echores "$_libavformat"
+
+echocheck "FFmpeg libpostproc (static)"
+if test "$_libpostproc_a" = auto ; then
+_libpostproc_a=no
+if test -d libpostproc && test -f libpostproc/postprocess.h ; then
+   _libpostproc='yes'
+   _libpostproc_a='yes'
+fi
+fi
+echores "$_libpostproc_a"
+
 
 if test "$_libpostproc_a" != yes ; then
 echocheck "FFmpeg libpostproc (dynamic)"