Merge branch 'master' into trac1281

src/lib/dhcp/Makefile.am

@@ -28,5 +28,6 @@ EXTRA_DIST  = README
 
 libdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 libdhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libdhcp___la_LIBADD   = $(top_builddir)/src/lib/util/libutil.la
-libdhcp___la_LDFLAGS = -no-undefined -version-info 1:0:0
+libdhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libasiolink.la
+libdhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libutil.la
+libdhcp___la_LDFLAGS  = -no-undefined -version-info 1:0:0