diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
| commit | 924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch) | |
| tree | 1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /plugins/omtesting | |
| parent | 46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff) | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| download | rsyslog-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/omtesting')
| -rw-r--r-- | plugins/omtesting/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/omtesting/Makefile.am b/plugins/omtesting/Makefile.am index 8e98ca63..4700e1eb 100644 --- a/plugins/omtesting/Makefile.am +++ b/plugins/omtesting/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = omtesting.la omtesting_la_SOURCES = omtesting.c -omtesting_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags) +omtesting_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) omtesting_la_LDFLAGS = -module -avoid-version omtesting_la_LIBADD = |