From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXoao-0006Td-Ox for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXoai-0000HY-H5 for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:19:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXoai-0000HS-BU for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:19:16 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 13B908E3C9 for ; Tue, 17 Mar 2015 10:19:16 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 17 Mar 2015 11:19:07 +0100 Message-Id: <1426587547-13520-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1426587547-13520-1-git-send-email-kraxel@redhat.com> References: <1426587547-13520-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/1] opengl: fix configure test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 Signed-off-by: Gerd Hoffmann Reviewed-by: Max Reitz --- configure | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b858756..f74a6fd 100755 --- a/configure +++ b/configure @@ -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 +#include +#include +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 -- 1.8.3.1