summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:44:05 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:44:05 +0200
commitbac5b5abe4521c4265e493c897cb34996839d5d1 (patch)
treefc4bcf1942eb77d60626259291e4132a272fd0b5
parent44f227b9594e95a4e2f223236b961cf533a50c12 (diff)
downloadrsyslog-bac5b5abe4521c4265e493c897cb34996839d5d1.zip
rsyslog-bac5b5abe4521c4265e493c897cb34996839d5d1.tar.gz
rsyslog-bac5b5abe4521c4265e493c897cb34996839d5d1.tar.xz
bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10
Thanks to Miloslav Trmač for providing patches and suggestions
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac8
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57f3fab..95a56b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Version 6.3.10 [BETA] 2012-06-04
- bugfix: --enable-smcustbindcdr configure directive did not work
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330
Thanks to Ultrabug for the patch.
+- bugfix: made rsyslog compile when libestr ist not installed in /usr
+ Thanks to Miloslav Trmač for providing patches and suggestions
---------------------------------------------------------------------------
Version 6.3.9 [BETA] 2012-05-22
- bugfix: imtcp could cause hang during reception
diff --git a/configure.ac b/configure.ac
index a35182f..498b59d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,11 +752,15 @@ AC_ARG_ENABLE(rsyslogrt,
[enable_rsyslogrt=yes]
)
if test "x$enable_rsyslogrt" = "xyes"; then
- RSRT_CFLAGS="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar"
- RSRT_LIBS="\$(top_builddir)/runtime/librsyslog.la"
+ RSRT_CFLAGS1="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar"
+ RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
#??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)"
+AC_SUBST(RSRT_CFLAGS1)
+AC_SUBST(RSRT_LIBS1)
AC_SUBST(RSRT_CFLAGS)
AC_SUBST(RSRT_LIBS)