comparison configure @ 36788:64a53697effe

configure: Revise some GUI related messages and output.

36787:4704c3f95273

Optional features:
  --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
  --disable-mplayer      disable MPlayer compilation [enable]
  --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]
  --enable-gtk1          force using GTK 1.2 for the GUI  [disable]
  --enable-termcap       use termcap database for key codes [autodetect]
  --enable-termios       use termios database for key codes [autodetect]
  --disable-iconv        disable iconv for encoding conversion [autodetect]
  --disable-langinfo     do not use langinfo [autodetect]
  --enable-lirc          enable LIRC (remote control) support [autodetect]

echores "$_xmms"


# --------------- GUI specific tests begin -------------------
echocheck "GUI"
echo "$_gui"
if test "$_gui" = yes ; then

  # Required libraries
  test "$ffmpeg" != yes && die "The GUI requires FFmpeg."
  test "$ffmpeg_so" = yes || case "$libavdecoders" in

    extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
    libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
    echores "$_gtk"

    # Check for GLIB2
    if $_pkg_config glib-2.0 --exists ; then
      echocheck "glib version"
      _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null)
      libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
      echores "$_glib"

      def_gui='#define CONFIG_GUI 1'
      def_gtk2='#define CONFIG_GTK2 1'
    else
      _gtk1=yes
      echo "GLIB-2 devel packages were not found, trying GTK 1.2"
    fi
  else
    echo "GTK-2 devel packages were not found, trying GTK 1.2"
    _gtk1=yes
  fi
fi

if test "$_gtk1" = yes ; then
  # Check for old GTK (1.2.x)
  echocheck "GTK version"
  if test -z "$_gtkconfig" ; then
    if ( gtk-config --version ) >/dev/null 2>&1 ; then
      _gtkconfig="gtk-config"
    elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
      _gtkconfig="gtk12-config"
    else
      die "The GUI requires GTK devel packages (which were not found)."
    fi
  fi
  _gtk=$($_gtkconfig --version 2>&1)
  extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
  libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
  echores "$_gtk (using $_gtkconfig)"

  # Check for GLIB
  echocheck "glib version"
  if test -z "$_glibconfig" ; then
    if ( glib-config --version ) >/dev/null 2>&1 ; then
      _glibconfig="glib-config"
    elif ( glib12-config --version ) >/dev/null 2>&1 ; then
      _glibconfig="glib12-config"
    else
      die "The GUI requires GLIB devel packages (which were not found)"
    fi
  fi
  _glib=$($_glibconfig --version 2>&1)
  libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
  echores "$_glib (using $_glibconfig)"

if test "$?" -ne 0 ; then
  echores "no"
    echo "No working iconv program found, use "
    echo "--charset=UTF-8 to continue anyway."
    echo "If you also have problems with iconv library functions use --charset=noconv."
    echo "Messages in the GTK-2 interface will be broken then."
    exit 1
else
  echores "yes"
fi
fi

36788:64a53697effe

Optional features:
  --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
  --disable-mplayer      disable MPlayer compilation [enable]
  --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]
  --enable-gtk1          force using GTK+ 1.2 for the GUI [disable]
  --enable-termcap       use termcap database for key codes [autodetect]
  --enable-termios       use termios database for key codes [autodetect]
  --disable-iconv        disable iconv for encoding conversion [autodetect]
  --disable-langinfo     do not use langinfo [autodetect]
  --enable-lirc          enable LIRC (remote control) support [autodetect]

echores "$_xmms"


# --------------- GUI specific tests begin -------------------
echocheck "GUI"
echores "$_gui"
if test "$_gui" = yes ; then

  # Required libraries
  test "$ffmpeg" != yes && die "The GUI requires FFmpeg."
  test "$ffmpeg_so" = yes || case "$libavdecoders" in

    extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
    libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
    echores "$_gtk"

    # Check for GLIB2
    echocheck "GLib version"
    if $_pkg_config glib-2.0 --exists ; then
      _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null)
      libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
      echores "$_glib"

      def_gui='#define CONFIG_GUI 1'
      def_gtk2='#define CONFIG_GTK2 1'
    else
      _gtk1=yes
      echores "GLib 2 devel packages were not found, trying GTK+ 1.2"
    fi
  else
    echores "GTK+ 2 devel packages were not found, trying GTK+ 1.2"
    _gtk1=yes
  fi
fi

if test "$_gtk1" = yes ; then
  # Check for old GTK (1.2.x)
  echocheck "GTK+ version"
  if test -z "$_gtkconfig" ; then
    if ( gtk-config --version ) >/dev/null 2>&1 ; then
      _gtkconfig="gtk-config"
    elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
      _gtkconfig="gtk12-config"
    else
      die "The GUI requires GTK+ devel packages (which were not found)."
    fi
  fi
  _gtk=$($_gtkconfig --version 2>&1)
  extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
  libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
  echores "$_gtk (using $_gtkconfig)"

  # Check for GLIB
  echocheck "GLib version"
  if test -z "$_glibconfig" ; then
    if ( glib-config --version ) >/dev/null 2>&1 ; then
      _glibconfig="glib-config"
    elif ( glib12-config --version ) >/dev/null 2>&1 ; then
      _glibconfig="glib12-config"
    else
      die "The GUI requires GLib devel packages (which were not found)"
    fi
  fi
  _glib=$($_glibconfig --version 2>&1)
  libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
  echores "$_glib (using $_glibconfig)"

if test "$?" -ne 0 ; then
  echores "no"
    echo "No working iconv program found, use "
    echo "--charset=UTF-8 to continue anyway."
    echo "If you also have problems with iconv library functions use --charset=noconv."
    echo "Messages in the GTK+ interface will be broken then."
    exit 1
else
  echores "yes"
fi
fi