Mercurial > mplayer.hg
comparison configure @ 27343:5fe6a8adf569
Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2
| author | diego |
|---|---|
| date | Wed, 30 Jul 2008 13:44:59 +0000 |
| parents | 3a174cb28d36 |
| children | d83952beeaca |
comparison
equal
deleted
inserted
replaced
| 27342:3a174cb28d36 | 27343:5fe6a8adf569 |
|---|---|
| 7408 echocheck "glib version" | 7408 echocheck "glib version" |
| 7409 _glib=`$_pkg_config glib-2.0 --modversion 2>/dev/null` | 7409 _glib=`$_pkg_config glib-2.0 --modversion 2>/dev/null` |
| 7410 _libs_mplayer="$_libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`" | 7410 _libs_mplayer="$_libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`" |
| 7411 echores "$_glib" | 7411 echores "$_glib" |
| 7412 | 7412 |
| 7413 _def_gui='#define HAVE_NEW_GUI 1' | 7413 _def_gui='#define CONFIG_GUI 1' |
| 7414 _def_gtk2_gui='#define HAVE_GTK2_GUI 1' | 7414 _def_gtk2='#define CONFIG_GTK2 1' |
| 7415 else | 7415 else |
| 7416 _gtk1=yes | 7416 _gtk1=yes |
| 7417 echo "GLIB-2 devel packages were not found, trying GTK 1.2" | 7417 echo "GLIB-2 devel packages were not found, trying GTK 1.2" |
| 7418 fi | 7418 fi |
| 7419 else | 7419 else |
| 7452 fi | 7452 fi |
| 7453 _glib=`$_glibconfig --version 2>&1` | 7453 _glib=`$_glibconfig --version 2>&1` |
| 7454 _libs_mplayer="$_libs_mplayer `$_glibconfig --libs 2>&1`" | 7454 _libs_mplayer="$_libs_mplayer `$_glibconfig --libs 2>&1`" |
| 7455 echores "$_glib (using $_glibconfig)" | 7455 echores "$_glib (using $_glibconfig)" |
| 7456 | 7456 |
| 7457 _def_gui='#define HAVE_NEW_GUI 1' | 7457 _def_gui='#define CONFIG_GUI 1' |
| 7458 _def_gtk2_gui='#undef HAVE_GTK2_GUI' | 7458 _def_gtk2='#undef CONFIG_GTK2' |
| 7459 fi | 7459 fi |
| 7460 | 7460 |
| 7461 else #if ! win32 | 7461 else #if ! win32 |
| 7462 _gui_win32=yes | 7462 _gui_win32=yes |
| 7463 _libs_mplayer="$_libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32" | 7463 _libs_mplayer="$_libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32" |
| 7464 _def_gui='#define HAVE_NEW_GUI 1' | 7464 _def_gui='#define CONFIG_GUI 1' |
| 7465 _def_gtk2_gui='#undef HAVE_GTK2_GUI' | 7465 _def_gtk2='#undef CONFIG_GTK2' |
| 7466 fi #if ! win32 | 7466 fi #if ! win32 |
| 7467 | 7467 |
| 7468 else #if test "$_gui" | 7468 else #if test "$_gui" |
| 7469 _def_gui='#undef HAVE_NEW_GUI' | 7469 _def_gui='#undef CONFIG_GUI' |
| 7470 _def_gtk2_gui='#undef HAVE_GTK2_GUI' | 7470 _def_gtk2='#undef CONFIG_GTK2' |
| 7471 fi #if test "$_gui" | 7471 fi #if test "$_gui" |
| 7472 # --------------- GUI specific tests end ------------------- | 7472 # --------------- GUI specific tests end ------------------- |
| 7473 | 7473 |
| 7474 | 7474 |
| 7475 if test "$_charset" = "noconv" ; then | 7475 if test "$_charset" = "noconv" ; then |
| 8343 /* Use UnRAR executable for Vobsubs */ | 8343 /* Use UnRAR executable for Vobsubs */ |
| 8344 $_def_unrar_exec | 8344 $_def_unrar_exec |
| 8345 | 8345 |
| 8346 /* gui support, please do not edit this option */ | 8346 /* gui support, please do not edit this option */ |
| 8347 $_def_gui | 8347 $_def_gui |
| 8348 $_def_gtk2_gui | 8348 $_def_gtk2 |
| 8349 | 8349 |
| 8350 /* Audio output drivers */ | 8350 /* Audio output drivers */ |
| 8351 $_def_ossaudio | 8351 $_def_ossaudio |
| 8352 $_def_ossaudio_devdsp | 8352 $_def_ossaudio_devdsp |
| 8353 $_def_ossaudio_devmixer | 8353 $_def_ossaudio_devmixer |