diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2015-10-08 18:38:25 +0200 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2015-10-21 10:46:35 +0200 |
| commit | ac1a8443e27ab287fd12a21c5aa07377cf8ff3fe (patch) | |
| tree | e7f54be55c9c4c1a51be7efe9644e8773999377b | |
| parent | c7daff743bc502abe2a44577d4f54168a753c0fe (diff) | |
rt-app: remove conditional dependency with libjson-c
rt-app can't run any more without using libjson-c since json file is the
only way to provide the description of a use case
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 50d6f76..6b24f11 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ AC_HEADER_STDC AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([m], [round]) AC_CHECK_LIB([rt], [clock_gettime]) +AC_CHECK_LIB([json-c], [json_object_from_file]) AC_ARG_WITH([deadline], [AS_HELP_STRING([--with-deadline], @@ -23,17 +24,6 @@ AS_IF([test "x$with_deadline" != xno], [AC_DEFINE([DLSCHED], [1], [Define if you have SCHED_DEADLINE support]) ]) -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-c test failed (use --without-json-c to disable or install json-c)])], - [-ljson-c] - ) - -AM_CONDITIONAL([AMJSON], [ test x$with_json != xno]) - AC_ARG_VAR([LOGLVL], [verbosity level, from 0 to 100. 100 is very verbose]) if test -z "${LOGLVL}";then diff --git a/src/Makefile.am b/src/Makefile.am index ca734d2..9bca1dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,5 +3,5 @@ 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 rt_app_SOURCES += rt-app_parse_config.h rt-app_parse_config.c -rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a $(LIBJSON) +rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a dist_bin_SCRIPTS = $(srcdir)/../doc/workgen |