diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-08-26 10:29:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 10:29:39 +0200 |
| commit | 5e1bb0dbc12f779151d386c63d7b7992b5940006 (patch) | |
| tree | 905492311a9056e18a3a5263e39630366858c384 | |
| parent | b94e13da435af8bb0049eb09f71a1dba57ce9f46 (diff) | |
| parent | 363ab2259ce5b1e52a11a325d14a4d5ee1222249 (diff) | |
Merge pull request #992 from lnslbrty/fix/pkg-config
Fixed broken pkg-config file which did not care about gcrypt/pcre.
| -rw-r--r-- | configure.seed | 6 | ||||
| -rw-r--r-- | libndpi.pc.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.seed b/configure.seed index 763e868e1..bf1260fd3 100644 --- a/configure.seed +++ b/configure.seed @@ -167,18 +167,22 @@ AM_CONDITIONAL([HAS_FUZZLDFLAGS], [test "x$has_sanitizefuzzer" = "xyes"]) AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np])) +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)]) +if test "x$ac_cv_lib_gcrypt_gcry_cipher_checktag" = xyes; then : + ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lgcrypt" +fi dnl> PCRE AC_ARG_WITH(pcre, [ --with-pcre Enable nDPI build with libpcre]) if test "${with_pcre+set}" = set; then : AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE_UNQUOTED(HAVE_PCRE, 1, [libpcre(-dev) is present])) if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then : - ADDITIONAL_LIBS=-lpcre + ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lpcre" fi fi diff --git a/libndpi.pc.in b/libndpi.pc.in index 5e1cde70b..b67b2d700 100644 --- a/libndpi.pc.in +++ b/libndpi.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: libndpi Description: deep packet inspection library Version: @VERSION@ -Libs: -L${libdir} -lndpi +Libs: -L${libdir} -lndpi @ADDITIONAL_LIBS@ Cflags: -I${includedir}/ndpi |