diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 07:58:09 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 07:58:09 +0000 |
| commit | 7e4785e72b17b8fff26f536342457ceee02d39a0 (patch) | |
| tree | 4dc8b4f80381f1ccdfef84c90a065bc84a6f9ea2 | |
| parent | 931ce19540b10322b04e6e8c2107c63f361aae56 (diff) | |
| download | rsyslog-7e4785e72b17b8fff26f536342457ceee02d39a0.tar.gz rsyslog-7e4785e72b17b8fff26f536342457ceee02d39a0.tar.xz rsyslog-7e4785e72b17b8fff26f536342457ceee02d39a0.zip | |
added librelp check via PKG_CHECK thanks to Michael Biebl's patch
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | plugins/imrelp/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/omrelp/Makefile.am | 4 |
4 files changed, 9 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index eb0497a6..4e886128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -173,9 +173,9 @@ endif if ENABLE_RELP pkglib_LTLIBRARIES += lmrelputil.la lmrelputil_la_SOURCES = relputil.c relputil.h -lmrelputil_la_CPPFLAGS = $(pthreads_cflags) $(relp_cflags) +lmrelputil_la_CPPFLAGS = $(pthreads_cflags) $(RELP_CFLAGS) lmrelputil_la_LDFLAGS = -module -avoid-version -lmrelputil_la_LIBADD = $(relp_libs) +lmrelputil_la_LIBADD = $(RELP_LIBS) endif EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index c45ba862..8b407ccf 100644 --- a/configure.ac +++ b/configure.ac @@ -502,26 +502,11 @@ AC_ARG_ENABLE(relp, [enable_relp=no] ) if test "x$enable_relp" = "xyes"; then - AC_CHECK_HEADERS( - [librelp.h],, - [AC_MSG_FAILURE([RELP library is missing (no headers)])] - ) -# I don't know how to tell that librelp needs -lrt, so I disable -# this check for now - the header check should work well enough... -# rgerhards, 2008-03-25 -# AC_CHECK_LIB( -# [relp], -# [relpEngineGetVersion], -# [relp_cflags="" - relp_libs="-lrelp" -# ], -# [AC_MSG_FAILURE([RELP library is missing])] -# ) + PKG_CHECK_MODULES(RELP, relp >= 0.1.1) fi AM_CONDITIONAL(ENABLE_RELP, test x$enable_relp = xyes) -AC_SUBST(relp_cflags) -AC_SUBST(relp_libs) - +AC_SUBST(RELP_CFLAGS) +AC_SUBST(RELP_LIBS) # RFC 3195 support # WARNING: THIS IS NOT REALLY PRESENT YET - needs to be build manually! diff --git a/plugins/imrelp/Makefile.am b/plugins/imrelp/Makefile.am index 167065b0..53c9322c 100644 --- a/plugins/imrelp/Makefile.am +++ b/plugins/imrelp/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = imrelp.la imrelp_la_SOURCES = imrelp.c -imrelp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(relp_cflags) +imrelp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(RELP_CFLAGS) imrelp_la_LDFLAGS = -module -avoid-version -imrelp_la_LIBADD = $(relp_libs) +imrelp_la_LIBADD = $(RELP_LIBS) diff --git a/plugins/omrelp/Makefile.am b/plugins/omrelp/Makefile.am index edec5de9..dfc2111f 100644 --- a/plugins/omrelp/Makefile.am +++ b/plugins/omrelp/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = omrelp.la omrelp_la_SOURCES = omrelp.c -omrelp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(relp_cflags) +omrelp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(RELP_CFLAGS) omrelp_la_LDFLAGS = -module -avoid-version -omrelp_la_LIBADD = $(relp_libs) +omrelp_la_LIBADD = $(RELP_LIBS) |