diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-18 14:36:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-18 14:36:17 +0200 |
| commit | 9bdc8e3702277f8798a32139c0c7c1c83acecdaa (patch) | |
| tree | ad95d3d6be3c1aa366697e05043c7e6265f27cca /tools | |
| parent | 78d55d41ed05bf1d05f464d84c68e92625890529 (diff) | |
| parent | 9a9c88a31abd139889bacee0f58b949c278ffdb2 (diff) | |
| download | rsyslog-9bdc8e3702277f8798a32139c0c7c1c83acecdaa.tar.gz rsyslog-9bdc8e3702277f8798a32139c0c7c1c83acecdaa.tar.xz rsyslog-9bdc8e3702277f8798a32139c0c7c1c83acecdaa.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/rsyslogd.8 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 25761708..9d9bd352 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,11 +36,11 @@ rsyslogd_SOURCES = \ pidfile.h \ \ ../dirty.h -rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(CNF_LIBS) +rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) # note: it looks like librsyslog.la must be explicitely given on LDDADD, # otherwise dependencies are not properly calculated (resulting in a # potentially incomplete build, a problem we had several times...) -rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(CNF_LIBS) $(LIBUUID_LIBS) +rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(LIBUUID_LIBS) rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 36f29769..86db690e 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -120,7 +120,7 @@ If neither -4 nor -6 is given, listens to all configured addresses of the system. .TP .BI "\-c " "version" -This option has been obsolted and has no function any longer. It is still +This option has been obsoleted and has no function any longer. It is still accepted in order not to break existing scripts. However, future versions may not support it. .TP |