diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
commit | e82c6eec6f91e9c212103d81fdd4b10028c9bf6a (patch) | |
tree | 157a358cdef97a1d5e97e9b446b9bf7ccfa95d26 /Makefile.am | |
parent | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (diff) | |
parent | b9198d251218f13803cf121c4ef5f69a0e850d24 (diff) | |
download | rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.gz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.xz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.zip |
Merge branch 'bsd-port'
Conflicts:
ChangeLog
plugins/imklog/imklog.c
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d0341819..0e75710c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,7 +183,7 @@ SUBDIRS = . doc SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting -if ENABLE_IMKLOGD +if ENABLE_IMKLOG SUBDIRS += plugins/imklog endif |