Code

Fix detection of libyajl and fix compilation if it's missing.
authorSebastian Harl <sh@tokkee.org>
Sun, 11 Dec 2016 17:09:19 +0000 (18:09 +0100)
committerSebastian Harl <sh@tokkee.org>
Sun, 11 Dec 2016 17:09:19 +0000 (18:09 +0100)
D'oh! :-/

configure.ac
src/tools/sysdb/json.c

index c671004..521f0ac 100644 (file)
@@ -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
 
index fdd4194..4f36179 100644 (file)
@@ -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 */