mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
build: don't link libnm against libjansson when building --without-json-validation
Also, don't add the CFLAGS for libjansson to dflt_cppflags_libnm_core. dflt_cppflags_libnm_core is used also by core and libnm. But those components do not (directly) link against libjansson. The cannot use these flags.
This commit is contained in:
parent
b1c65d32fe
commit
79d5a06c8b
10
Makefile.am
10
Makefile.am
|
@ -533,10 +533,6 @@ dflt_cppflags_libnm_core = \
|
|||
$(GLIB_CFLAGS) \
|
||||
$(LIBUDEV_CFLAGS)
|
||||
|
||||
if WITH_JANSSON
|
||||
dflt_cppflags_libnm_core += $(JANSSON_CFLAGS)
|
||||
endif
|
||||
|
||||
if WITH_GNUTLS
|
||||
dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS)
|
||||
endif
|
||||
|
@ -579,6 +575,10 @@ libnm_core_libnm_core_la_CPPFLAGS = \
|
|||
-DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB
|
||||
|
||||
if WITH_JSON_VALIDATION
|
||||
libnm_core_libnm_core_la_CPPFLAGS += $(JANSSON_CFLAGS)
|
||||
endif
|
||||
|
||||
libnm_core_libnm_core_la_SOURCES = \
|
||||
$(libnm_core_lib_h_pub_real) \
|
||||
$(libnm_core_lib_h_priv) \
|
||||
|
@ -593,7 +593,7 @@ libnm_core_libnm_core_la_LIBADD = \
|
|||
$(UUID_LIBS) \
|
||||
$(LIBUDEV_LIBS)
|
||||
|
||||
if WITH_JANSSON
|
||||
if WITH_JSON_VALIDATION
|
||||
libnm_core_libnm_core_la_LIBADD += $(JANSSON_LIBS)
|
||||
endif
|
||||
|
||||
|
|
|
@ -688,6 +688,7 @@ else
|
|||
fi
|
||||
AC_DEFINE(WITH_JSON_VALIDATION, 1, [Define if JSON validation in libnm is enabled])
|
||||
fi
|
||||
AM_CONDITIONAL(WITH_JSON_VALIDATION, test "${enable_json_validation}" != "no")
|
||||
|
||||
# we usually compile with polkit support. --enable-polkit=yes|no only sets the
|
||||
# default configuration for main.auth-polkit. User can always enable/disable polkit
|
||||
|
|
Loading…
Reference in a new issue