diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-03-16 10:03:53 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-03-17 11:10:48 +0100 |
| commit | b1546f3210d89662dca3e88e1021a0089f003551 (patch) | |
| tree | 86af716a2ac2efaf09461a1e15be6dcdbd049f28 | |
| parent | 17b11a1406fdc43b5022f32a6fbfcb005a353b38 (diff) | |
| download | qemu-b1546f3210d89662dca3e88e1021a0089f003551.tar.gz | |
opengl: fix configure test
Re-add the glx compile test to configure. We can't use pkg-config to
probe for glx, and as long as milkymist-tmu2 privately uses glx (due to
opengl infrastructure in qemu not being ready yet) we must continue to
test for glx to avoid build failures.
Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | configure | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -3119,9 +3119,24 @@ libs_softmmu="$libs_softmmu $fdt_libs" ########################################## # opengl probe (for sdl2, milkymist-tmu2) + +# GLX probe, used by milkymist-tmu2 +# this is temporary, code will be switched to egl mid-term. +cat > $TMPC << EOF +#include <X11/Xlib.h> +#include <GL/gl.h> +#include <GL/glx.h> +int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; } +EOF +if compile_prog "" "-lGL -lX11" ; then + have_glx=yes +else + have_glx=no +fi + if test "$opengl" != "no" ; then - opengl_pkgs="gl glx" - if $pkg_config $opengl_pkgs x11; then + opengl_pkgs="gl" + if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags" opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs" opengl=yes |