diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2014-07-29 13:39:28 +0200 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2014-08-01 15:43:46 +0200 |
| commit | 90931026061983f745b806d82700a3269a5e3b5b (patch) | |
| tree | f8b2d6bf65870adc342ae7486f9fff1ff3e9cd35 | |
| parent | 040b267734ea2da4ffb6139f99d986d7fd104681 (diff) | |
remove conditional compilation of json
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
| -rw-r--r-- | README.in | 7 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 3 insertions, 19 deletions
@@ -40,11 +40,6 @@ Last step is optional, rt-app is generated in the src/ directory. Typical usage: -$ ./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 @@ -59,7 +54,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/configure.ac b/configure.ac index 2f5f662..afaedd9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,23 +23,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] - ) LIBJSON= -AS_IF([test "x$with_json" != "xno"], - [AC_CHECK_LIB([json], [json_object_from_file], + 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 1674a10..600d468 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,6 @@ 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_parse_config.h rt-app_parse_config.c -endif rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a $(LIBJSON) |