diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /Makefile.am | |
parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.xz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0d5c0a06..0e647f7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,8 +59,8 @@ if ENABLE_IMKLOG SUBDIRS += plugins/imklog endif -if ENABLE_IMDOOR -SUBDIRS += plugins/imdoor +if ENABLE_IMSOLARIS +SUBDIRS += plugins/imsolaris endif if ENABLE_GSSAPI @@ -154,5 +154,5 @@ SUBDIRS += tests # temporarily be removed below. The intent behind forcing everthing to compile # in a make distcheck is so that we detect code that accidently was not updated # when some global update happened. -DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omruleset --enable-omprog --enable-imdiag --enable-shave --enable-memcheck +DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omruleset --enable-omprog --enable-imdiag --enable-shave --enable-extended-tests --enable-memcheck ACLOCAL_AMFLAGS = -I m4 |