# HG changeset patch
# User reimar
# Date 1392761699 0
# Node ID 568afd60302c0532f75a636d6f1b57ead1b3048b
# Parent  e18fb8b03241432cdd74a4ad59ccdc2975277879
configure: Fix PNG support for GUi check to always pass for external FFmpeg.

diff -r e18fb8b03241 -r 568afd60302c configure
--- 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