[Glamor] [PATCH] Fix configure to disable building Dri3 support when GBM is missing

[Axel Davy]

Signed-off-by: Axel Davy <axel.davy at ens.fr>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 21bc794..32b4e1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,11 +123,11 @@ if test "x$GLAMOR_XV" = xyes; then
 fi
 
 PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
+PKG_CHECK_MODULES(GBM, $LIBGBM, [GBM=yes], [GBM=no])
 PKG_CHECK_MODULES(EGL, $LIBEGL, [EGL=yes], [EGL=no])
 AM_CONDITIONAL([EGL], [test "x$EGL" = xyes])
 
 if test "x$EGL = xyes"; then
-   PKG_CHECK_MODULES(GBM, $LIBGBM, [GBM=yes], [GBM=no])
    if test "x$GBM" = xyes; then
      AC_DEFINE(GLAMOR_HAS_GBM, 1, [Use GBM.])
      AC_DEFINE(GLX_USE_SHARED_DISPATCH, 1, [GLX and GLAMOR share the glapi dispatch table.])
@@ -137,7 +137,7 @@ fi
 AC_MSG_CHECKING([Enable Glamor Dri3 helpers])
 AC_ARG_ENABLE(glamor-dri3, AS_HELP_STRING([--enable-glamor-dri3], [Build glamor Dri3 helpers (default: yes if gbm is detected)]), [GLAMOR_DRI3_HELPERS="$enableval"], [GLAMOR_DRI3_HELPERS=yes])
 
-if test "x$GLAMOR_DRI3_HELPERS" = xyes -a "x$GLAMOR_HAS_GBM" = xno; then
+if test "x$GLAMOR_DRI3_HELPERS" = xyes -a "x$GBM" = xno; then
    GLAMOR_DRI3_HELPERS=no
 fi
 
-- 
1.8.1.2