diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-29 12:01:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-29 12:01:08 +0200 |
| commit | eab4df6580f036bc54bb793f6ebc523935bf3eff (patch) | |
| tree | d632fbcb2a5e019c548bffd62ed23c6c88ac2c5f | |
| parent | 901270418eca404a1f05c2b5ace66954b8b690b1 (diff) | |
| parent | 4f8bbd8b56b35e12d6149b0719241d07f7410c4f (diff) | |
| download | rsyslog-eab4df6580f036bc54bb793f6ebc523935bf3eff.tar.gz rsyslog-eab4df6580f036bc54bb793f6ebc523935bf3eff.tar.bz2 rsyslog-eab4df6580f036bc54bb793f6ebc523935bf3eff.zip | |
Merge branch 'master-jsonc' into master-jsonpassing
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 78315a80..d0accfeb 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*) @@ -788,8 +791,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) |