diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-22 23:49:06 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-22 23:50:07 +0100 |
| commit | dd9ae7b8138daf5e3fae05385a7f2d16744a0953 (patch) | |
| tree | 81d32c122c140e4e2275080f78533eb251f27ca4 | |
| parent | e350ba7be6f97ab7722e7e242f18c009659d3f8e (diff) | |
| download | NetworkManager-dd9ae7b8138daf5e3fae05385a7f2d16744a0953.tar.gz | |
fixup! build: automatically determine Jansson support if not specified
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index e88277f221..8930b107ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -485,8 +485,11 @@ dflt_cppflags_libnm_core = \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(JANSSON_CFLAGS) + $(GLIB_CFLAGS) + +if WITH_JANSSON +dflt_cppflags_libnm_core += $(JANSSON_CFLAGS) +endif if WITH_GNUTLS dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) @@ -545,8 +548,11 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ libnm_core_libnm_core_la_LIBADD = \ $(GLIB_LIBS) \ - $(UUID_LIBS) \ - $(JANSSON_LIBS) + $(UUID_LIBS) + +if WITH_JANSSON +libnm_core_libnm_core_la_LIBADD += $(JANSSON_LIBS) +endif libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) diff --git a/configure.ac b/configure.ac index 5dc42ab426..354db306e8 100644 --- a/configure.ac +++ b/configure.ac @@ -585,6 +585,7 @@ else fi AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) fi +AM_CONDITIONAL(WITH_JANSSON, 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 @@ -1251,6 +1252,6 @@ echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo " linker garbage collection: $enable_ld_gc" -echo " JSON validation: $enable_json_validation" +echo " JSON validation for libnm: $enable_json_validation" echo " sanitizers: $sanitizers" echo |