THRIFT-2910 libevent is not really optional
Client: C++
Patch: Nobuaki Sukegawa <nsukeg@gmail.com>
This closes #337
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index 8420357..399bebd 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -51,7 +51,6 @@
libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
noinst_PROGRAMS = Benchmark \
- processor_test \
concurrency_test
Benchmark_SOURCES = \
@@ -68,7 +67,6 @@
RecursiveTest \
SpecializationTest \
AllProtocolsTest \
- TNonblockingServerTest \
TransportTest \
ZlibTest \
TFileTransportTest \
@@ -77,6 +75,13 @@
OpenSSLManualInitTest \
EnumTest
+if AMX_HAVE_LIBEVENT
+noinst_PROGRAMS +=
+ processor_test
+check_PROGRAMS += \
+ TNonblockingServerTest
+endif
+
TESTS_ENVIRONMENT= \
BOOST_TEST_LOG_SINK=tests.xml \
BOOST_TEST_LOG_LEVEL=test_suite \
@@ -190,7 +195,7 @@
$(top_builddir)/lib/cpp/libthriftnb.la \
$(BOOST_TEST_LDADD) \
$(BOOST_LDFLAGS) \
- -levent
+ $(LIBEVENT_LIBS)
#
# OptionalRequiredTest
@@ -243,7 +248,7 @@
$(top_builddir)/lib/cpp/libthriftnb.la \
$(BOOST_TEST_LDADD) \
$(BOOST_LDFLAGS) \
- -levent
+ $(LIBEVENT_LIBS)
OpenSSLManualInitTest_SOURCES = \
OpenSSLManualInitTest.cpp