ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Cleanup the way we detect json-c library to use only pkg-config

Browse Source
This commit is contained in:
Ondřej Surý
2019-02-06 11:56:42 +01:00
parent d54f3f8b8c
commit 4d2d3b49ce
52 changed files with 342 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ns/tests/Makefile.in
View File

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\"
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -26,7 +26,7 @@ DNSDEPLIBS = ../../dns/libdns.@A@
NSLIBS = ../libns.@A@
NSDEPLIBS = ../libns.@A@
LIBS = @LIBS@ @CMOCKA_LIBS@
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
OBJS = nstest.@O@