From: "Ivan T. Ivanov" iivanov@mm-sol.com
Tested-by: Nicolas Pitre nico@linaro.org --- configure.ac | 12 ++++++------ src/rt-app_parse_config.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac index f157519..3341259 100644 --- a/configure.ac +++ b/configure.ac @@ -41,13 +41,13 @@ AS_IF([test "x$with_deadline" != xno], ])
LIBJSON= - AC_CHECK_LIB([json], [json_object_from_file], - [AC_SUBST([LIBJSON], ["-ljson"]) - AC_DEFINE([JSON], [1], [Define if you have libjson]) + AC_CHECK_LIB([json-c], [json_object_from_file], + [AC_SUBST([LIBJSON], ["-ljson-c"]) + AC_DEFINE([JSON], [1], [Define if you have libjson-c]) ], - [AC_MSG_FAILURE([libjson test failed (use --without-json to disable or install json-c)])], - [-ljson] - ) + [AC_MSG_FAILURE([libjson-c test failed (use --without-json-c to disable or install json-c)])], + [-ljson-c] + )
AM_CONDITIONAL([AMJSON], [ test x$with_json != xno])
diff --git a/src/rt-app_parse_config.h b/src/rt-app_parse_config.h index 9b89428..45b2bbf 100644 --- a/src/rt-app_parse_config.h +++ b/src/rt-app_parse_config.h @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifdef DLSCHED #include "dl_syscalls.h" #endif -#include <json.h> +#include <json-c/json.h>
#define DEFAULT_THREAD_PRIORITY 10 #define PATH_LENGTH 256