motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: rename OpenGL feature to GLX

Browse source 
As the probe now actually checks for the availability of GLX, rename it
accordingly. The only user of this feature is the milkymist-tmu2 model.

Signed-off-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Michael Walle 2013-03-06 20:23:32 +01:00
parent d3fcbb1678
commit b1e5fff4af
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
configure vendored
View file

@ -217,7 +217,7 @@ spice=""
rbd=""
smartcard_nss=""
usb_redir=""
opengl=""
glx=""
zlib="yes"
guest_agent="yes"
want_tools="yes"
@ -858,9 +858,9 @@ for opt do
;;
--enable-vhost-net) vhost_net="yes"
;;
--disable-opengl) opengl="no"
--disable-glx) glx="no"
;;
--enable-opengl) opengl="yes"
--enable-glx) glx="yes"
;;
--disable-rbd) rbd="no"
;;
@ -2435,9 +2435,9 @@ EOF
fi
##########################################
# opengl probe, used by milkymist-tmu2
if test "$opengl" != "no" ; then
opengl_libs="-lGL -lX11"
# GLX probe, used by milkymist-tmu2
if test "$glx" != "no" ; then
glx_libs="-lGL -lX11"
cat > $TMPC << EOF
#include <X11/Xlib.h>
#include <GL/gl.h>
@ -2445,13 +2445,13 @@ if test "$opengl" != "no" ; then
int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }
EOF
if compile_prog "" "-lGL -lX11" ; then
opengl=yes
glx=yes
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl"
if test "$glx" = "yes" ; then
feature_not_found "glx"
fi
opengl_libs=
opengl=no
glx_libs=
glx=no
fi
fi
@ -3429,7 +3429,7 @@ echo "rbd support $rbd"
echo "xfsctl support $xfs"
echo "nss used $smartcard_nss"
echo "usb net redir $usb_redir"
echo "OpenGL support $opengl"
echo "GLX support $glx"
echo "libiscsi support $libiscsi"
echo "build guest agent $guest_agent"
echo "seccomp support $seccomp"
@ -3740,8 +3740,8 @@ if test "$usb_redir" = "yes" ; then
echo "CONFIG_USB_REDIR=y" >> $config_host_mak
fi
if test "$opengl" = "yes" ; then
echo "CONFIG_OPENGL=y" >> $config_host_mak
if test "$glx" = "yes" ; then
echo "CONFIG_GLX=y" >> $config_host_mak
fi
if test "$libiscsi" = "yes" ; then
@ -4019,7 +4019,7 @@ case "$target_arch2" in
target_nptl="yes"
;;
lm32)
target_libs_softmmu="$opengl_libs"
target_libs_softmmu="$glx_libs"
;;
m68k)
bflt="yes"