diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2013-03-23 14:23:26 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-23 14:23:26 +0000 |
commit | f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de (patch) | |
tree | 3c25bcedc8bceaf355720888604c8c251f3c68c4 /configure | |
parent | d76bb73549fcac07524aea5135280ea533a94fd6 (diff) | |
parent | b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (diff) |
Merge branch 'for-upstream' of git://github.com/mwalle/qemu
* 'for-upstream' of git://github.com/mwalle/qemu:
configure: rename OpenGL feature to GLX
configure: proper OpenGL/GLX probe
target-lm32: use HELPER() macro
target-lm32: flush tlb after clearing env
target-lm32: remove dead code
target-lm32: fix cmpgui and cmpgeui opcodes
tests: tcg: lm32: add more test cases
target-lm32: don't log cpu state in translation
lm32_uart: fix receive buffering
milkymist-uart: fix receive buffering
lm32-dis: fix NULL pointer dereference
target-lm32: fix debug memory access
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -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" ;; @@ -2436,23 +2436,23 @@ 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> #include <GL/glx.h> -int main(void) { return GL_VERSION != 0; } +int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; } EOF - if compile_prog "" "-lGL" ; then - opengl=yes + if compile_prog "" "-lGL -lX11" ; then + 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 @@ -3430,7 +3430,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" @@ -3741,8 +3741,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 @@ -4020,7 +4020,7 @@ case "$target_arch2" in target_nptl="yes" ;; lm32) - target_libs_softmmu="$opengl_libs" + target_libs_softmmu="$glx_libs" ;; m68k) bflt="yes" |