[520-fix_benchmarks] Updated configure.ac and benchmarks Makefile.am

diff --git a/configure.ac b/configure.ac
index 214d3076dac48284e75af7dd4d5aa98e84b2c9ed..95bccb85d7a90c9e69a1c6d0086a57e3615d693e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1969,6 +1969,7 @@ cat >> config.report << END
 Developer:
   Enable Debugging:          $debug_enabled
   Google Tests:              $enable_gtest
+  Google Benchmark:          $enable_benchmark
   Valgrind:                  $found_valgrind
   C++ Code Coverage:         $USE_LCOV
   Logger checks:             $enable_logger_checks

diff --git a/src/lib/dhcpsrv/benchmarks/Makefile.am b/src/lib/dhcpsrv/benchmarks/Makefile.am
index 88ebb283526dfe856b1d813e321b8b234e85bacc..ce46e916c64a9fe719321810a451d92ff8c53d9e 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/Makefile.am
+++ b/src/lib/dhcpsrv/benchmarks/Makefile.am
@@ -70,10 +70,15 @@ if HAVE_CQL
 run_benchmarks_LDFLAGS += $(CQL_LIBS)
 endif
 
-run_benchmarks_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-run_benchmarks_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+run_benchmarks_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 run_benchmarks_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-run_benchmarks_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 
 if HAVE_MYSQL
 run_benchmarks_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
@@ -87,11 +92,32 @@ if HAVE_CQL
 run_benchmarks_LDADD += $(top_builddir)/src/lib/cql/testutils/libcqltest.la
 endif
 
-run_benchmarks_LDADD += $(BENCHMARK_LDADD)
+run_benchmarks_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+run_benchmarks_LDADD +=        $(top_builddir)/src/lib/cc/libkea-cc.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+run_benchmarks_LDADD +=        $(top_builddir)/src/lib/log/libkea-log.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+run_benchmarks_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+
+if HAVE_MYSQL
+run_benchmarks_LDADD += $(MYSQL_LIBS)
+endif
+
+if HAVE_PGSQL
+run_benchmarks_LDADD += $(PGSQL_LIBS)
+endif
+
+if HAVE_CQL
+run_benchmarks_LDADD += $(CQL_LIBS)
+endif
+
 run_benchmarks_LDADD += $(LOG4CPLUS_LIBS)
 run_benchmarks_LDADD += $(CRYPTO_LIBS)
 run_benchmarks_LDADD += $(BOOST_LIBS)
 run_benchmarks_LDADD += $(GTEST_LDADD)
+run_benchmarks_LDADD += $(BENCHMARK_LDADD)
 
 endif