configure: remove redundant check, improve check

Without this, virglrenderer builds with gbm 17.3
for some reason.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Gurchetan Singh 5 years ago
parent b551878a46
commit 4d7bf46ec0
  1. 10
      configure.ac

@ -137,10 +137,11 @@ AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"]) AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"])
LIBDRM_REQUIRED=2.4.50 LIBDRM_REQUIRED=2.4.50
LIBGBM_REQUIRED=18.0.0
if test "x$os_win32" = xno && test "x$enable_egl" != "xno"; then if test "x$os_win32" = xno && test "x$enable_egl" != "xno"; then
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED]) PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
PKG_CHECK_MODULES([GBM], [gbm]) PKG_CHECK_MODULES([GBM], [gbm >= $LIBGBM_REQUIRED])
fi fi
PKG_CHECK_MODULES([EPOXY], [epoxy]) PKG_CHECK_MODULES([EPOXY], [epoxy])
@ -160,13 +161,6 @@ if test "x$enable_gbm_allocation" = xyes; then
AC_DEFINE([ENABLE_GBM_ALLOCATION], [1], [GBM will be used to allocate in some cases]) AC_DEFINE([ENABLE_GBM_ALLOCATION], [1], [GBM will be used to allocate in some cases])
fi fi
if test "x$os_win32" = xno; then
AS_IF([test "x$epoxy_has_egl" = "x1"], [
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
PKG_CHECK_MODULES([GBM], [gbm >= 18.0.0 ])
])
fi
epoxy_has_glx=`$PKG_CONFIG --variable=epoxy_has_glx epoxy` epoxy_has_glx=`$PKG_CONFIG --variable=epoxy_has_glx epoxy`
AS_IF([test "x$epoxy_has_glx" = "x1" && test "x$enable_glx" != "xno"], [ AS_IF([test "x$epoxy_has_glx" = "x1" && test "x$enable_glx" != "xno"], [
PKG_CHECK_MODULES([X11], [x11]) PKG_CHECK_MODULES([X11], [x11])

Loading…
Cancel
Save