From 7177eeea990f92dacebb967a5d418f3a372e5951 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Tue, 31 Aug 2021 15:30:59 +0200
Subject: [PATCH] build: use WITH_QRTR exclusively to check for QRTR support

The user may request to disable QRTR support using `--without-qrtr`
even if libqmi has QRTR support.
---
 src/mm-base-modem.c | 2 +-
 src/mm-port-qmi.h   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index 3b46f3db..9c9a2a61 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -30,7 +30,7 @@
 
 #include "mm-context.h"
 #include "mm-base-modem.h"
-#if defined WITH_QMI && QMI_QRTR_SUPPORTED
+#if defined WITH_QRTR
 #include "mm-kernel-device-qrtr.h"
 #endif
 
diff --git a/src/mm-port-qmi.h b/src/mm-port-qmi.h
index e5027252..b238ede8 100644
--- a/src/mm-port-qmi.h
+++ b/src/mm-port-qmi.h
@@ -16,6 +16,8 @@
 #ifndef MM_PORT_QMI_H
 #define MM_PORT_QMI_H
 
+#include <config.h>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -66,7 +68,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMPortQmi, g_object_unref)
 
 MMPortQmi *mm_port_qmi_new          (const gchar          *name,
                                      MMPortSubsys          subsys);
-#if QMI_QRTR_SUPPORTED
+#if defined WITH_QRTR
 MMPortQmi *mm_port_qmi_new_from_node (const gchar *name,
                                       QrtrNode    *node);
 #endif