summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
commit924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch)
tree1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /plugins/imtcp
parent46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff)
parent24a36fd14226ccf5f139c07252f05f3db124604e (diff)
downloadrsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.gz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.xz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.zip
Merge branch 'beta'
Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html
Diffstat (limited to 'plugins/imtcp')
-rw-r--r--plugins/imtcp/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am
index de746a95..26653536 100644
--- a/plugins/imtcp/Makefile.am
+++ b/plugins/imtcp/Makefile.am
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = imtcp.la
imtcp_la_SOURCES = imtcp.c
-imtcp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags)
+imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
imtcp_la_LDFLAGS = -module -avoid-version
imtcp_la_LIBADD =