mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
connectivity: always build nm-connectivity.c source
We already do conditional build with "#if WITH_CONCHECK". Get rid of the conditional in the makefile and instead do conditional compilating inside the source file "nm-connectivity.c". The advantage is, now if you want to know which parts are build, you only need to grep for the WITH_CONCHECK preprocessor define instead of also caring about the conditional in Makefile.am and meson.build. It doesn't change the fact of conditional compilation. But it consistently uses one mechanism to achieve it.
This commit is contained in:
parent
2012b49219
commit
c1054ec8ff
|
@ -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 \
|
||||
|
|
|
@ -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])
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue