Mercurial > mplayer.hg
changeset 36788:64a53697effe
configure: Revise some GUI related messages and output.
| author | ib |
|---|---|
| date | Wed, 19 Feb 2014 01:56:21 +0000 |
| parents | 4704c3f95273 |
| children | 82a86ba65249 |
| files | configure |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Feb 19 01:18:34 2014 +0000 +++ b/configure Wed Feb 19 01:56:21 2014 +0000 @@ -328,7 +328,7 @@ --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-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] @@ -7783,7 +7783,7 @@ # --------------- GUI specific tests begin ------------------- echocheck "GUI" -echo "$_gui" +echores "$_gui" if test "$_gui" = yes ; then # Required libraries @@ -7842,8 +7842,8 @@ echores "$_gtk" # Check for GLIB2 + echocheck "GLib version" 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" @@ -7852,24 +7852,24 @@ def_gtk2='#define CONFIG_GTK2 1' else _gtk1=yes - echo "GLIB-2 devel packages were not found, trying GTK 1.2" + echores "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" + 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" + 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)." + die "The GUI requires GTK+ devel packages (which were not found)." fi fi _gtk=$($_gtkconfig --version 2>&1) @@ -7878,14 +7878,14 @@ echores "$_gtk (using $_gtkconfig)" # Check for GLIB - echocheck "glib version" + 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)" + die "The GUI requires GLib devel packages (which were not found)" fi fi _glib=$($_glibconfig --version 2>&1) @@ -7925,7 +7925,7 @@ 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." + echo "Messages in the GTK+ interface will be broken then." exit 1 else echores "yes"