diff --git a/Makefile.am b/Makefile.am
index ad1e12a597..bb5b70cd8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1594,6 +1594,7 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-config.h \
 	src/nm-config-data.c \
 	src/nm-config-data.h \
+	src/nm-connectivity.c \
 	src/nm-connectivity.h \
 	src/nm-dcb.c \
 	src/nm-dcb.h \
@@ -1631,11 +1632,6 @@ src_libNetworkManager_la_SOURCES = \
 	\
 	$(NULL)
 
-if WITH_CONCHECK
-src_libNetworkManager_la_SOURCES += \
-	src/nm-connectivity.c
-endif
-
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
 	src/libsystemd-nm.la \
diff --git a/configure.ac b/configure.ac
index 41389c25f8..7b7bed6b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,7 +1054,6 @@ else
 	enable_concheck=no
 	AC_DEFINE(WITH_CONCHECK, 0, [Define if you want connectivity checking support])
 fi
-AM_CONDITIONAL(WITH_CONCHECK, test "${enable_concheck}" = "yes")
 
 PKG_CHECK_MODULES(LIBNDP, [libndp])
 
diff --git a/src/meson.build b/src/meson.build
index 39a41ca751..0b7c100875 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -150,6 +150,7 @@ sources = files(
   'nm-checkpoint-manager.c',
   'nm-config.c',
   'nm-config-data.c',
+  'nm-connectivity.c',
   'nm-dcb.c',
   'nm-dhcp4-config.c',
   'nm-dhcp6-config.c',
@@ -177,8 +178,6 @@ deps = [
 ]
 
 if enable_concheck
-  sources += files('nm-connectivity.c')
-
   deps += libcurl_dep
 endif
 
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 10aab9067b..52e40d6031 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -25,7 +25,10 @@
 #include "nm-connectivity.h"
 
 #include <string.h>
+
+#if WITH_CONCHECK
 #include <curl/curl.h>
+#endif
 
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
@@ -43,6 +46,8 @@ NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_state_to_string, NMConnectivityState
 
 /*****************************************************************************/
 
+#if WITH_CONCHECK
+
 typedef struct {
 	GSimpleAsyncResult *simple;
 	char *response;
@@ -583,3 +588,5 @@ nm_connectivity_class_init (NMConnectivityClass *klass)
 
 	object_class->dispose = dispose;
 }
+
+#endif /* WITH_CONCHECK */