summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2022-07-19 17:48:36 +0200
committerMilan Crha <mcrha@redhat.com>2022-07-19 17:59:36 +0200
commit30ff4e9f57f7a8f736ffd39cf595fc7893c8d52b (patch)
treecfe3b9b249a3001d80936751c2debb753dafe3f4 /plugins
parentf24ebdf298b730844a15aef096b7346c7b352776 (diff)
downloadgnome-settings-daemon-30ff4e9f57f7a8f736ffd39cf595fc7893c8d52b.tar.gz
build: Use gcr4 by default, but have an option to use gcr3 too
The gcr4 replaces gcr3, thus make it possible to use either of the two, while defaulting to gcr4, as it'll live for a longer time.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/wwan/gsd-wwan-manager.c4
-rw-r--r--plugins/wwan/meson.build2
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/wwan/gsd-wwan-manager.c b/plugins/wwan/gsd-wwan-manager.c
index 42109ef8..c2288375 100644
--- a/plugins/wwan/gsd-wwan-manager.c
+++ b/plugins/wwan/gsd-wwan-manager.c
@@ -31,7 +31,11 @@
#include <libmm-glib.h>
#define GCR_API_SUBJECT_TO_CHANGE
+#ifdef HAVE_GCR3
#include <gcr/gcr-base.h>
+#else
+#include <gcr/gcr.h>
+#endif
#include "gnome-settings-profile.h"
#include "cc-wwan-device.h"
diff --git a/plugins/wwan/meson.build b/plugins/wwan/meson.build
index 3f117fb3..238288c6 100644
--- a/plugins/wwan/meson.build
+++ b/plugins/wwan/meson.build
@@ -4,7 +4,7 @@ sources = files(
'main.c'
)
-deps = plugins_deps + [gio_dep, gcr_base_dep, mm_glib_dep, polkit_gobject_dep]
+deps = plugins_deps + [gio_dep, gcr_dep, mm_glib_dep, polkit_gobject_dep]
cflags += ['-DGNOMECC_DATA_DIR="@0@"'.format(gsd_pkgdatadir)]