diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
| commit | 85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch) | |
| tree | d36a73e60aa9dc497dc218c64d74d53268139fe3 /Makefile.am | |
| parent | 01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff) | |
| parent | 01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff) | |
| download | rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip | |
Merge branch 'omprog' into nextmaster
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 58e1cfce..a5cf879c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,10 @@ if ENABLE_MAIL SUBDIRS += plugins/ommail endif +if ENABLE_OMPROG +SUBDIRS += plugins/omprog +endif + if ENABLE_RFC3195 SUBDIRS += plugins/im3195 endif @@ -127,5 +131,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 +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 ACLOCAL_AMFLAGS = -I m4 |