NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

meson: properly handle readline if it's explicitly disabled

Browse Source 
If readline is detected using pkg-config it would ignore the readline
option.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Pavel Hrdina 2020-10-08 13:24:55 +02:00
parent c8be9ccc36
commit fc125d7e5c
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -1243,6 +1243,7 @@ endif
# readline 7.0 is the first version which includes pkg-config support
readline_version = '7.0'
if not get_option('readline').disabled()
readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
if not readline_dep.found()
readline_dep = cc.find_library('readline', required: get_option('readline'))
@ -1264,6 +1265,9 @@ if not readline_dep.found()
endif
endif
endif
else
readline_dep = dependency('', required: false)
endif
if readline_dep.found()
# Gross kludge for readline include path obtained through pkg-config.
#