[Mesa-dev] [PATCH 01/16] configure.ac: mark libdrm as have_pci_id provider
Emil Velikov
emil.l.velikov at gmail.com
Tue Oct 11 18:31:45 UTC 2016
From: Emil Velikov <emil.velikov at collabora.com>
With follow on work, we'll untangle and simplify all the different
codepaths in loader. Then again, we forget to set have_pci_id when
libdrm is present (one of the codepaths available).
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
configure.ac | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index b414edd..f57b00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1466,6 +1466,10 @@ if test "$have_sysfs" = yes; then
have_pci_id=yes
fi
+if test "$have_libdrm" = yes; then
+ have_pci_id=yes
+fi
+
# This is outside the case (above) so that it is invoked even for non-GLX
# builds.
AM_CONDITIONAL(HAVE_XF86VIDMODE, test "x$HAVE_XF86VIDMODE" = xyes)
@@ -1575,7 +1579,7 @@ if test "x$enable_dri" = xyes; then
fi
if test "x$have_pci_id" != xyes; then
- AC_MSG_ERROR([libudev-dev or sysfs required for building DRI])
+ AC_MSG_ERROR([libudev-dev, sysfs or libdrm >= $LIBDRM_REQUIRED required for building DRI])
fi
case "$host_cpu" in
@@ -1793,7 +1797,7 @@ if test "x$enable_gbm" = xauto; then
fi
if test "x$enable_gbm" = xyes; then
if test "x$need_pci_id$have_pci_id" = xyesno; then
- AC_MSG_ERROR([gbm requires udev >= $LIBUDEV_REQUIRED or sysfs])
+ AC_MSG_ERROR([gbm requires udev >= $LIBUDEV_REQUIRED, sysfs or libdrm >= $LIBDRM_REQUIRED])
fi
if test "x$enable_dri" = xyes; then
@@ -2110,7 +2114,7 @@ for plat in $egl_platforms; do
case "$plat$need_pci_id$have_pci_id" in
waylandyesno|drmyesno)
- AC_MSG_ERROR([cannot build $plat platform without udev >= $LIBUDEV_REQUIRED or sysfs]) ;;
+ AC_MSG_ERROR([cannot build $plat platform without udev >= $LIBUDEV_REQUIRED, sysfs or libdrm >= $LIBDRM_REQUIRED]) ;;
esac
done
@@ -2348,7 +2352,7 @@ gallium_require_llvm() {
gallium_require_drm_loader() {
if test "x$need_pci_id$have_pci_id" = xyesno; then
- AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED or sysfs])
+ AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED, sysfs or libdrm >= $LIBDRM_REQUIRED])
fi
}
--
2.10.0
More information about the mesa-dev
mailing list