aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build10
-rw-r--r--plugins/rtp/CMakeLists.txt1
-rw-r--r--plugins/rtp/meson.build1
3 files changed, 1 insertions, 11 deletions
diff --git a/meson.build b/meson.build
index 4ad18477..23a7b3d1 100644
--- a/meson.build
+++ b/meson.build
@@ -17,19 +17,11 @@ foreach plugin : ['plugin-ice', 'plugin-omemo', 'plugin-rtp']
endif
endforeach
-if get_option('plugin-ice').enabled() and not get_option('plugin-rtp').enabled()
- dep_gnutls_required = get_option('plugin-ice')
-elif get_option('plugin-ice').allowed() and not get_option('plugin-rtp').allowed()
- dep_gnutls_required = get_option('plugin-ice')
-else
- dep_gnutls_required = get_option('plugin-rtp')
-endif
-
dep_gdk_pixbuf = dependency('gdk-pixbuf-2.0')
dep_gee = dependency('gee-0.8')
dep_gio = dependency('gio-2.0')
dep_glib = dependency('glib-2.0')
-dep_gnutls = dependency('gnutls', disabler: true, required: dep_gnutls_required)
+dep_gnutls = dependency('gnutls', disabler: true, required: get_option('plugin-ice'))
dep_gmodule = dependency('gmodule-2.0')
dep_gpgme = dependency('gpgme', disabler: true, required: get_option('plugin-openpgp'))
dep_gstreamer = dependency('gstreamer-1.0', disabler: true, required: get_option('plugin-rtp'))
diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt
index 2f6f5eaf..83df5df8 100644
--- a/plugins/rtp/CMakeLists.txt
+++ b/plugins/rtp/CMakeLists.txt
@@ -4,7 +4,6 @@ find_packages(RTP_PACKAGES REQUIRED
Gee
GLib
GModule
- GnuTLS
GObject
GTK4
Gst
diff --git a/plugins/rtp/meson.build b/plugins/rtp/meson.build
index 06821c91..a222a05a 100644
--- a/plugins/rtp/meson.build
+++ b/plugins/rtp/meson.build
@@ -4,7 +4,6 @@ dependencies = [
dep_gee,
dep_glib,
dep_gmodule,
- dep_gnutls,
dep_gstreamer,
dep_gstreamer_app,
dep_gstreamer_audio,