Add support for --without-json and --with-json=no, so that JSON support can be explicitly disabled, even when the dependencies are otherwise available. Requested-by: Peter Czanik <czanik@balabit.hu> Signed-off-by: Gergely Nagy <algernon@balabit.hu> --- configure.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f766888..e9e09a8 100644 --- a/configure.in +++ b/configure.in @@ -890,7 +890,7 @@ if test "x$enable_mongodb" = "xauto"; then AC_MSG_RESULT([$enable_mongodb]) fi -if test "x$with_json" != "xjson-glib" -a "x$with_json" != "xjson-c" -a "x$with_json" != "xauto"; then +if test "x$with_json" != "xjson-glib" -a "x$with_json" != "xjson-c" -a "x$with_json" != "xauto" -a "x$with_json" != "xno"; then # unknown --with-json argument AC_MSG_ERROR([Unknown JSON implementation ($with_json) specified, only json-glib, json-c and auto is known]) @@ -909,7 +909,7 @@ elif test \( "x$with_json" = "xauto" -o "x$with_json" = "xjson-glib" \) -a -n "$ AC_DEFINE_UNQUOTED(HAVE_JSON_GLIB, 1, [Have json-glib]) with_json="json-glib" -elif test "x$with_json" = "xauto"; then +elif test "x$with_json" = "xauto" -o "x$with_json" = "xno"; then # nothing found, but autodetect was selected JSON_LIBS="" -- 1.7.9