Mercurial > mplayer.hg

changeset 36786:568afd60302c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: Fix PNG support for GUi check to always pass for external FFmpeg.
author reimar
date Tue, 18 Feb 2014 22:14:59 +0000
parents e18fb8b03241
children 4704c3f95273
files configure
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Feb 18 22:06:12 2014 +0000
+++ b/configure	Tue Feb 18 22:14:59 2014 +0000
@@ -7774,10 +7774,11 @@
 if test "$_gui" = yes ; then
 
   # Required libraries
-  if test "$ffmpeg" != yes ||
-      ! echo $libavdecoders | grep -q PNG_DECODER ; then
-    die "The GUI requires libavcodec with PNG support (needs zlib)."
-  fi
+  test "$ffmpeg" != yes && die "The GUI requires FFmpeg."
+  test "$ffmpeg_so" = yes || case "$libavdecoders" in
+      *PNG_DECODER*) ;;
+      *) die "The GUI requires libavcodec with PNG support (needs zlib)." ;;
+  esac
   test "$_freetype" = no && test "$_bitmap_font" = no &&
     die "The GUI requires either FreeType or bitmap font support."
 if ! win32 ; then