]> code.ossystems Code Review - openembedded-core.git/commitdiff
mesa-demos: Fix building demos which require GLU.
authorDrew Moseley <drew_moseley@mentor.com>
Tue, 21 Jul 2015 12:19:08 +0000 (08:19 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 22 Jul 2015 22:25:00 +0000 (23:25 +0100)
Set glu_enabled when pkg-config detects GLU.  This is needed so
that HAVE_GLU is properly set to enable the GLU based demos.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch

index 4b07193a7f81d443d64a4206514740d7bf30766e..6b58c2b776072a8e862ce705e9b5d56b6ae4a05e 100644 (file)
@@ -66,7 +66,7 @@ index 9445424..bc4c8d1 100644
 -DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
 -DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
 +if test "x$enable_glu" = xyes; then
-+    PKG_CHECK_MODULES(GLU, [glu], [],
++    PKG_CHECK_MODULES(GLU, [glu], [glu_enabled=yes],
 +                     [AC_CHECK_HEADER([GL/glu.h],
 +                                      [],
 +                                      AC_MSG_ERROR([GLU not found]))