diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-10-12 09:59:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-20 13:50:34 +0100 |
| commit | b00e004890b9c39fec4fe543bb95fdc263e774bc (patch) | |
| tree | b642cc29f81a622f2509e2abfe846902fa8a9302 /meson_options.txt | |
| parent | 4b32bbc8201730ab4dd5f56868caa0e9982444de (diff) | |
| download | NetworkManager-b00e004890b9c39fec4fe543bb95fdc263e774bc.tar.gz | |
build: meson: Use variables present in pkg-config files
Although some paths related to DBus and PolicyKit are present in
their pkg-config files, those paths might not be writable for the
user. To solve this issue, some build options are present that can
be used to choose a different location.
However, usually these paths are relative to some other variables
such as `prefix`, `datadir`, etc. Using the `define_variable`
option the relative path can be change to point to a directory
under prefix.
These paths are now using relative paths based on the installation
`prefix` and their related options have been removed as they are
unnecessary now. Only `dbus_conf_dir` option has been left because
it must be modified depending on the distribution[0].
[0] contrib/fedora/rpm/NetworkManager.spec
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index 631ca1c05f..5ea9e118e0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,9 +3,6 @@ option('systemdsystemunitdir', type: 'string', value: '', description: 'Director option('system_ca_path', type: 'string', value: '/etc/ssl/certs', description: 'path to system CA certificates') option('udev_dir', type: 'string', value: '', description: 'Absolute path of the udev base directory. Set to \'no\' not to install the udev rule') option('dbus_conf_dir', type: 'string', value: '', description: 'where D-Bus system.d directory is') -option('dbus_ifaces_dir', type: 'string', value: '', description: 'where D-Bus interfaces directory is') -option('dbus_sys_dir', type: 'string', value: '', description: 'where D-Bus system service directory is') -option('polkit_dir', type: 'string', value: '', description: 'where PolicyKit policy directory is') option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)') option('iptables', type: 'string', value: '', description: 'path to iptables') option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq') |