Commit b1546f32 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 17b11a14

configure

+17 −2
Original line number Diff line number Diff line
@@ -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