mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: prevent premature HAVE_GLU check

Browse Source 
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 <joe.konno@intel.com>
This commit is contained in:
Konno, Joe 2013-01-30 07:38:57 -08:00 committed by Kristian Høgsberg
parent 209e8f177a
commit 314d988b28
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -230,10 +230,10 @@ if test x$enable_weston_launch == xyes; then
WESTON_LAUNCH_LIBS="$WESTON_LAUNCH_LIBS -lpam" WESTON_LAUNCH_LIBS="$WESTON_LAUNCH_LIBS -lpam"
fi fi
AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes" -a "$xenable_egl" = "xyes")
if test x$enable_egl = xyes; then if test x$enable_egl = xyes; then
PKG_CHECK_MODULES(GLU, [glu], [have_glu=yes], [have_glu=no]) PKG_CHECK_MODULES(GLU, [glu], [have_glu=yes], [have_glu=no])
fi fi
AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes")
AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")