[Spice-commits] m4/spice-deps.m4

[Christophe Fergau]

 m4/spice-deps.m4 |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2eaf7c9572746bcc0edc52871974d4085618f3e5
Author: Lin Ma <lma at suse.com>
Date:   Mon Apr 18 15:18:25 2016 +0800

    build-sys: Define opengl GL_LIBS and GL_CFLAGS in generated Makefile.in
    
    SPICE_COMMON_{CFLAGS,LIBS} references '$(GL_{CFLAGS,LIBS)', so these
    variables are going to be expanded at 'make' time rather than at
    'configure' time.
    The linker flag and the compiler flag won't be substituted in the
    generated Makefile without AC_SUBST.
    It causes spice-gtk building failure with --enable-opengl option.
    
    The patch fixes this issue.
    
    Signed-off-by: Lin Ma <lma at suse.com>

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 170adf2..2f294f3 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -145,6 +145,8 @@ AC_DEFUN([SPICE_CHECK_OPENGL], [
     AM_CONDITIONAL(HAVE_GL, test "x$enable_opengl" = "xyes")
 
     if test "x$enable_opengl" = "xyes"; then
+        AC_SUBST(GL_CFLAGS)
+        AC_SUBST(GL_LIBS)
         AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
         AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", enable_opengl=no)
         AC_DEFINE([USE_OPENGL], [1], [Define to build with OpenGL support])