From: Vincent Guittot vincent.guittot@linaro.org
Signed-off-by: Vincent Guittot vincent.guittot@linaro.org Tested-by: Nicolas Pitre nico@linaro.org --- README.in | 7 +------ autogen.sh | 2 +- configure.ac | 17 ++++++++--------- src/Makefile.am | 8 +++----- 4 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/README.in b/README.in index 1883455..9fdaf99 100644 --- a/README.in +++ b/README.in @@ -48,11 +48,6 @@ $ ./configure --with-deadline adds support for SCHED_DEADLINE. There are no compile-time requirements for this feature.
-$ ./configure --with-json - adds support for reading taskset definitions from JSON files - (and from stdin). - json-c (libjson.so.0.0.1) is needed to compile this feature. - $ ./configure --prefix=<directory> installs the compiled program in the given directory
@@ -67,7 +62,7 @@ cross-compiler, and provide the --host option (e.g., --host=arm).
$ rt-app <config_file> where config file is a full/relative path to a json file (look under doc/ for -an example config file) or "-" (without quotes) to read JSON data from stdin. +examples config file) or "-" (without quotes) to read JSON data from stdin.
OR you can use commandline to define the taskset. Keep in mind that on commandline it will never be possible to define resources diff --git a/autogen.sh b/autogen.sh index e06db9e..6887018 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,5 +7,5 @@ echo "----------------------------------------------------------------" echo "Initialized build system. For a common configuration please run:" echo "----------------------------------------------------------------" echo -echo "./configure --with-deadline --with-json" +echo "./configure --with-deadline" echo diff --git a/configure.ac b/configure.ac index dd1c1aa..f157519 100644 --- a/configure.ac +++ b/configure.ac @@ -40,15 +40,14 @@ AS_IF([test "x$with_deadline" != xno], [AC_DEFINE([DLSCHED], [1], [Define if you have SCHED_DEADLINE support]) ])
-AC_ARG_WITH([json], - [AS_HELP_STRING([--with-json], - [Add support for reading json config file] - ) - ], [], [with_json=no] - ) -AS_IF([test "x$with_json" != "xno"], - [PKG_CHECK_MODULES([LIBJSON], [json-c], [AC_DEFINE([JSON], [1], [Define if you have libjson])]) - ]) +LIBJSON= + AC_CHECK_LIB([json], [json_object_from_file], + [AC_SUBST([LIBJSON], ["-ljson"]) + AC_DEFINE([JSON], [1], [Define if you have libjson]) + ], + [AC_MSG_FAILURE([libjson test failed (use --without-json to disable or install json-c)])], + [-ljson] + )
AM_CONDITIONAL([AMJSON], [ test x$with_json != xno])
diff --git a/src/Makefile.am b/src/Makefile.am index e9a0ee3..600d468 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -I$(srcdir)/../libdl/ bin_PROGRAMS = rt-app -rt_app_SOURCES= rt-app_types.h rt-app_args.h rt-app_utils.h rt-app_utils.c rt-app_args.c rt-app.h rt-app.c -if AMJSON +rt_app_SOURCES= rt-app_types.h rt-app_args.h rt-app_utils.h rt-app_utils.c rt-app_args.c rt-app.h rt-app.c rt_app_SOURCES += rt-app_parse_config.h rt-app_parse_config.c -AM_CPPFLAGS += $(LIBJSON_CFLAGS) -endif -rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a $(LIBJSON_LIBS) +rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a $(LIBJSON) +