diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 08:05:31 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 08:05:31 +0000 |
| commit | 35dc817c008cd54175cd2d6c747119a7cf1922c1 (patch) | |
| tree | 51c71fd31fe5a4c3be901dc30e2c721fbc324b40 | |
| parent | 565c2b5cd87cd31781abf2116edef48afecdf9d4 (diff) | |
| download | rsyslog-35dc817c008cd54175cd2d6c747119a7cf1922c1.tar.gz rsyslog-35dc817c008cd54175cd2d6c747119a7cf1922c1.tar.xz rsyslog-35dc817c008cd54175cd2d6c747119a7cf1922c1.zip | |
added librelp check via PKG_CHECK thanks to Michael Biebl's patch
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | plugins/imrelp/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/omrelp/Makefile.am | 4 |
3 files changed, 7 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index ca2cf484..498957da 100644 --- a/configure.ac +++ b/configure.ac @@ -466,26 +466,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) 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) |