diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
| commit | d9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch) | |
| tree | 861b66fbde7b876413c00e449315e2fbd81b07a5 /Makefile.am | |
| parent | 149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff) | |
| parent | 9de526eccd85324f8cff4968ac6b17fa66648c2b (diff) | |
| download | rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip | |
Merge branch 'v4-stable' into tmp
Conflicts:
ChangeLog
Makefile.am
tests/Makefile.am
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 5f9d35fe..62fc1357 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,5 +146,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-memcheck --enable-extended-tests ACLOCAL_AMFLAGS = -I m4 |