daemon: explicit linking of libuv/libknot, build fixes

diff --git a/configure.ac b/configure.ac
index f9d0fd12d7af88f8152a46d1f1b3eb1acab066ed..8d6a745bc3d8e1c5cbe0b56b73664b87b81579c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ LT_INIT
 PKG_PROG_PKG_CONFIG
 
 # Check for dependencies
+AC_CHECK_FUNCS([nftw])
 PKG_CHECK_MODULES([libuv], [libuv])
 PKG_CHECK_MODULES([libknot], [libknot])
 PKG_CHECK_MODULES([cmocka], [cmocka], AC_CONFIG_FILES([tests/Makefile]))

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a9a6c15af4a6d7ec8cf6a53b58bc698ceea7edc0..e77328ccf30bf25e61884e0cdcd0dfc1363bd44e 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -14,4 +14,4 @@ kresolved_SOURCES =                                   \
        main.c
 
 # sbin programs
-kresolved_LDADD = $(top_builddir)/lib/libknotresolve.la
+kresolved_LDADD = $(top_builddir)/lib/libknotresolve.la $(libuv_LIBS) $(libknot_LIBS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e99a9363247a47c7d92a336405be43de217db312..a82b5a00a07f0d0f43b7aec95dea3608b7751c75 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
 
 LDADD = \
        $(top_builddir)/lib/libknotresolve.la \
+       $(libuv_LIBS) \
+       $(libknot_LIBS) \
        $(cmocka_LIBS)
 
 check_PROGRAMS = \

diff --git a/tests/test.h b/tests/test.h
index 3b255ac41db072f7ec70a52ed61f2ed92b20e37a..879263aa81bca51b8469a11fbca0e5f133efb533 100644 (file)
--- a/tests/test.h
+++ b/tests/test.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#define _XOPEN_SOURCE 500
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>