Fix detection of libyajl and fix compilation if it's missing.

D'oh! :-/

diff --git a/configure.ac b/configure.ac
index c6710041cb5c631f50041f73f1e2f662b1dc7109..521f0acb5440961fd58d7a94b63cf67bf19e89a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -480,7 +480,7 @@ AC_ARG_WITH([libyajl],
 if test "x$with_libyajl" = "xyes" || test "x$with_libyajl" = "xauto"; then
        PKG_CHECK_MODULES([YAJL], [yajl], [have_libyajl="yes"], [have_libyajl="no"])
 fi
-if test "x$with_libyajl" = "xyes"; then
+if test "x$have_libyajl" = "xyes"; then
        AC_DEFINE([HAVE_LIBYAJL], 1, [Define to 1 if you have the 'yajl' library.])
 fi
 

diff --git a/src/tools/sysdb/json.c b/src/tools/sysdb/json.c
index fdd4194167d6f5ced06562933f38914b31fbcbdd..4f36179b02c823161487c6c0351c9c841351824c 100644 (file)
--- a/src/tools/sysdb/json.c
+++ b/src/tools/sysdb/json.c
@@ -158,6 +158,7 @@ sdb_json_print(sdb_input_t *input, sdb_strbuf_t *buf)
        yajl_free(h);
        return ret;
 #else /* HAVE_LIBYAJL */
+       (void)input;
        printf("%s\n", sdb_strbuf_string(buf));
        return 0;
 #endif /* HAVE_LIBYAJL */