diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 15:10:00 +0200 |
| commit | 7053a438efd07361b6e33de4bdf254b1d3b58553 (patch) | |
| tree | bd5c83d8141bcd28a0c0a21f447ecdab522ab487 /Makefile.am | |
| parent | 6eeff56d010e48e4e5a7eca41223832edca5c5d1 (diff) | |
| parent | 4ebd062564c068566d60b4f54c047e6c082edf8e (diff) | |
| download | rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.gz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.tar.xz rsyslog-7053a438efd07361b6e33de4bdf254b1d3b58553.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
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 e69349d8..a02fa6a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,5 +138,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-omprog --enable-imdiag --enable-shave +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-omprog --enable-imdiag --enable-shave --enable-extended-tests ACLOCAL_AMFLAGS = -I m4 |