diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 12:19:44 +0200 |
| commit | e92a0db46dfd2661a92e41a678d982ce6d3eedde (patch) | |
| tree | 4e09eb39484f497e8eab28bf85bb933e139df49d /Makefile.am | |
| parent | 8a819d6a0623c0854462dd2dc632700f9a5c576c (diff) | |
| parent | e4f012eb60f6531f964557ba9eac54048ae2bef8 (diff) | |
| download | rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.gz rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.xz rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.zip | |
Merge branch 'master' into oracle
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index a5c3e267..dfb33339 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS=dejagnu - sbin_PROGRAMS = pkglib_LTLIBRARIES = @@ -90,6 +88,10 @@ if ENABLE_IMTEMPLATE SUBDIRS += plugins/imtemplate endif +if ENABLE_OMSTDOUT +SUBDIRS += plugins/omstdout +endif + if ENABLE_OMTEMPLATE SUBDIRS += plugins/omtemplate endif @@ -125,5 +127,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-oracle +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-oracle ACLOCAL_AMFLAGS = -I m4 |