Skip to content

Commit

Permalink
opengl: fix configure test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kraxel committed Mar 17, 2015
1 parent 17b11a1 commit b1546f3
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions configure
Expand Up @@ -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
Expand Down

0 comments on commit b1546f3

Please sign in to comment.