From cf5c81091a325ae9f2bbdf63d1af6fc3442c13b9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 27 Feb 2019 15:01:09 +0000 Subject: Fix the Meson checks for rpm This fixes the case where we do -Dbuilder=false -Drpm=true. Many thanks to Mathieu Bridon for help identifying the problem. --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index a8649d5..0c7e6de 100644 --- a/meson.build +++ b/meson.build @@ -61,10 +61,6 @@ gdkpixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.31.5') # builder (default enabled) if get_option('builder') gmodule = dependency('gmodule-2.0') - if get_option('rpm') - rpm = dependency('rpm') - conf.set('HAVE_RPM', 1) - endif if get_option('alpm') alpm = dependency('libalpm') conf.set('HAVE_ALPM', 1) @@ -77,6 +73,12 @@ if get_option('builder') endif endif +# rpm is used for vercmp and to get the filelist in the builder +if get_option('rpm') + rpm = dependency('rpm') + conf.set('HAVE_RPM', 1) +endif + # support loading yaml files if get_option('dep11') yaml = dependency('yaml-0.1') -- cgit v1.2.1