aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-07-13 13:09:02 +0200
committerThomas Huth <thuth@redhat.com>2021-09-06 10:00:14 +0200
commit8bc5184d23c2f95727021844895a24c0579928b2 (patch)
tree91500cd626cebd5dad33794410917cb1461e0fb4 /configure
parent6c22853c733efd0a3d243bab48f8af66588f4a7a (diff)
downloadqemu-8bc5184d23c2f95727021844895a24c0579928b2.zip
qemu-8bc5184d23c2f95727021844895a24c0579928b2.tar.gz
qemu-8bc5184d23c2f95727021844895a24c0579928b2.tar.bz2
configure / meson: Move the GBM handling to meson.build
The GBM library detection does not need to be in the configure script, since it does not have any user-facing options (there are no --enable-gbm or --disable-gbm switches). Let's move it to meson.build instead, so we don't have to clutter config-host.mak with the related switches. Additionally, only check for GBM if it is really required, i.e. if we either compile with OpenGL or with virglrenderer support. Message-Id: <20210714085045.797168-1-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 0 insertions, 14 deletions
diff --git a/configure b/configure
index bd82330..8adf212 100755
--- a/configure
+++ b/configure
@@ -3451,13 +3451,6 @@ esac
##########################################
# opengl probe (for sdl2, gtk)
-gbm="no"
-if $pkg_config gbm; then
- gbm_cflags="$($pkg_config --cflags gbm)"
- gbm_libs="$($pkg_config --libs gbm)"
- gbm="yes"
-fi
-
if test "$opengl" != "no" ; then
epoxy=no
if $pkg_config epoxy; then
@@ -4688,13 +4681,6 @@ if test "$opengl" = "yes" ; then
echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
fi
-if test "$gbm" = "yes" ; then
- echo "CONFIG_GBM=y" >> $config_host_mak
- echo "GBM_LIBS=$gbm_libs" >> $config_host_mak
- echo "GBM_CFLAGS=$gbm_cflags" >> $config_host_mak
-fi
-
-
if test "$avx2_opt" = "yes" ; then
echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
fi