diff options
| author | Toni <matzeton@googlemail.com> | 2020-10-21 15:05:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 15:05:33 +0200 |
| commit | 822c8e56f7fc5e35b871d89071332a56c56dbbd2 (patch) | |
| tree | 51bf4496a4342b8ed263de9a025796115e368a0b | |
| parent | bb33d579714e140650e13325c39b0d372888b717 (diff) | |
Improved/autoconf (#1037)
* Switched to PKG_CHECK_MODULES to keep pkg-config checks more portable.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Improved GCrypt autoconf check to detect a possible gpg-error inter-library dependency.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | configure.seed | 16 | ||||
| -rw-r--r-- | tests/unit/Makefile.in | 7 |
2 files changed, 13 insertions, 10 deletions
diff --git a/configure.seed b/configure.seed index 9d1185f15..9303e3187 100644 --- a/configure.seed +++ b/configure.seed @@ -71,9 +71,8 @@ NDPI_API_VERSION=`echo $NDPI_API_VERSION | sed 's/^0*//'` AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release]) AC_DEFINE_UNQUOTED(NDPI_GIT_DATE, "${GIT_DATE}", [Last GIT change]) -dnl> used by json-c -JSONC_INC=`pkg-config --cflags json-c` -CFLAGS="${CFLAGS} ${JSONC_INC}" +dnl> used by json-c for unit tests +PKG_CHECK_MODULES([JSONC], [json-c]) AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h json.h]) @@ -177,10 +176,15 @@ dnl> GCRYPT AC_ARG_ENABLE([gcrypt], [AS_HELP_STRING([--disable-gcrypt], [Avoid compiling with libgcrypt/libgpg-error, even if they are present. QUIC sub-classification may be missing])], [:], - [AC_CHECK_LIB(gcrypt, gcry_cipher_checktag) - AC_CHECK_LIB(gpg-error, gpg_strerror_r)]) + [AC_CHECK_LIB(gcrypt, gcry_cipher_checktag)]) if test "x$ac_cv_lib_gcrypt_gcry_cipher_checktag" = xyes; then : ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lgcrypt" +else + AC_CHECK_LIB(gpg-error, gpg_strerror_r) + AC_CHECK_LIB(gcrypt, gcry_cipher_checktag) + if test "x$ac_cv_lib_gcrypt_gcry_cipher_checktag" = xyes -a "x$ac_cv_lib_gpg_error_gpg_strerror_r" = xyes; then : + ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lgcrypt -lgpg-error" + fi fi dnl> PCRE @@ -210,4 +214,6 @@ AC_SUBST(CUSTOM_NDPI) AC_SUBST(NDPI_API_VERSION) AC_SUBST(EXTRA_TARGETS) AC_SUBST(BUILD_MINGW) +AC_SUBST(JSONC_CFLAGS) +AC_SUBST(JSONC_LIBS) AC_OUTPUT 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@ |