diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
commit | 062c1ffbdce422c0df3b5314d25d935f1bd2a9e1 (patch) | |
tree | 4aacc6da01a86dbea578e9e54bea8db76e3bd6a4 /tests/Makefile.am | |
parent | 75a585a7e26d4d6cf59157cf62584c139af1527c (diff) | |
parent | 9be853a2c8d0fd7fdc415200af57493ad5a00feb (diff) | |
download | rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.tar.gz rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.tar.xz rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.zip |
Merge branch 'master-tcpsrv-mt'v6.1.5
Conflicts:
ChangeLog
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a040a9d9..059f951f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -58,6 +58,11 @@ TESTS += \ imptcp_conndrop.sh endif +if ENABLE_GNUTLS +TESTS += \ + imtcp-tls-basic.sh +endif + if ENABLE_OMUXSOCK TESTS += uxsock_simple.sh endif @@ -195,6 +200,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/da-mainmsg-q.conf \ diskqueue-fsync.sh \ testsuites/diskqueue-fsync.conf \ + imtcp-tls-basic.sh \ + testsuites/imtcp-tls-basic.conf \ imtcp-multiport.sh \ testsuites/imtcp-multiport.conf \ udp-msgreduc-vg.sh \ @@ -344,7 +351,11 @@ uxsockrcvr_SOURCES = uxsockrcvr.c uxsockrcvr_LDADD = $(SOL_LIBS) tcpflood_SOURCES = tcpflood.c -tcpflood_LDADD = $(SOL_LIBS) $(PTHREADS_LIBS) +tcpflood_CPPFLAGS = $(PTHREADS_CFLAGS) $(GNUTLS_CFLAGS) +tcpflood_LDADD = $(SOL_LIBS) $(PTHREADS_LIBS) $(GNUTLS_LIBS) +if ENABLE_GNUTLS +tcpflood_LDADD += -lgcrypt +endif syslog_caller_SOURCES = syslog_caller.c syslog_caller_LDADD = $(SOL_LIBS) |