From 314d988b280b28bdebe12f5dae931e355c7c7ca1 Mon Sep 17 00:00:00 2001 From: "Konno, Joe" Date: Wed, 30 Jan 2013 07:38:57 -0800 Subject: [PATCH] configure: prevent premature HAVE_GLU check When cairo-gl and mesa-glu are present on the system, autoconf successfully recognizes both. However, I was wondering why weston-screensaver was not building since autoconf reported all dependencies were met. Move the mesa-glu PKG_CHECK before the conditional. Additionally, remove redundant check for enable_egl, as it is implied when GLU is 'yes.' Signed-off-by: Joe Konno --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f3ad9dc..d626f72 100644 --- a/configure.ac +++ b/configure.ac @@ -230,10 +230,10 @@ if test x$enable_weston_launch == xyes; then WESTON_LAUNCH_LIBS="$WESTON_LAUNCH_LIBS -lpam" fi -AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes" -a "$xenable_egl" = "xyes") if test x$enable_egl = xyes; then PKG_CHECK_MODULES(GLU, [glu], [have_glu=yes], [have_glu=no]) fi +AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes") AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") -- 2.7.4