diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-12-13 14:36:12 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-13 14:49:58 +0100 |
| commit | a942046ef0157286fdb8730b939b819bee1e0c63 (patch) | |
| tree | 3330fed2a9ad0f45c0c993a8aac6d3dee42ed101 | |
| parent | 759ec7e5458b7036da0559b038b886cff5939ae3 (diff) | |
| download | NetworkManager-meson.tar.gz | |
fixup! build: add initial support for meson build systemmeson
| -rw-r--r-- | config.h.meson | 3 | ||||
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | src/devices/wifi/meson.build | 7 |
4 files changed, 18 insertions, 0 deletions
diff --git a/config.h.meson b/config.h.meson index 47dbe380c1..1e79fa50ba 100644 --- a/config.h.meson +++ b/config.h.meson @@ -225,6 +225,9 @@ /* Define if you have Wi-Fi support */ #mesondefine WITH_WIFI +/* Define if you have iwd support */ +#mesondefine WITH_IWD + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/meson.build b/meson.build index ff684fbfe6..c1c8f4a57b 100644 --- a/meson.build +++ b/meson.build @@ -299,6 +299,12 @@ if enable_wifi endif config_h.set10('WITH_WIFI', enable_wifi) +enable_iwd = get_option('iwd') +if enable_iwd + assert(enable_wifi, 'Enabling iwd support requires Wi-Fi support as well') +endif +config_h.set10('WITH_IWD', enable_iwd) + # Default to using WEXT but allow it to be disabled enable_wext = get_option('wext') if enable_wext @@ -1063,6 +1069,7 @@ output += ' libaudit: ' + enable_libaudit.to_string() + ' (default: logging.aud output += '\nFeatures:\n' output += ' wext: ' + enable_wext.to_string() + '\n' output += ' wifi: ' + enable_wifi.to_string() + '\n' +output += ' iwd: ' + enable_iwd.to_string() + '\n' output += ' pppd: ' + enable_ppp.to_string() if enable_ppp output += ' ' + pppd_path diff --git a/meson_options.txt b/meson_options.txt index 5a48e3a55c..55f9ee7030 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,6 +28,7 @@ option('libaudit', type: 'combo', choices: ['yes', 'yes-disabled-by-default', 'n # features option('wext', type: 'boolean', value: true, description: 'Enable or disable Linux Wireless Extensions') option('wifi', type: 'boolean', value: true, description: 'enable Wi-Fi support') +option('iwd', type: 'boolean', value: false, description: 'enable iwd support (experimental)') option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE support') option('pppd', type: 'string', value: '', description: 'path to pppd binary') option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build index 7487d5827c..0b681262be 100644 --- a/src/devices/wifi/meson.build +++ b/src/devices/wifi/meson.build @@ -9,6 +9,13 @@ sources = common_sources + files( 'nm-device-olpc-mesh.c' ) +if enable_iwd + sources += files( + 'nm-device-iwd.c', + 'nm-iwd-manager.c', + ) +endif + deps = [ core_dep, libnmdbus_dep |