From 8aefac804cbd77351a00e7f962a004c4f995b3f7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 10 Apr 2019 21:22:22 +0200
Subject: [PATCH] connectivity: fix build with --disable-concheck

Fixes: 2cec94bacce4 ('connectivity: use systemd-resolved for resolving the check endpoint')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/155
---
 src/nm-connectivity.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 2aab23862b..2816e76afc 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -167,6 +167,7 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT
 
 /*****************************************************************************/
 
+#if WITH_CONCHECK
 static ConConfig *
 _con_config_ref (ConConfig *con_config)
 {
@@ -176,6 +177,7 @@ _con_config_ref (ConConfig *con_config)
 	}
 	return con_config;
 }
+#endif
 
 static void
 _con_config_unref (ConConfig *con_config)
@@ -195,11 +197,13 @@ _con_config_unref (ConConfig *con_config)
 	g_slice_free (ConConfig, con_config);
 }
 
+#if WITH_CONCHECK
 static const char *
 _con_config_get_response (const ConConfig *con_config)
 {
 	return con_config->response ?: NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE;
 }
+#endif
 
 /*****************************************************************************/
 
@@ -673,6 +677,7 @@ _idle_cb (gpointer user_data)
 	return G_SOURCE_REMOVE;
 }
 
+#if WITH_CONCHECK
 static void
 do_curl_request (NMConnectivityCheckHandle *cb_data)
 {
@@ -791,6 +796,7 @@ resolve_cb (GObject *object, GAsyncResult *res, gpointer user_data)
 
 	do_curl_request (cb_data);
 }
+#endif
 
 #define SD_RESOLVED_DNS ((guint64) (1LL << 0))
 
@@ -819,13 +825,13 @@ nm_connectivity_check_start (NMConnectivity *self,
 	cb_data->user_data = user_data;
 	cb_data->completed_state = NM_CONNECTIVITY_UNKNOWN;
 	cb_data->addr_family = addr_family;
-	cb_data->concheck.con_config = _con_config_ref (priv->con_config);
-
 	if (iface)
 		cb_data->ifspec = g_strdup_printf ("if!%s", iface);
 
 #if WITH_CONCHECK
 
+	cb_data->concheck.con_config = _con_config_ref (priv->con_config);
+
 	if (   iface
 	    && ifindex > 0
 	    && priv->enabled