summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-26 10:23:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-26 10:23:03 +0200
commit4f8bbd8b56b35e12d6149b0719241d07f7410c4f (patch)
tree88b6cfde2ff6094eda1eb604a2012a0c2e12ab48
parent14875be702b0c90c098888cba689190cec031646 (diff)
downloadrsyslog-4f8bbd8b56b35e12d6149b0719241d07f7410c4f.tar.gz
rsyslog-4f8bbd8b56b35e12d6149b0719241d07f7410c4f.tar.bz2
rsyslog-4f8bbd8b56b35e12d6149b0719241d07f7410c4f.zip
add json-c to build system
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 80c086f4..499b2de7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,9 @@ PKG_PROG_PKG_CONFIG
# modules we require
PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.2)
PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
+PKG_CHECK_MODULES([JSON_C], [json])
+AC_SUBST([JSON_CFLAGS])
+AC_SUBST([JSON_LIBS])
case "${host}" in
*-*-linux*)
@@ -773,8 +776,8 @@ if test "x$enable_rsyslogrt" = "xyes"; then
#??CNF_LIBS="\$(top_builddir)/grammar/libgrammar.la"
fi
AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS)"
-RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS)"
+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
+RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
AC_SUBST(RSRT_CFLAGS1)
AC_SUBST(RSRT_LIBS1)
AC_SUBST(RSRT_CFLAGS)