Commit 14eaaa13 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

merged trac #345: removed dependency on pthreads from ASIO


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3100 e5f2f494-b856-4b98-b285-d166d9295462
parents c2eb613d 3363091b
...@@ -394,6 +394,9 @@ AC_SUBST(PTHREAD_LDFLAGS) ...@@ -394,6 +394,9 @@ AC_SUBST(PTHREAD_LDFLAGS)
# #
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio"
# #
# Disable threads: Currently we don't use them.
CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_THREADS=1"
#
# kqueue portability: ASIO uses kqueue by default if it's available (it's # kqueue portability: ASIO uses kqueue by default if it's available (it's
# generally available in BSD variants). Unfortunately, some public # generally available in BSD variants). Unfortunately, some public
# implementation of kqueue forces a conversion from a pointer to an integer, # implementation of kqueue forces a conversion from a pointer to an integer,
......
...@@ -18,8 +18,7 @@ TESTS += run_unittests ...@@ -18,8 +18,7 @@ TESTS += run_unittests
# (TODO: these need to be completed and moved to tests/) # (TODO: these need to be completed and moved to tests/)
run_unittests_SOURCES = data_unittests.cc session_unittests.cc run_unittests.cc run_unittests_SOURCES = data_unittests.cc session_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
# TODO: remove PTHREAD_LDFLAGS (and from configure too) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
......
...@@ -21,8 +21,7 @@ TESTS += run_unittests ...@@ -21,8 +21,7 @@ TESTS += run_unittests
run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
# TODO: remove PTHREAD_LDFLAGS (and from configure too) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment