diff options
| author | Richard Hughes <richard@hughsie.com> | 2019-02-27 15:01:09 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2019-02-27 15:01:09 +0000 |
| commit | cf5c81091a325ae9f2bbdf63d1af6fc3442c13b9 (patch) | |
| tree | e1e09a74753484e1547b75f4d22d163f37aabcc7 | |
| parent | bc44fba32c2c2c90f2b23720cb686fb91b841d5a (diff) | |
| download | appstream-glib-cf5c81091a325ae9f2bbdf63d1af6fc3442c13b9.tar.gz | |
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.
| -rw-r--r-- | meson.build | 10 |
1 files changed, 6 insertions, 4 deletions
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') |