diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:44:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:44:14 +0200 |
| commit | 76c80165e969a37c0fc176661879661c20e9a198 (patch) | |
| tree | f6b9c5e0dc9862e6dced0c0ad817766db9a719b4 /Makefile.am | |
| parent | 1d41ac2b7b7dccd307856b173a3bf358ce51929e (diff) | |
| parent | 80466e20d19a5fcf7b9d8798b3d7afb42f7e98d7 (diff) | |
| download | rsyslog-76c80165e969a37c0fc176661879661c20e9a198.tar.gz rsyslog-76c80165e969a37c0fc176661879661c20e9a198.tar.xz rsyslog-76c80165e969a37c0fc176661879661c20e9a198.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 03a78cce..9edc1bcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,10 +112,6 @@ if ENABLE_SNMP SUBDIRS += plugins/omsnmp endif -if ENABLE_CUST1 -SUBDIRS += plugins/cust1 -endif - if ENABLE_SMCUSTBINDCDR SUBDIRS += plugins/sm_cust_bindcdr endif |