Lines 130-135
Link Here
|
130 |
Optional features: |
130 |
Optional features: |
131 |
--disable-mencoder disable mencoder (a/v encoder) compilation [enable] |
131 |
--disable-mencoder disable mencoder (a/v encoder) compilation [enable] |
132 |
--enable-gui enable gmplayer compilation (gtk-1.2 GUI) [disable] |
132 |
--enable-gui enable gmplayer compilation (gtk-1.2 GUI) [disable] |
|
|
133 |
--enable-gtk2 enable gtk2 port of the gui [disable] |
133 |
--enable-largefiles enable support for files > 2 GBytes [disable] |
134 |
--enable-largefiles enable support for files > 2 GBytes [disable] |
134 |
--enable-linux-devfs set default devices to devfs ones [disable] |
135 |
--enable-linux-devfs set default devices to devfs ones [disable] |
135 |
--enable-termcap use termcap database for key codes [autodetect] |
136 |
--enable-termcap use termcap database for key codes [autodetect] |
Lines 1007-1012
Link Here
|
1007 |
_opendivx=no |
1008 |
_opendivx=no |
1008 |
_lirc=auto |
1009 |
_lirc=auto |
1009 |
_gui=no |
1010 |
_gui=no |
|
|
1011 |
_gtk2=no |
1010 |
_termcap=auto |
1012 |
_termcap=auto |
1011 |
_termios=auto |
1013 |
_termios=auto |
1012 |
_3dfx=no |
1014 |
_3dfx=no |
Lines 1174-1179
Link Here
|
1174 |
--disable-lirc) _lirc=no ;; |
1176 |
--disable-lirc) _lirc=no ;; |
1175 |
--enable-gui) _gui=yes ;; |
1177 |
--enable-gui) _gui=yes ;; |
1176 |
--disable-gui) _gui=no ;; |
1178 |
--disable-gui) _gui=no ;; |
|
|
1179 |
--enable-gtk2) _gtk2=yes ;; |
1180 |
--disable-gtk2) _gtk2=no ;; |
1177 |
--enable-termcap) _termcap=yes ;; |
1181 |
--enable-termcap) _termcap=yes ;; |
1178 |
--disable-termcap) _termcap=no ;; |
1182 |
--disable-termcap) _termcap=no ;; |
1179 |
--enable-termios) _termios=yes ;; |
1183 |
--enable-termios) _termios=yes ;; |
Lines 4386-4427
Link Here
|
4386 |
fi |
4390 |
fi |
4387 |
echores "$_xshape" |
4391 |
echores "$_xshape" |
4388 |
|
4392 |
|
|
|
4393 |
# Check for new GTK (2.x.x) |
4394 |
if test "$_gtk2" = yes ; then |
4395 |
|
4396 |
# Check for GTK: |
4397 |
echocheck "GTK+ version" |
4389 |
|
4398 |
|
4390 |
# Check for GTK: |
4399 |
_gtk=`pkg-config gtk+-2.0 --modversion 2>&1` |
4391 |
echocheck "gtk version" |
4400 |
_inc_gtk=`pkg-config gtk+-2.0 --cflags 2>&1` |
4392 |
if test -z "$_gtkconfig" ; then |
4401 |
_ld_gtk=`pkg-config gtk+-2.0 --libs 2>&1` |
4393 |
if ( gtk-config --version ) >/dev/null 2>&1 ; then |
4402 |
echores "$_gtk" |
4394 |
_gtkconfig="gtk-config" |
4403 |
|
4395 |
elif ( gtk12-config --version ) >/dev/null 2>&1 ; then |
4404 |
# Check for GLIB |
4396 |
_gtkconfig="gtk12-config" |
4405 |
echocheck "glib version" |
4397 |
else |
4406 |
_glib=`pkg-config glib-2.0 --modversion 2>&1` |
4398 |
die "the GUI requires GTK (which was not found)" |
4407 |
_inc_glib=`pkg-config glib-2.0 --cflags 2>&1` |
|
|
4408 |
_ld_glib=`pkg-config glib-2.0 --libs 2>&1` |
4409 |
echores "$_glib" |
4410 |
|
4411 |
_def_gui='#define HAVE_NEW_GUI 1' |
4412 |
_def_gtk2_gui='#define HAVE_GTK2_GUI 1' |
4413 |
_ld_gui='$(GTKLIB) $(GLIBLIB)' |
4414 |
|
4415 |
# Check for "old" GTK (1.2.x) |
4416 |
else |
4417 |
|
4418 |
# Check for GTK: |
4419 |
echocheck "GTK+ version" |
4420 |
if test -z "$_gtkconfig" ; then |
4421 |
if ( gtk-config --version ) >/dev/null 2>&1 ; then |
4422 |
_gtkconfig="gtk-config" |
4423 |
elif ( gtk12-config --version ) >/dev/null 2>&1 ; then |
4424 |
_gtkconfig="gtk12-config" |
4425 |
else |
4426 |
die "the GUI requires GTK+ (which was not found)" |
4427 |
fi |
4399 |
fi |
4428 |
fi |
4400 |
fi |
4429 |
_gtk=`$_gtkconfig --version 2>&1` |
4401 |
_gtk=`$_gtkconfig --version 2>&1` |
4430 |
_inc_gtk=`$_gtkconfig --cflags 2>&1` |
4402 |
_inc_gtk=`$_gtkconfig --cflags 2>&1` |
4431 |
_ld_gtk=`$_gtkconfig --libs 2>&1` |
4403 |
_ld_gtk=`$_gtkconfig --libs 2>&1` |
4432 |
echores "$_gtk (using $_gtkconfig)" |
4404 |
echores "$_gtk (using $_gtkconfig)" |
4433 |
|
4405 |
|
4434 |
# Check for GLIB |
4406 |
# Check for GLIB |
4435 |
echocheck "glib version" |
4407 |
echocheck "glib version" |
4436 |
if test -z "$_glibconfig" ; then |
4408 |
if test -z "$_glibconfig" ; then |
4437 |
if ( glib-config --version ) >/dev/null 2>&1 ; then |
4409 |
if ( glib-config --version ) >/dev/null 2>&1 ; then |
4438 |
_glibconfig="glib-config" |
4410 |
_glibconfig="glib-config" |
4439 |
elif ( glib12-config --version ) >/dev/null 2>&1 ; then |
4411 |
elif ( glib12-config --version ) >/dev/null 2>&1 ; then |
4440 |
_glibconfig="glib12-config" |
4412 |
_glibconfig="glib12-config" |
4441 |
else |
4413 |
else |
4442 |
die "the GUI requires GLIB (which was not found)" |
4414 |
die "the GUI requires GLIB (which was not found)" |
4443 |
fi |
4415 |
fi |
4444 |
fi |
4416 |
fi |
|
|
4417 |
_glib=`$_glibconfig --version 2>&1` |
4418 |
_inc_glib=`$_glibconfig --cflags 2>&1` |
4419 |
_ld_glib=`$_glibconfig --libs 2>&1` |
4420 |
echores "$_glib (using $_glibconfig)" |
4421 |
|
4422 |
_def_gui='#define HAVE_NEW_GUI 1' |
4423 |
_ld_gui='$(GTKLIB) $(GLIBLIB)' |
4424 |
|
4445 |
|
|
|
4446 |
_glib=`$_glibconfig --version 2>&1` |
4447 |
_inc_glib=`$_glibconfig --cflags 2>&1` |
4448 |
_ld_glib=`$_glibconfig --libs 2>&1` |
4449 |
echores "$_glib (using $_glibconfig)" |
4450 |
|
4451 |
_def_gui='#define HAVE_NEW_GUI 1' |
4452 |
_def_gtk2_gui='#undef HAVE_GTK2_GUI' |
4453 |
_ld_gui='$(GTKLIB) $(GLIBLIB)' |
4454 |
|
4455 |
fi |
4456 |
|
4425 |
echo "Creating Gui/config.mak" |
4457 |
echo "Creating Gui/config.mak" |
4426 |
cat > Gui/config.mak << EOF |
4458 |
cat > Gui/config.mak << EOF |
4427 |
# -------- Generated by configure ----------- |
4459 |
# -------- Generated by configure ----------- |
Lines 4435-4440
Link Here
|
4435 |
|
4467 |
|
4436 |
else |
4468 |
else |
4437 |
_def_gui='#undef HAVE_NEW_GUI' |
4469 |
_def_gui='#undef HAVE_NEW_GUI' |
|
|
4470 |
_def_gtk2_gui='#undef HAVE_GTK2_GUI' |
4438 |
fi |
4471 |
fi |
4439 |
# --------------- GUI specific tests end ------------------- |
4472 |
# --------------- GUI specific tests end ------------------- |
4440 |
|
4473 |
|
Lines 4962-4967
Link Here
|
4962 |
|
4995 |
|
4963 |
/* gui support, please do not edit this option */ |
4996 |
/* gui support, please do not edit this option */ |
4964 |
$_def_gui |
4997 |
$_def_gui |
|
|
4998 |
$_def_gtk2_gui |
4965 |
|
4999 |
|
4966 |
/* Audio output drivers */ |
5000 |
/* Audio output drivers */ |
4967 |
$_def_ossaudio |
5001 |
$_def_ossaudio |