[Mesa-dev] [PATCH 8/8] configure: cleanup libudev handling

[Ilia Mirkin]

On Wed, Jan 29, 2014 at 3:23 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Add the explicit note about the required version during configure.
> Require the same version (151) of udev when building the pipe-loader.
> Mention the udev version requirement in GBM Requires.private.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  configure.ac | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 994b3b2..98beafd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1174,7 +1174,7 @@ if test "x$enable_gbm" = xauto; then
>  fi
>  if test "x$enable_gbm" = xyes; then
>      if test x"$have_libudev" != xyes; then
> -        AC_MSG_ERROR([gbm needs udev])
> +        AC_MSG_ERROR([gbm requires udev >= $LIBUDEV_REQUIRED])
>      fi
>
>      if test "x$enable_dri" = xyes; then
> @@ -1185,7 +1185,7 @@ if test "x$enable_gbm" = xyes; then
>      fi
>  fi
>  AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes)
> -GBM_PC_REQ_PRIV="libudev"
> +GBM_PC_REQ_PRIV="libudev >= LIBUDEV_REQUIRED"
>  GBM_PC_LIB_PRIV="$DLOPEN_LIBS"
>  AC_SUBST([GBM_PC_REQ_PRIV])
>  AC_SUBST([GBM_PC_LIB_PRIV])
> @@ -1458,7 +1458,7 @@ for plat in $egl_platforms; do
>
>          case "$plat$have_libudev" in
>                  waylandno|drmno)
> -                    AC_MSG_ERROR([cannot build $plat platfrom without udev]) ;;
> +                    AC_MSG_ERROR([cannot build $plat platfrom without udev >= $LIBUDEV_REQUIRED]) ;;
>          esac
>  done
>
> @@ -1697,8 +1697,9 @@ gallium_require_llvm() {
>
>  gallium_require_drm_loader() {
>      if test "x$enable_gallium_loader" = xyes; then
> -        PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
> -                          AC_MSG_ERROR([Gallium drm loader requires libudev]))
> +        if x"$have_libudev" != xyes; then

Also this should be

if test "x$have_libudev" != xyes; then

or

if [ "x$have_libudev"....

(since [ is a symlink to test... but that doesn't seem to be the style
used here). Otherwise you will end up with a "xyes: command not found"
error.

> +            AC_MSG_ERROR([Gallium drm loader requires libudev >= LIBUDEV_REQUIRED]))
> +        fi
>          if test "x$have_libdrm" != xyes; then
>              AC_MSG_ERROR([Gallium drm loader requires libdrm >= $LIBDRM_REQUIRED])
>          fi
> --
> 1.8.5.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev