From 9b72cdb862f24aaf364e784f6d48e05442275629 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Sun, 12 Nov 2017 10:30:06 +0100
Subject: [PATCH] core: fix build without connectivity check

Fixes: 4dd30b784c53e9b61b6e3a2b2e135f589747fc06

https://bugzilla.gnome.org/show_bug.cgi?id=790222
(cherry picked from commit a33baf8bf7e66d95bf9678c0c66ca869006c3b0f)
---
 src/nm-manager.c               | 9 ++++++++-
 src/tests/config/test-config.c | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 2766e86aed..de8fb40831 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -6250,7 +6250,6 @@ get_property (GObject *object, guint prop_id,
 	NMConfigData *config_data;
 	const NMGlobalDnsConfig *dns_config;
 	const char *type;
-	NMConnectivity *connectivity;
 
 	switch (prop_id) {
 	case PROP_VERSION:
@@ -6300,8 +6299,16 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, nm_config_data_get_connectivity_uri (config_data) != NULL);
 		break;
 	case PROP_CONNECTIVITY_CHECK_ENABLED:
+#if WITH_CONCHECK
+	{
+		NMConnectivity *connectivity;
+
 		connectivity = nm_connectivity_get ();
 		g_value_set_boolean (value, nm_connectivity_check_enabled (connectivity));
+	}
+#else
+		g_value_set_boolean (value, FALSE);
+#endif
 		break;
 	case PROP_PRIMARY_CONNECTION:
 		nm_utils_g_value_set_object_path (value, priv->primary_connection);
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index 80e17d0180..2067f40faa 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -318,6 +318,7 @@ test_config_global_dns (void)
 	g_object_unref (config);
 }
 
+#if WITH_CONCHECK
 static void
 test_config_connectivity_check (void)
 {
@@ -351,6 +352,7 @@ test_config_connectivity_check (void)
 
 	g_assert (remove (CONFIG_INTERN) == 0);
 }
+#endif
 
 static void
 test_config_no_auto_default (void)
@@ -1053,7 +1055,9 @@ main (int argc, char **argv)
 
 	g_test_add_func ("/config/set-values", test_config_set_values);
 	g_test_add_func ("/config/global-dns", test_config_global_dns);
+#if WITH_CONCHECK
 	g_test_add_func ("/config/connectivity-check", test_config_connectivity_check);
+#endif
 
 	g_test_add_func ("/config/signal", test_config_signal);