From f3239859e52a7b34aced9cc9c8be6bc272d4766f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz> Date: Fri, 2 Jan 2015 15:13:41 +0100 Subject: [PATCH] daemon: explicit linking of libuv/libknot, build fixes --- configure.ac | 1 + daemon/Makefile.am | 2 +- tests/Makefile.am | 2 ++ tests/test.h | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f9d0fd12d..8d6a745bc 100644 --- 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 a9a6c15af..e77328ccf 100644 --- 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 e99a93632..a82b5a00a 100644 --- 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 3b255ac41..879263aa8 100644 --- 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> -- GitLab