From 822c8e56f7fc5e35b871d89071332a56c56dbbd2 Mon Sep 17 00:00:00 2001 From: Toni Date: Wed, 21 Oct 2020 15:05:33 +0200 Subject: Improved/autoconf (#1037) * Switched to PKG_CHECK_MODULES to keep pkg-config checks more portable. Signed-off-by: Toni Uhlig * Improved GCrypt autoconf check to detect a possible gpg-error inter-library dependency. Signed-off-by: Toni Uhlig --- tests/unit/Makefile.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in index 7ead9df73..88f100ae1 100644 --- a/tests/unit/Makefile.in +++ b/tests/unit/Makefile.in @@ -3,12 +3,9 @@ CXX=@CXX@ SRCHOME=../../src -JSON_INC = $(shell pkg-config --cflags json-c) -JSON_LIB = $(shell pkg-config --libs json-c) - -CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include $(JSON_INC) @PCAP_INC@ @CFLAGS@ +CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ LIBNDPI=$(SRCHOME)/lib/libndpi.a -LDFLAGS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ $(JSON_LIB) -lpthread -lm @LDFLAGS@ +LDFLAGS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread -lm @LDFLAGS@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h OBJS=unit PREFIX?=@prefix@ -- cgit v1.2.3