[master] Merge branch 'trac3518' (Compilation fixes for 0.9 beta1)

Conflicts:
	ChangeLog

ChangeLog

@@ -8,6 +8,8 @@
 	false positives for specific network configurations.
 	(Trac #3517, git 9affa1b2210f5cc9d7a99724e5d5c8979409cefd)
 
+Kea 0.9beta1 released on August 13, 2014
+
 819.	[build]		marcin
 	Renamed variables in the configure.ac so as their names do not
 	refer to BIND10 project. As a result of renaming the B10_CXXFLAGS

INSTALL

@@ -6,8 +6,8 @@ To then build from source:
     make
 
 For detailed installation directions, see the guide
-at doc/guide/bind10-guide.txt or doc/guide/bind10-guide.html.
+at doc/guide/kea-guide.txt or doc/guide/kea-guide.html.
 
 You can find user-contributed OS-specific build/installation
-instructions on the BIND 10 wiki:
-http://bind10.isc.org/wiki/SystemSpecificNotes
+instructions on the Kea wiki:
+http://kea.isc.org/wiki/SystemSpecificNotes

src/bin/dhcp4/main.cc

@@ -81,7 +81,7 @@ main(int argc, char* argv[]) {
             return (EXIT_SUCCESS);
 
         case 'V':
-            cout << Daemon::getVersion(false) << endl;
+            cout << Daemon::getVersion(true) << endl;
             return (EXIT_SUCCESS);
 
         case 'p':

src/lib/config/Makefile.am

@@ -22,6 +22,7 @@ libkea_cfgclient_la_SOURCES += config_log.h config_log.cc
 
 libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 
 libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 1:0:1
 

src/lib/dhcp/Makefile.am

@@ -68,6 +68,7 @@ libkea_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
 libkea_dhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/dns/libkea-dns++.la
 libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_dhcp___la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_dhcp___la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 EXTRA_DIST  = README libdhcp++.dox

src/lib/dhcpsrv/Makefile.am

@@ -87,6 +87,7 @@ libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 libkea_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 3:0:0
 if HAVE_MYSQL

src/lib/dns/Makefile.am

@@ -155,6 +155,7 @@ libkea_dns___la_CPPFLAGS = $(AM_CPPFLAGS)
 # libcryptolink explicitly.
 libkea_dns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 libkea_dns___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_dns___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 # The following files used to be generated, but they are now part of the git tree:
 # rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc