diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-25 15:38:50 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-25 15:40:05 +0200 |
| commit | 0e6b588205ab29ad9ad568e3a335bcb0ec901ca5 (patch) | |
| tree | 278ba5bbb444e3f4e4d96d034deaf852d9be2ea1 | |
| parent | feac6858997e9bd08b06bf191819ccfdb5262bae (diff) | |
| download | network-manager-applet-0e6b588205ab29ad9ad568e3a335bcb0ec901ca5.tar.gz | |
build: appindicator and xembed are not mutually exclusive
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index eb6cb4e9..a50454f4 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10) GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4" AC_ARG_WITH([appindicator], - AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with lib(ayatana-)appindicator support instead of xembed systray support.]), + AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with lib(ayatana-)appindicator support in addition to xembed systray support.]), [], [with_appindicator=no]) if test "$with_appindicator" != "no"; then if test "$with_appindicator" = "yes" -o "$with_appindicator" = "auto"; then diff --git a/meson_options.txt b/meson_options.txt index fa3ca941..0ea708cb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,5 @@ option('libnm_gtk', type: 'boolean', value: true, description: 'build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib') -option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator support instead of xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an alias for "auto".') +option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an alias for "auto".') option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.') option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in configuration editor.') option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.') |