diff options
Diffstat (limited to 'configure.seed')
| -rw-r--r-- | configure.seed | 16 |
1 files changed, 11 insertions, 5 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 |