diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-05-17 15:10:57 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-05-17 15:10:57 +0200 |
| commit | 2e335f44f276c1455f27bd522b639b9c99dec2cc (patch) | |
| tree | 7e9514a2ece932aa320b4d8e3adbbe9d913fdbc7 | |
| parent | 0bc2011289e4e0f042bce9b4fbb2c949096610bc (diff) | |
| download | libqmi-2e335f44f276c1455f27bd522b639b9c99dec2cc.tar.gz | |
build: Fix QMI over MBIM and QRTR auto support
meson port dropped the auto support for QMI over MBIM and QRTR.
The auto support has been recovered by checking libraries in
the system.
Fixes #66
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/meson.build b/meson.build index e9e1620f..f1d1b193 100644 --- a/meson.build +++ b/meson.build @@ -181,16 +181,18 @@ endif config_h.set('QMI_USERNAME_ENABLED', enable_qmi_username) # MBIM QMUX service support -enable_mbim_qmux = get_option('mbim_qmux') -if enable_mbim_qmux - mbim_glib_dep = dependency('mbim-glib', version: '>= 1.18.0') +enable_mbim_qmux = false +if get_option('mbim_qmux') + mbim_glib_dep = dependency('mbim-glib', version: '>= 1.18.0', required: false) + enable_mbim_qmux = mbim_glib_dep.found() endif config_h.set('MBIM_QMUX_ENABLED', enable_mbim_qmux) # QRTR support -enable_qrtr = get_option('qrtr') -if enable_qrtr - qrtr_glib_dep = dependency('qrtr-glib', version: '>= 1.0.0') +enable_qrtr = false +if get_option('qrtr') + qrtr_glib_dep = dependency('qrtr-glib', version: '>= 1.0.0', required: false) + enable_qrtr = qrtr_glib_dep.found() endif config_h.set10('QMI_QRTR_SUPPORTED', enable_qrtr) diff --git a/meson_options.txt b/meson_options.txt index 71e4c5ec..6f7cb628 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,10 +2,10 @@ option('collection', type: 'combo', choices: ['minimal', 'basic', 'full'], value option('firmware_update', type: 'boolean', value: true, description: 'enable compilation of `qmi-firmware-update') -option('mbim_qmux', type: 'boolean', value: false, description: 'enable support for QMI over MBIM QMUX service') +option('mbim_qmux', type: 'boolean', value: true, description: 'enable support for QMI over MBIM QMUX service') option('mm_runtime_check', type: 'boolean', value: true, description: 'build ModemManager runtime check support') option('qmi_username', type: 'string', value: '', description: 'user allowed to access QMI devices') -option('qrtr', type: 'boolean', value: false, description: 'enable support for QRTR protocol') +option('qrtr', type: 'boolean', value: true, description: 'enable support for QRTR protocol') option('udev', type: 'boolean', value: true, description: 'build udev support') option('udevdir', type: 'string', value: '', description: 'where udev base directory is') |