Mercurial > mplayer.hg

comparison configure @ 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
comparison
equal deleted inserted replaced
36785:e18fb8b03241 36786:568afd60302c
7772 echocheck "GUI" 7772 echocheck "GUI"
7773 echo "$_gui" 7773 echo "$_gui"
7774 if test "$_gui" = yes ; then 7774 if test "$_gui" = yes ; then
7775 7775
7776 # Required libraries 7776 # Required libraries
7777 if test "$ffmpeg" != yes || 7777 test "$ffmpeg" != yes && die "The GUI requires FFmpeg."
7778 ! echo $libavdecoders | grep -q PNG_DECODER ; then 7778 test "$ffmpeg_so" = yes || case "$libavdecoders" in
7779 die "The GUI requires libavcodec with PNG support (needs zlib)." 7779 *PNG_DECODER*) ;;
7780 fi 7780 *) die "The GUI requires libavcodec with PNG support (needs zlib)." ;;
7781 esac
7781 test "$_freetype" = no && test "$_bitmap_font" = no && 7782 test "$_freetype" = no && test "$_bitmap_font" = no &&
7782 die "The GUI requires either FreeType or bitmap font support." 7783 die "The GUI requires either FreeType or bitmap font support."
7783 if ! win32 ; then 7784 if ! win32 ; then
7784 _gui_gtk=yes 7785 _gui_gtk=yes
7785 test "$_x11" != yes && die "X11 support required for GUI compilation." 7786 test "$_x11" != yes && die "X11 support required for GUI compilation."