diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:54:44 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:54:44 +0100 |
| commit | 05bd696ebb7766f33b3ae176b841bcecb0bfedfc (patch) | |
| tree | 99437759863ee4b25174f49aa69807c207176a76 /tools/Makefile.am | |
| parent | 9048c16d90177a0dfa4131266ae73f029a5923c8 (diff) | |
| parent | ba201a941435bc5fec2c333155e1a8e16c4a9c05 (diff) | |
| download | rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.tar.gz rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.tar.xz rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.zip | |
Merge branch 'master' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index b2b7a8ca..a265af9c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,9 +21,13 @@ rsyslogd_SOURCES = \ pidfile.h \ \ ../dirty.h - rsyslogd_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(rsrt_libs) rsyslogd_LDFLAGS = -export-dynamic +if ENABLE_DIAGTOOLS +sbin_PROGRAMS += rsyslog_diag_hostname +rsyslog_diag_hostname_SOURCES = gethostn.c +endif + EXTRA_DIST = $(man_MANS) |