diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:55 +0200 |
commit | 538ec6d401f12a3de2e81ce054ef789fb47624ea (patch) | |
tree | 38d94ec0fb8daed37b2b41342039201fe0d4c9d8 /configure.ac | |
parent | a1c7bc265554563d1744738994075214e5083566 (diff) | |
parent | 53a0ed8b3a03aa5d7bf40cb69b02391e5e5ca9d1 (diff) | |
download | rsyslog-538ec6d401f12a3de2e81ce054ef789fb47624ea.tar.gz rsyslog-538ec6d401f12a3de2e81ce054ef789fb47624ea.tar.xz rsyslog-538ec6d401f12a3de2e81ce054ef789fb47624ea.zip |
Merge branch 'rfc3195'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index dc9b4c6a..88a92ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -572,25 +572,11 @@ AC_ARG_ENABLE(rfc3195, [enable_rfc3195=no] ) if test "x$enable_rfc3195" = "xyes"; then - AC_CHECK_HEADERS( - [librfc3195.h],, - [AC_MSG_FAILURE([RFC3195 library is missing (no headers)])] - ) -# I don't know how to tell that librfc3195 needs -lrt, so I disable -# this check for now - the header check should work well enough... -# rgerhards, 2008-03-25 -# AC_CHECK_LIB( -# [rfc3195], -# [rfc3195EngineGetVersion], -# [rfc3195_cflags="" - rfc3195_libs="-lrfc3195" -# ], -# [AC_MSG_FAILURE([RFC3195 library is missing])] -# ) + PKG_CHECK_MODULES(LIBLOGGING, liblogging >= 0.7.1) fi AM_CONDITIONAL(ENABLE_RFC3195, test x$enable_rfc3195 = xyes) -AC_SUBST(rfc3195_cflags) -AC_SUBST(rfc3195_libs) +AC_SUBST(RFC3195_CFLAGS) +AC_SUBST(RFC3195_LIBS) # settings for the template input module; copy and modify this code @@ -639,6 +625,7 @@ AC_CONFIG_FILES([Makefile \ doc/Makefile \ plugins/imudp/Makefile \ plugins/imtcp/Makefile \ + plugins/im3195/Makefile \ plugins/imgssapi/Makefile \ plugins/imuxsock/Makefile \ plugins/immark/Makefile \ |