- remove more references to HAVE_BOOST_SYSTEM

- add -lpthread where needed

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac168@1865 e5f2f494-b856-4b98-b285-d166d9295462

src/bin/auth/Makefile.am

@@ -37,13 +37,9 @@ b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
 b10_auth_LDADD += $(SQLITE_LIBS)
-if HAVE_BOOST_SYSTEM
 if HAVE_BOOST_PYTHON
 b10_auth_LDADD += $(top_builddir)/src/lib/xfr/.libs/libxfr.a
 endif
-b10_auth_LDFLAGS = $(AM_LDFLAGS) $(BOOST_LDFLAGS)
-b10_auth_LDADD += $(BOOST_SYSTEM_LIB)
-endif
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}

src/bin/auth/tests/Makefile.am

@@ -21,10 +21,6 @@ run_unittests_LDADD +=  $(top_builddir)/src/lib/dns/.libs/libdns.a
 run_unittests_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
-if HAVE_BOOST_SYSTEM
-run_unittests_LDFLAGS += $(BOOST_LDFLAGS)
-run_unittests_LDADD += $(BOOST_SYSTEM_LIB)
-endif
 endif
 
 noinst_PROGRAMS = $(TESTS)

src/lib/Makefile.am

@@ -1,6 +1,4 @@
 SUBDIRS = exceptions dns cc config datasrc python
 if HAVE_BOOST_PYTHON
-if HAVE_BOOST_SYSTEM
 SUBDIRS += xfr
 endif
-endif

src/lib/config/tests/Makefile.am

@@ -17,11 +17,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/data.o
 run_unittests_LDADD += libfake_session.la
-
-if HAVE_BOOST_SYSTEM
-run_unittests_LDFLAGS += $(AM_LDFLAGS) $(BOOST_LDFLAGS)
-run_unittests_LDADD += $(BOOST_SYSTEM_LIB)
-endif
+run_unittests_LDADD += -lpthread
 
 endif
 

src/lib/config/tests/fake_session.cc

@@ -23,7 +23,8 @@
 #include <iostream>
 #include <sstream>
 
-#include <asio.hpp>
+#include <asio/io_service.hpp>
+#include <asio/ip/tcp.hpp>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>