From: Razvan Becheriu <razvan@isc.org>
Date: Tue, 11 Jun 2019 06:45:57 +0000 (+0300)
Subject: [#522,!261] addressed review
X-Git-Tag: Kea-1.6.0-beta2~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7debc182e094a8b34f1f2df99cf4e9f84c8906;p=thirdparty%2Fkea.git

[#522,!261] addressed review
---

diff --git a/configure.ac b/configure.ac
index 1ded641ac7..c8c26bbfe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,8 +856,8 @@ if test "$CQL_CONFIG" != "" ; then
     fi
 
     CQL_INCLUDEDIR=`$CQL_CONFIG --cflags-only-I $cql_lib`
-    CQL_CPPFLAGS="`$CQL_CONFIG --cflags-only-other $cql_lib`"
-    CQL_LIBS="`$CQL_CONFIG --libs $cql_lib`"
+    CQL_CPPFLAGS=`$CQL_CONFIG --cflags-only-other $cql_lib`
+    CQL_LIBS=`$CQL_CONFIG --libs $cql_lib`
     CQL_LIBS="$CQL_LIBS $CRYPTO_LIBS"
     CQL_VERSION=`$CQL_CONFIG --modversion $cql_lib`
 
diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index 7ce5a802d8..460f83e3dc 100644
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -43,8 +43,9 @@ kea_lfc_SOURCES  = main.cc
 
 kea_lfc_LDADD  = liblfc.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+kea_lfc_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
@@ -65,7 +66,6 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-kea_lfc_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index 328b260fa8..973ff3e581 100644
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS += -Werror
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
-AM_LDFLAGS =
+AM_LDFLAGS = -lm
 if USE_STATIC_LINK
 AM_LDFLAGS += -static
 endif