From e80b474a144fac1bc3e38227dcb336b647d7c5bb Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 5 Jan 2017 11:25:13 -0300 Subject: [PATCH] meson: Do not try to use unset gstgl if gstgl is not built --- pkgconfig/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build index c3df686435..b16d01e407 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -14,7 +14,6 @@ pkgconf.set('audiolibdir', join_paths(meson.build_root(), gstbadaudio.outdir())) pkgconf.set('baselibdir', join_paths(meson.build_root(), gstbadbase.outdir())) pkgconf.set('videolibdir', join_paths(meson.build_root(), gstbadvideo.outdir())) pkgconf.set('codecparserslibdir', join_paths(meson.build_root(), gstcodecparsers.outdir())) -pkgconf.set('gllibdir', join_paths(meson.build_root(), gstgl.outdir())) pkgconf.set('insertbinlibdir', join_paths(meson.build_root(), gstinsertbin.outdir())) pkgconf.set('mpegtslibdir', join_paths(meson.build_root(), gstmpegts.outdir())) pkgconf.set('playerlibdir', join_paths(meson.build_root(), gstplayer.outdir())) @@ -37,6 +36,7 @@ pkg_libs = [ # XXX: requires the meson.build to be parsed/executed after gst-libs/gl/meson.build if build_gstgl + pkgconf.set('gllibdir', join_paths(meson.build_root(), gstgl.outdir())) pkg_libs += 'gl' endif