diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-09-27 17:27:06 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-09-27 18:37:22 +0200 |
| commit | f605262792c7857f5a622c03ba158586b493dda7 (patch) | |
| tree | b3533e9b8173f1b86565fd09b6dc96df8137d989 | |
| parent | 67999ef2d32749282e051e674fb982eebc403fa0 (diff) | |
| download | NetworkManager-f605262792c7857f5a622c03ba158586b493dda7.tar.gz | |
build: enable JSON validation unless explicitly disabled
This makes it easier for packagers to make sure they're not building
without a feature unintentionally.
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 671a7bf011..34b92d1afe 100644 --- a/configure.ac +++ b/configure.ac @@ -560,16 +560,14 @@ else fi AM_CONDITIONAL(WITH_TEAMDCTL, test "${enable_teamdctl}" = "yes") -PKG_CHECK_MODULES(JANSSON, jansson, [have_jansson=yes], [have_jansson=no]) -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}" = "yes"); then - if test x"$have_jansson" = x"no"; then - AC_MSG_ERROR(Jansson is required for JSON validation) - fi - AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) +# Jansson for team configuration validation +AC_ARG_ENABLE(json-validation, AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm])) +if (test "${enable_json_validation}" == "no"); then + AC_DEFINE(WITH_JANSSON, 0, [Define if JANSSON is enabled]) else - AC_DEFINE(WITH_JANSSON, 0, [Define if JANSSON is enabled]) + PKG_CHECK_MODULES(JANSSON, jansson,, + AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.])) + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) fi # we usually compile with polkit support. --enable-polkit=yes|no only sets the |