summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-02-22 17:14:28 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2017-02-22 18:28:01 +0100
commita5912f0ee8da93c68c19e36afcf69d27808fd8df (patch)
tree91eab90fa8f919c3f7e072b5863f87ac8614cb44
parentf95b6cadd2cdd1c8e960f24db36d35833eed5d90 (diff)
downloadNetworkManager-a5912f0ee8da93c68c19e36afcf69d27808fd8df.tar.gz
build: automatically determine Jansson support if not specified
If configure is called without --enable-json-validation or --disable-json-validation, let's automatically choose a value depending on the availability of the library.
-rw-r--r--configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 25af0beeb2..36597c8802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,6 +547,8 @@ PKG_CHECK_MODULES(LIBNL, libnl-3.0 >= 3.2.8)
PKG_CHECK_MODULES(UUID, uuid)
# Teamd control checks
+
+PKG_CHECK_MODULES(JANSSON, [jansson], [have_jansson=yes], [have_jansson=no])
PKG_CHECK_MODULES(LIBTEAMDCTL, [libteamdctl >= 1.9], [have_teamdctl=yes],[have_teamdctl=no])
AC_ARG_ENABLE(teamdctl, AS_HELP_STRING([--enable-teamdctl], [enable Teamd control support]),
[enable_teamdctl=${enableval}], [enable_teamdctl=${have_teamdctl}])
@@ -563,12 +565,15 @@ fi
AM_CONDITIONAL(WITH_TEAMDCTL, test "${enable_teamdctl}" = "yes")
# Jansson for team configuration validation
-AC_ARG_ENABLE(json-validation, AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm]))
+AC_ARG_ENABLE(json-validation, AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm]),
+ [enable_json_validation=${enableval}],
+ [enable_json_validation=${have_jansson}])
if (test "${enable_json_validation}" == "no"); then
AC_DEFINE(WITH_JANSSON, 0, [Define if JANSSON is enabled])
else
- PKG_CHECK_MODULES(JANSSON, jansson,,
- AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.]))
+ if test "$have_jansson" = "no"; then
+ AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.])
+ fi
AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
fi