[MPlayer-cvslog] r36882 - trunk/configure

[reimar]

Author: reimar
Date: Tue Feb 18 23:14:59 2014
New Revision: 36882

Log:
configure: Fix PNG support for GUi check to always pass for external FFmpeg.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Feb 18 23:06:12 2014	(r36881)
+++ trunk/configure	Tue Feb 18 23:14:59 2014	(r36882)
@@ -7774,10 +7774,11 @@ echo "$_gui"
 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