[svn] commit: r1865 - in /branches/trac168/src: bin/auth/Makefile.am bin/auth/tests/Makefile.am lib/Makefile.am lib/config/tests/Makefile.am lib/config/tests/fake_session.cc

[BIND 10 source code commits]

Author: each
Date: Thu May 20 01:26:32 2010
New Revision: 1865

Log:
- remove more references to HAVE_BOOST_SYSTEM
- add -lpthread where needed

Modified:
    branches/trac168/src/bin/auth/Makefile.am
    branches/trac168/src/bin/auth/tests/Makefile.am
    branches/trac168/src/lib/Makefile.am
    branches/trac168/src/lib/config/tests/Makefile.am
    branches/trac168/src/lib/config/tests/fake_session.cc

Modified: branches/trac168/src/bin/auth/Makefile.am
==============================================================================
--- branches/trac168/src/bin/auth/Makefile.am (original)
+++ branches/trac168/src/bin/auth/Makefile.am Thu May 20 01:26:32 2010
@@ -37,12 +37,8 @@
 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

Modified: branches/trac168/src/bin/auth/tests/Makefile.am
==============================================================================
--- branches/trac168/src/bin/auth/tests/Makefile.am (original)
+++ branches/trac168/src/bin/auth/tests/Makefile.am Thu May 20 01:26:32 2010
@@ -21,10 +21,6 @@
 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)

Modified: branches/trac168/src/lib/Makefile.am
==============================================================================
--- branches/trac168/src/lib/Makefile.am (original)
+++ branches/trac168/src/lib/Makefile.am Thu May 20 01:26:32 2010
@@ -1,6 +1,4 @@
 SUBDIRS = exceptions dns cc config datasrc python
 if HAVE_BOOST_PYTHON
-if HAVE_BOOST_SYSTEM
 SUBDIRS += xfr
 endif
-endif

Modified: branches/trac168/src/lib/config/tests/Makefile.am
==============================================================================
--- branches/trac168/src/lib/config/tests/Makefile.am (original)
+++ branches/trac168/src/lib/config/tests/Makefile.am Thu May 20 01:26:32 2010
@@ -17,11 +17,7 @@
 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
 

Modified: branches/trac168/src/lib/config/tests/fake_session.cc
==============================================================================
--- branches/trac168/src/lib/config/tests/fake_session.cc (original)
+++ branches/trac168/src/lib/config/tests/fake_session.cc Thu May 20 01:26:32 2010
@@ -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>