diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 12:49:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 12:49:12 +0100 |
| commit | ef45e0ff714767b58e9069a1db78d92ef370e498 (patch) | |
| tree | 248849f1ba7abfda64bf30a9bc97b472f91955be /Makefile.am | |
| parent | 5c7162879af11255aea4e6f6e1091a69ce14aff3 (diff) | |
| parent | da4c90af2592c1c1f7e55d3445df23131b035e27 (diff) | |
| download | rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.gz rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.xz rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.zip | |
Merge branch 'v5-devel'
Conflicts:
tests/diag.sh
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9809364b..1a335451 100644 --- a/Makefile.am +++ b/Makefile.am @@ -241,5 +241,7 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmsnare \ + --enable-imtemplate \ + --enable-omtemplate \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) ACLOCAL_AMFLAGS = -I m4 |