summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Ma <lma@suse.com>2016-04-18 15:18:25 +0800
committerChristophe Fergeau <cfergeau@redhat.com>2016-04-18 10:59:07 +0200
commit2eaf7c9572746bcc0edc52871974d4085618f3e5 (patch)
tree44ead24d7ab34dddb4807e67988ce2d93cb24925
parent5603961ffae7b8a0160e4d6e29ca506b7c3721d2 (diff)
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@suse.com>
-rw-r--r--m4/spice-deps.m42
1 files changed, 2 insertions, 0 deletions
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])