From: Razvan Becheriu Date: Tue, 12 Dec 2017 10:17:21 +0000 (+0200) Subject: Merge remote-tracking branch 'isc-kea/master' into HEAD X-Git-Tag: trac5494_base~11^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe7940f76bb4985b26ac77f18669b580c5979a0;p=thirdparty%2Fkea.git Merge remote-tracking branch 'isc-kea/master' into HEAD --- 8fe7940f76bb4985b26ac77f18669b580c5979a0 diff --cc src/lib/dhcpsrv/Makefile.am index 2e359366f0,cc3e148634..f52edf905e --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@@ -146,14 -147,12 +148,15 @@@ libkea_dhcpsrv_la_SOURCES += pgsql_exch libkea_dhcpsrv_la_SOURCES += pgsql_host_data_source.cc pgsql_host_data_source.h libkea_dhcpsrv_la_SOURCES += pgsql_lease_mgr.cc pgsql_lease_mgr.h endif + if HAVE_CQL -libkea_dhcpsrv_la_SOURCES += cql_lease_mgr.cc cql_lease_mgr.h libkea_dhcpsrv_la_SOURCES += cql_connection.cc cql_connection.h +libkea_dhcpsrv_la_SOURCES += cql_exchange.cc cql_exchange.h +libkea_dhcpsrv_la_SOURCES += cql_lease_mgr.cc cql_lease_mgr.h endif + libkea_dhcpsrv_la_SOURCES += pool.cc pool.h + libkea_dhcpsrv_la_SOURCES += shared_network.cc shared_network.h libkea_dhcpsrv_la_SOURCES += srv_config.cc srv_config.h libkea_dhcpsrv_la_SOURCES += subnet.cc subnet.h libkea_dhcpsrv_la_SOURCES += subnet_id.h