qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 3/6] configure / meson: Move check for drm.h to meson.build


From: Laurent Vivier
Subject: Re: [PATCH 3/6] configure / meson: Move check for drm.h to meson.build
Date: Sun, 13 Dec 2020 18:58:12 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0

Le 18/11/2020 à 18:10, Thomas Huth a écrit :
> This check can be done in a much shorter way in meson.build
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  configure   | 10 ----------
>  meson.build |  1 +
>  2 files changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/configure b/configure
> index 5a5e486373..b3e1052a58 100755
> --- a/configure
> +++ b/configure
> @@ -3088,13 +3088,6 @@ EOF
>      fi
>  fi
>  
> -#########################################
> -# libdrm check
> -have_drm_h=no
> -if check_include "libdrm/drm.h" ; then
> -    have_drm_h=yes
> -fi
> -
>  #########################################
>  # sys/signal.h check
>  have_sys_signal_h=no
> @@ -6185,9 +6178,6 @@ fi
>  if test "$auth_pam" = "yes" ; then
>      echo "CONFIG_AUTH_PAM=y" >> $config_host_mak
>  fi
> -if test "$have_drm_h" = "yes" ; then
> -  echo "HAVE_DRM_H=y" >> $config_host_mak
> -fi
>  if test "$have_broken_size_max" = "yes" ; then
>      echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
>  fi
> diff --git a/meson.build b/meson.build
> index 97a6445249..d6b633f17f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', 
> meson.project_version().split('.')[0]
>  config_host_data.set('QEMU_VERSION_MINOR', 
> meson.project_version().split('.')[1])
>  config_host_data.set('QEMU_VERSION_MICRO', 
> meson.project_version().split('.')[2])
>  
> +config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
>  config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
>  config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
>  
> 

Applied to my trivial-patches branch.

Thanks,
Laurent



reply via email to

[Prev in Thread] Current Thread [Next in Thread]